github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-31 17:56:51 -05:00
Code Issues 1.8k Packages Projects Releases 126 Wiki Activity

Add isActive and isVaultUnlocked to AccountSummary (#361)

Browse Source
This commit is contained in:
Brian Yencho
2023-12-11 09:29:23 -06:00
committed by GitHub
parent b7d5de3b6d
commit a4db8c7a60
9 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt
View File

@@ -353,7 +353,8 @@ private val ACTIVE_ACCOUNT_SUMMARY = AccountSummary(
email = "active@bitwarden.com",
avatarColorHex = "#aa00aa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
)
private val DEFAULT_STATE = LandingState(

3
app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreenTest.kt
View File

@@ -175,7 +175,8 @@ private val ACTIVE_ACCOUNT_SUMMARY = AccountSummary(
email = "active@bitwarden.com",
avatarColorHex = "#aa00aa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
)
private val DEFAULT_STATE =

6
app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreenTest.kt
View File

@@ -206,7 +206,8 @@ private val ACTIVE_ACCOUNT_SUMMARY = AccountSummary(
email = "active@bitwarden.com",
avatarColorHex = "#aa00aa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
)
private val LOCKED_ACCOUNT_SUMMARY = AccountSummary(
@@ -215,7 +216,8 @@ private val LOCKED_ACCOUNT_SUMMARY = AccountSummary(
email = "locked@bitwarden.com",
avatarColorHex = "#00aaaa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.LOCKED,
isActive = false,
isVaultUnlocked = false,
)
private val ACCOUNT_SUMMARIES = listOf(

6
app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt
View File

@@ -119,7 +119,8 @@ class VaultUnlockViewModelTest : BaseViewModelTest() {
email = "active+test@bitwarden.com",
avatarColorHex = "#00aaaa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
),
),
),
@@ -288,7 +289,8 @@ private val DEFAULT_STATE: VaultUnlockState = VaultUnlockState(
email = "active@bitwarden.com",
avatarColorHex = "#aa00aa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
),
),
avatarColorString = "#aa00aa",

6
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt
View File

@@ -481,7 +481,8 @@ private val ACTIVE_ACCOUNT_SUMMARY = AccountSummary(
email = "active@bitwarden.com",
avatarColorHex = "#aa00aa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
)
private val LOCKED_ACCOUNT_SUMMARY = AccountSummary(
@@ -490,7 +491,8 @@ private val LOCKED_ACCOUNT_SUMMARY = AccountSummary(
email = "locked@bitwarden.com",
avatarColorHex = "#00aaaa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.LOCKED,
isActive = false,
isVaultUnlocked = false,
)
private val DEFAULT_STATE: VaultState = VaultState(

9
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt
View File

@@ -135,7 +135,8 @@ class VaultViewModelTest : BaseViewModelTest() {
email = "active@bitwarden.com",
avatarColorHex = "#00aaaa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
),
),
),
@@ -487,7 +488,8 @@ private fun createMockVaultState(viewState: VaultState.ViewState): VaultState =
email = "active@bitwarden.com",
avatarColorHex = "#aa00aa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
),
AccountSummary(
userId = "lockedUserId",
@@ -495,7 +497,8 @@ private fun createMockVaultState(viewState: VaultState.ViewState): VaultState =
email = "locked@bitwarden.com",
avatarColorHex = "#00aaaa",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.LOCKED,
isActive = false,
isVaultUnlocked = false,
),
),
viewState = viewState,

44
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt
View File

@@ -18,7 +18,8 @@ class UserStateExtensionsTest {
email = "activeEmail",
avatarColorHex = "activeAvatarColorHex",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
),
AccountSummary(
userId = "lockedUserId",
@@ -26,7 +27,8 @@ class UserStateExtensionsTest {
email = "lockedEmail",
avatarColorHex = "lockedAvatarColorHex",
environmentLabel = "bitwarden.eu",
status = AccountSummary.Status.LOCKED,
isActive = false,
isVaultUnlocked = false,
),
AccountSummary(
userId = "unlockedUserId",
@@ -34,7 +36,8 @@ class UserStateExtensionsTest {
email = "unlockedEmail",
avatarColorHex = "unlockedAvatarColorHex",
environmentLabel = "vault.qa.bitwarden.pw",
status = AccountSummary.Status.UNLOCKED,
isActive = false,
isVaultUnlocked = true,
),
),
UserState(
@@ -86,7 +89,8 @@ class UserStateExtensionsTest {
email = "email",
avatarColorHex = "avatarColorHex",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
),
UserState.Account(
userId = "userId",
@@ -102,7 +106,7 @@ class UserStateExtensionsTest {
}
@Test
fun `toAccountSummary for an locked account should return a locked AccountSummary`() {
fun `toAccountSummary for an inactive account should return an inactive AccountSummary`() {
assertEquals(
AccountSummary(
userId = "userId",
@@ -110,7 +114,8 @@ class UserStateExtensionsTest {
email = "email",
avatarColorHex = "avatarColorHex",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.LOCKED,
isActive = false,
isVaultUnlocked = false,
),
UserState.Account(
userId = "userId",
@@ -125,30 +130,6 @@ class UserStateExtensionsTest {
)
}
@Test
fun `toAccountSummary for a unlocked account should return a locked AccountSummary`() {
assertEquals(
AccountSummary(
userId = "userId",
name = "name",
email = "email",
avatarColorHex = "avatarColorHex",
environmentLabel = "bitwarden.eu",
status = AccountSummary.Status.UNLOCKED,
),
UserState.Account(
userId = "userId",
name = "name",
email = "email",
avatarColorHex = "avatarColorHex",
environment = Environment.Eu,
isPremium = true,
isVaultUnlocked = true,
)
.toAccountSummary(isActive = false),
)
}
@Suppress("MaxLineLength")
@Test
fun `toActiveAccountSummary should return an active AccountSummary`() {
@@ -159,7 +140,8 @@ class UserStateExtensionsTest {
email = "email",
avatarColorHex = "avatarColorHex",
environmentLabel = "bitwarden.com",
status = AccountSummary.Status.ACTIVE,
isActive = true,
isVaultUnlocked = true,
),
UserState(
activeUserId = "activeUserId",