mirror of
https://github.com/bitwarden/android.git
synced 2026-11-20 11:37:52 -06:00
Add persistence for PIN-unlock related data (#611)
This commit is contained in:
committed by
Álison Fernandes
parent
76b04a849d
commit
6a208fee31
@@ -324,6 +324,84 @@ class AuthDiskSourceTest {
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getPinProtectedUserKey should pull from SharedPreferences`() {
|
||||
val pinProtectedUserKeyBaseKey = "bwPreferencesStorage:pinKeyEncryptedUserKey"
|
||||
val mockUserId = "mockUserId"
|
||||
val mockPinProtectedUserKey = "mockPinProtectedUserKey"
|
||||
fakeSharedPreferences
|
||||
.edit()
|
||||
.putString(
|
||||
"${pinProtectedUserKeyBaseKey}_$mockUserId",
|
||||
mockPinProtectedUserKey,
|
||||
)
|
||||
.apply()
|
||||
val actual = authDiskSource.getPinProtectedUserKey(userId = mockUserId)
|
||||
assertEquals(
|
||||
mockPinProtectedUserKey,
|
||||
actual,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `storePinProtectedUserKey should update SharedPreferences`() {
|
||||
val pinProtectedUserKeyBaseKey = "bwPreferencesStorage:pinKeyEncryptedUserKey"
|
||||
val mockUserId = "mockUserId"
|
||||
val mockPinProtectedUserKey = "mockPinProtectedUserKey"
|
||||
authDiskSource.storePinProtectedUserKey(
|
||||
userId = mockUserId,
|
||||
pinProtectedUserKey = mockPinProtectedUserKey,
|
||||
)
|
||||
val actual = fakeSharedPreferences
|
||||
.getString(
|
||||
"${pinProtectedUserKeyBaseKey}_$mockUserId",
|
||||
null,
|
||||
)
|
||||
assertEquals(
|
||||
mockPinProtectedUserKey,
|
||||
actual,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getEncryptedPin should pull from SharedPreferences`() {
|
||||
val encryptedPinBaseKey = "bwPreferencesStorage:protectedPin"
|
||||
val mockUserId = "mockUserId"
|
||||
val mockEncryptedPin = "mockEncryptedPin"
|
||||
fakeSharedPreferences
|
||||
.edit()
|
||||
.putString(
|
||||
"${encryptedPinBaseKey}_$mockUserId",
|
||||
mockEncryptedPin,
|
||||
)
|
||||
.apply()
|
||||
val actual = authDiskSource.getEncryptedPin(userId = mockUserId)
|
||||
assertEquals(
|
||||
mockEncryptedPin,
|
||||
actual,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `storeEncryptedPin should update SharedPreferences`() {
|
||||
val encryptedPinBaseKey = "bwPreferencesStorage:protectedPin"
|
||||
val mockUserId = "mockUserId"
|
||||
val mockEncryptedPin = "mockUserAutoUnlockKey"
|
||||
authDiskSource.storeEncryptedPin(
|
||||
userId = mockUserId,
|
||||
encryptedPin = mockEncryptedPin,
|
||||
)
|
||||
val actual = fakeSharedPreferences
|
||||
.getString(
|
||||
"${encryptedPinBaseKey}_$mockUserId",
|
||||
null,
|
||||
)
|
||||
assertEquals(
|
||||
mockEncryptedPin,
|
||||
actual,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getOrganizationKeys should pull from SharedPreferences`() {
|
||||
val organizationKeysBaseKey = "bwPreferencesStorage:encOrgKeys"
|
||||
|
||||
+18
@@ -23,6 +23,8 @@ class FakeAuthDiskSource : AuthDiskSource {
|
||||
private val storedUserKeys = mutableMapOf<String, String?>()
|
||||
private val storedPrivateKeys = mutableMapOf<String, String?>()
|
||||
private val storedUserAutoUnlockKeys = mutableMapOf<String, String?>()
|
||||
private val storedPinProtectedUserKeys = mutableMapOf<String, String?>()
|
||||
private val storedEncryptedPins = mutableMapOf<String, String?>()
|
||||
private val storedOrganizations =
|
||||
mutableMapOf<String, List<SyncResponseJson.Profile.Organization>?>()
|
||||
private val storedOrganizationKeys = mutableMapOf<String, Map<String, String>?>()
|
||||
@@ -41,6 +43,8 @@ class FakeAuthDiskSource : AuthDiskSource {
|
||||
storedUserKeys.remove(userId)
|
||||
storedPrivateKeys.remove(userId)
|
||||
storedUserAutoUnlockKeys.remove(userId)
|
||||
storedPinProtectedUserKeys.remove(userId)
|
||||
storedEncryptedPins.remove(userId)
|
||||
storedOrganizations.remove(userId)
|
||||
|
||||
storedOrganizationKeys.remove(userId)
|
||||
@@ -76,6 +80,20 @@ class FakeAuthDiskSource : AuthDiskSource {
|
||||
storedUserAutoUnlockKeys[userId] = userAutoUnlockKey
|
||||
}
|
||||
|
||||
override fun getPinProtectedUserKey(userId: String): String? =
|
||||
storedPinProtectedUserKeys[userId]
|
||||
|
||||
override fun storePinProtectedUserKey(userId: String, pinProtectedUserKey: String?) {
|
||||
storedPinProtectedUserKeys[userId] = pinProtectedUserKey
|
||||
}
|
||||
|
||||
override fun getEncryptedPin(userId: String): String? =
|
||||
storedEncryptedPins[userId]
|
||||
|
||||
override fun storeEncryptedPin(userId: String, encryptedPin: String?) {
|
||||
storedEncryptedPins[userId] = encryptedPin
|
||||
}
|
||||
|
||||
override fun getOrganizationKeys(
|
||||
userId: String,
|
||||
): Map<String, String>? = storedOrganizationKeys[userId]
|
||||
|
||||
Reference in New Issue
Block a user