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

Add VaultState.unlockingVaultUserIds and clean up the vault unlock logic (#546)

Browse Source
This commit is contained in:
Brian Yencho
2024-01-08 22:56:35 -06:00
committed by GitHub
parent 3cc2f2143f
commit 4776777759
5 changed files with 169 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt
View File

@@ -179,7 +179,10 @@ class AuthRepositoryTest {
repository.userStateFlow.value,
)
val emptyVaultState = VaultState(unlockedVaultUserIds = emptySet())
val emptyVaultState = VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
)
mutableVaultStateFlow.value = emptyVaultState
assertEquals(
MULTI_USER_STATE.toUserState(
@@ -1535,6 +1538,7 @@ class AuthRepositoryTest {
)
private val VAULT_STATE = VaultState(
unlockedVaultUserIds = setOf(USER_ID_1),
unlockingVaultUserIds = emptySet(),
)
}
}

2
app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt
View File

@@ -135,6 +135,7 @@ class UserStateJsonExtensionsTest {
.toUserState(
vaultState = VaultState(
unlockedVaultUserIds = setOf("activeUserId"),
unlockingVaultUserIds = emptySet(),
),
userOrganizationsList = listOf(
UserOrganizations(
@@ -198,6 +199,7 @@ class UserStateJsonExtensionsTest {
.toUserState(
vaultState = VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
userOrganizationsList = listOf(
UserOrganizations(

40
app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt
View File

@@ -538,6 +538,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = setOf(userId),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -547,6 +548,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -562,6 +564,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = setOf(userId),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -571,6 +574,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -634,6 +638,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -649,6 +654,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = setOf("mockId-1"),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -794,6 +800,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -809,6 +816,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -861,6 +869,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -876,6 +885,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -913,6 +923,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -925,6 +936,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -974,6 +986,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -986,6 +999,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -999,6 +1013,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1012,6 +1027,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1024,6 +1040,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1045,6 +1062,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1057,6 +1075,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1077,6 +1096,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1114,6 +1134,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1132,6 +1153,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = setOf(userId),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1186,6 +1208,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1204,6 +1227,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1258,6 +1282,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1276,6 +1301,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1328,6 +1354,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1346,6 +1373,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1398,6 +1426,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1416,6 +1445,7 @@ class VaultRepositoryTest {
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
@@ -1477,6 +1507,16 @@ class VaultRepositoryTest {
organizationKeys = organizationKeys,
)
}
// The given userId is marked as unlocking
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
unlockingVaultUserIds = setOf(userId),
),
vaultRepository.vaultStateFlow.value,
)
// Does nothing because we are blocking
vaultRepository.sync()
scope.cancel()