Update SDK to 4.0.0-10214-15db6b9f

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt

@@ -308,6 +308,16 @@ interface AuthDiskSource : AppIdProvider {
      */
     fun storeEncryptedPin(userId: String, encryptedPin: String?)
 
+    /**
+     * Retrieves the number of digits in the PIN for the given [userId].
+     */
+    fun getPinLength(userId: String): Int?
+
+    /**
+     * Stores the number of digits in the PIN for the given [userId].
+     */
+    fun storePinLength(userId: String, pinLength: Int?)
+
     /**
      * Gets the organization keys for the given [userId] in the form of a mapping from organization
      * ID to encrypted organization key.

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt

@@ -48,6 +48,7 @@ private const val MASTER_KEY_ENCRYPTION_PRIVATE_KEY = "encPrivateKey"
 private const val PIN_PROTECTED_USER_KEY_KEY = "pinKeyEncryptedUserKey"
 private const val PIN_PROTECTED_USER_KEY_KEY_ENVELOPE = "pinKeyEncryptedUserKeyEnvelope"
 private const val ENCRYPTED_PIN_KEY = "protectedPin"
+private const val PIN_LENGTH_KEY = "pinLength"
 private const val ORGANIZATIONS_KEY = "organizations"
 private const val ORGANIZATION_KEYS_KEY = "encOrgKeys"
 private const val TWO_FACTOR_TOKEN_KEY = "twoFactorToken"
@@ -68,7 +69,7 @@ private const val V2_ENCRYPTED_MIGRATIONS_GRACE_PERIOD_START =
 /**
  * Primary implementation of [AuthDiskSource].
  */
-@Suppress("TooManyFunctions")
+@Suppress("TooManyFunctions", "LargeClass")
 class AuthDiskSourceImpl(
     encryptedSharedPreferences: SharedPreferences,
     keystoreEncryptedPreferences: SharedPreferences,
@@ -194,6 +195,7 @@ class AuthDiskSourceImpl(
         storeShowImportLogins(userId = userId, showImportLogins = null)
         storeLastLockTimestamp(userId = userId, lastLockTimestamp = null)
         storeEncryptedPin(userId = userId, encryptedPin = null)
+        storePinLength(userId = userId, pinLength = null)
         storePinProtectedUserKey(userId = userId, pinProtectedUserKey = null)
         storeEphemeralPinProtectedUserKeyEnvelope(
             userId = userId,
@@ -472,6 +474,16 @@ class AuthDiskSourceImpl(
         )
     }
 
+    override fun getPinLength(userId: String): Int? =
+        getInt(key = PIN_LENGTH_KEY.appendIdentifier(userId))
+
+    override fun storePinLength(userId: String, pinLength: Int?) {
+        putInt(
+            key = PIN_LENGTH_KEY.appendIdentifier(userId),
+            value = pinLength,
+        )
+    }
+
     override fun getOrganizationKeys(userId: String): Map<String, String>? =
         getString(key = ORGANIZATION_KEYS_KEY.appendIdentifier(userId))
             ?.let { json.decodeFromStringOrNull(it) }

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerImpl.kt

@@ -83,6 +83,7 @@ internal class UserLogoutManagerImpl(
         val vaultTimeoutInMinutes = settingsDiskSource.getVaultTimeoutInMinutes(userId = userId)
         val vaultTimeoutAction = settingsDiskSource.getVaultTimeoutAction(userId = userId)
         val encryptedPin = authDiskSource.getEncryptedPin(userId = userId)
+        val pinLength = authDiskSource.getPinLength(userId = userId)
         val pinProtectedUserKey = authDiskSource.getPinProtectedUserKey(userId = userId)
         val ephemeralPinProtectedUserKeyEnvelope = authDiskSource
             .getEphemeralPinProtectedUserKeyEnvelope(userId = userId)
@@ -116,6 +117,7 @@ internal class UserLogoutManagerImpl(
         }
         authDiskSource.apply {
             storeEncryptedPin(userId = userId, encryptedPin = encryptedPin)
+            storePinLength(userId = userId, pinLength = pinLength)
             storePinProtectedUserKey(userId = userId, pinProtectedUserKey = pinProtectedUserKey)
             storeEphemeralPinProtectedUserKeyEnvelope(
                 userId = userId,

app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridge.kt

@@ -95,6 +95,17 @@ internal class SdkStateBridge(
         authDiskSource.storeEncryptedPin(userId = userId, encryptedPin = null)
     }
 
+    override suspend fun setPinLength(value: UInt) {
+        authDiskSource.storePinLength(userId = userId, pinLength = value.toInt())
+    }
+
+    override suspend fun getPinLength(): UInt? =
+        authDiskSource.getPinLength(userId = userId)?.toUInt()
+
+    override suspend fun clearPinLength() {
+        authDiskSource.storePinLength(userId = userId, pinLength = null)
+    }
+
     override suspend fun setV2UpgradeToken(value: V2UpgradeToken) {
         authDiskSource.storeV2UpgradeToken(
             userId = userId,

app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt

@@ -701,6 +701,9 @@ class SettingsRepositoryImpl(
                 pinProtectedUserKeyEnvelope = null,
             )
             storePinProtectedUserKey(userId = userId, pinProtectedUserKey = null)
+            // The SDK only repopulates this on unlock when it is absent, so a stale value here
+            // would survive a later PIN change.
+            storePinLength(userId = userId, pinLength = null)
         }
     }
 

app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt

@@ -397,6 +397,7 @@ private fun Login.toEncryptedNetworkLogin(): SyncResponseJson.Cipher.Login =
         uri = null,
         username = username,
         fido2Credentials = fido2Credentials?.toNetworkFido2Credentials(),
+        httpAuthenticationEnabled = httpAuthenticationEnabled,
     )
 
 private fun List<Fido2Credential>.toNetworkFido2Credentials() =
@@ -534,6 +535,7 @@ fun SyncResponseJson.Cipher.Login.toSdkLogin(): Login =
         totp = totp,
         autofillOnPageLoad = shouldAutofillOnPageLoad,
         fido2Credentials = fido2Credentials?.toSdkFido2Credentials(),
+        httpAuthenticationEnabled = httpAuthenticationEnabled,
     )
 
 private fun List<SyncResponseJson.Cipher.Fido2Credential>.toSdkFido2Credentials() =

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt

@@ -297,6 +297,10 @@ private fun VaultAddEditState.ViewState.Content.ItemType.toLoginView(
             uris = it.uriList.toLoginUriView(),
             totp = it.totp.orNullIfBlank(),
             autofillOnPageLoad = common.originalCipher?.login?.autofillOnPageLoad,
+            // Not modeled in the UI; preserved so saving does not clear a value set elsewhere.
+            httpAuthenticationEnabled = common.originalCipher
+                ?.login
+                ?.httpAuthenticationEnabled,
             fido2Credentials = common.originalCipher?.login?.fido2Credentials
                 .takeIf { _ -> it.fido2CredentialCreationDateTime != null },
         )

app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt

@@ -318,6 +318,7 @@ class AuthDiskSourceTest {
             biometricsKey = "1234-9876-0192",
         )
         authDiskSource.storeEncryptedPin(userId = userId, encryptedPin = "encryptedPin")
+        authDiskSource.storePinLength(userId = userId, pinLength = 4)
         authDiskSource.storePinProtectedUserKey(
             userId = userId,
             pinProtectedUserKey = "pinProtectedUserKey",
@@ -415,6 +416,7 @@ class AuthDiskSourceTest {
         assertNull(authDiskSource.getAuthenticatorSyncUnlockKey(userId = userId))
         assertNull(authDiskSource.getShowImportLogins(userId = userId))
         assertNull(authDiskSource.getEncryptedPin(userId = userId))
+        assertNull(authDiskSource.getPinLength(userId = userId))
         assertNull(authDiskSource.getPinProtectedUserKey(userId = userId))
         assertNull(authDiskSource.getPinProtectedUserKeyEnvelope(userId = userId))
         assertNull(authDiskSource.getEphemeralPinProtectedUserKeyEnvelope(userId = userId))
@@ -1071,6 +1073,45 @@ class AuthDiskSourceTest {
         )
     }
 
+    @Test
+    fun `getPinLength should pull from SharedPreferences`() {
+        val pinLengthBaseKey = "bwPreferencesStorage:pinLength"
+        val mockUserId = "mockUserId"
+        val mockPinLength = 4
+        fakeSharedPreferences
+            .edit {
+                putInt(
+                    "${pinLengthBaseKey}_$mockUserId",
+                    mockPinLength,
+                )
+            }
+        val actual = authDiskSource.getPinLength(userId = mockUserId)
+        assertEquals(
+            mockPinLength,
+            actual,
+        )
+    }
+
+    @Test
+    fun `storePinLength should update SharedPreferences`() {
+        val pinLengthBaseKey = "bwPreferencesStorage:pinLength"
+        val mockUserId = "mockUserId"
+        val mockPinLength = 6
+        authDiskSource.storePinLength(
+            userId = mockUserId,
+            pinLength = mockPinLength,
+        )
+        val actual = fakeSharedPreferences
+            .getInt(
+                "${pinLengthBaseKey}_$mockUserId",
+                0,
+            )
+        assertEquals(
+            mockPinLength,
+            actual,
+        )
+    }
+
     @Test
     fun `getOrganizationKeys should pull from SharedPreferences`() {
         val organizationKeysBaseKey = "bwPreferencesStorage:encOrgKeys"

app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt

@@ -50,6 +50,7 @@ class FakeAuthDiskSource : AuthDiskSource {
     private val storedUserAutoUnlockKeys = mutableMapOf<String, String?>()
     private val storedPinProtectedUserKeys = mutableMapOf<String, Pair<String?, Boolean>>()
     private val storedEncryptedPins = mutableMapOf<String, String?>()
+    private val storedPinLengths = mutableMapOf<String, Int?>()
     private val storedOrganizations =
         mutableMapOf<String, List<SyncResponseJson.Profile.Organization>?>()
     private val storedOrganizationKeys = mutableMapOf<String, Map<String, String>?>()
@@ -100,6 +101,7 @@ class FakeAuthDiskSource : AuthDiskSource {
         storedEphemeralPinProtectedUserKeyEnvelopes.remove(userId)
         storedPersistentPinProtectedUserKeyEnvelopes.remove(userId)
         storedEncryptedPins.remove(userId)
+        storedPinLengths.remove(userId)
         storedPinProtectedUserKeys.remove(userId)
         storedV2UpgradeTokens.remove(userId)
         storedUserKeyIds.remove(userId)
@@ -245,6 +247,12 @@ class FakeAuthDiskSource : AuthDiskSource {
         storedEncryptedPins[userId] = encryptedPin
     }
 
+    override fun getPinLength(userId: String): Int? = storedPinLengths[userId]
+
+    override fun storePinLength(userId: String, pinLength: Int?) {
+        storedPinLengths[userId] = pinLength
+    }
+
     override fun getOrganizationKeys(
         userId: String,
     ): Map<String, String>? = storedOrganizationKeys[userId]
@@ -523,6 +531,13 @@ class FakeAuthDiskSource : AuthDiskSource {
         assertEquals(encryptedPin, storedEncryptedPins[userId])
     }
 
+    /**
+     * Assert that the [pinLength] was stored successfully using the [userId].
+     */
+    fun assertPinLength(userId: String, pinLength: Int?) {
+        assertEquals(pinLength, storedPinLengths[userId])
+    }
+
     /**
      * Assert that the [pinProtectedUserKey] was stored successfully using the [userId].
      */

app/src/test/kotlin/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerTest.kt

@@ -153,6 +153,7 @@ class UserLogoutManagerTest {
         val pinProtectedUserKey = "pinProtectedUserKey"
         val pinProtectedUserKeyEnvelope = "pinProtectedUserKeyEnvelope"
         val encryptedPin = "encryptedPin"
+        val pinLength = 4
 
         every {
             settingsDiskSource.getVaultTimeoutInMinutes(userId = userId)
@@ -189,6 +190,8 @@ class UserLogoutManagerTest {
         every {
             authDiskSource.storeEncryptedPin(userId = userId, encryptedPin = encryptedPin)
         } just runs
+        every { authDiskSource.getPinLength(userId = userId) } returns pinLength
+        every { authDiskSource.storePinLength(userId = userId, pinLength = pinLength) } just runs
 
         userLogoutManager.softLogout(userId = userId, reason = LogoutReason.Timeout)
 
@@ -224,6 +227,7 @@ class UserLogoutManagerTest {
                 pinProtectedUserKey = pinProtectedUserKey,
             )
             authDiskSource.storeEncryptedPin(userId = userId, encryptedPin = encryptedPin)
+            authDiskSource.storePinLength(userId = userId, pinLength = pinLength)
         }
     }
 
@@ -235,6 +239,7 @@ class UserLogoutManagerTest {
         val pinProtectedUserKey = "pinProtectedUserKey"
         val pinProtectedUserKeyEnvelope = "pinProtectedUserKeyEnvelope"
         val encryptedPin = "encryptedPin"
+        val pinLength = 4
 
         every {
             settingsDiskSource.getVaultTimeoutInMinutes(userId = userId)
@@ -271,6 +276,8 @@ class UserLogoutManagerTest {
         every {
             authDiskSource.storeEncryptedPin(userId = userId, encryptedPin = encryptedPin)
         } just runs
+        every { authDiskSource.getPinLength(userId = userId) } returns pinLength
+        every { authDiskSource.storePinLength(userId = userId, pinLength = pinLength) } just runs
 
         userLogoutManager.softLogout(userId = userId, reason = LogoutReason.Timeout)
 
@@ -296,6 +303,7 @@ class UserLogoutManagerTest {
                 pinProtectedUserKey = pinProtectedUserKey,
             )
             authDiskSource.storeEncryptedPin(userId = userId, encryptedPin = encryptedPin)
+            authDiskSource.storePinLength(userId = userId, pinLength = pinLength)
         }
     }
 
@@ -400,7 +408,9 @@ class UserLogoutManagerTest {
         every {
             authDiskSource.getPersistentPinProtectedUserKeyEnvelope(userId = userId)
         } returns "pinProtectedUserKeyEnvelope"
+        every { authDiskSource.getPinLength(userId = userId) } returns 4
         every { authDiskSource.storeEncryptedPin(userId = userId, encryptedPin = any()) } just runs
+        every { authDiskSource.storePinLength(userId = userId, pinLength = any()) } just runs
         every {
             authDiskSource.storePinProtectedUserKey(userId = userId, pinProtectedUserKey = any())
         } just runs

app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/statebridge/SdkStateBridgeTest.kt

@@ -180,6 +180,31 @@ class SdkStateBridgeTest {
         authDiskSource.assertEncryptedPin(userId = USER_ID, encryptedPin = null)
     }
 
+    @Test
+    fun `setPinLength should store the pin length`() = runTest {
+        stateBridge.setPinLength(value = 4u)
+
+        authDiskSource.assertPinLength(userId = USER_ID, pinLength = 4)
+    }
+
+    @Test
+    fun `getPinLength should return the stored pin length`() = runTest {
+        assertNull(stateBridge.getPinLength())
+
+        authDiskSource.storePinLength(userId = USER_ID, pinLength = 4)
+
+        assertEquals(4u, stateBridge.getPinLength())
+    }
+
+    @Test
+    fun `clearPinLength should clear the pin length`() = runTest {
+        authDiskSource.storePinLength(userId = USER_ID, pinLength = 4)
+
+        stateBridge.clearPinLength()
+
+        authDiskSource.assertPinLength(userId = USER_ID, pinLength = null)
+    }
+
     @Test
     fun `setV2UpgradeToken should store the token as a V2UpgradeTokenJson`() = runTest {
         stateBridge.setV2UpgradeToken(value = V2_UPGRADE_TOKEN)

app/src/test/kotlin/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt

@@ -1212,6 +1212,7 @@ class SettingsRepositoryTest {
                 userId = USER_ID,
                 pinProtectedUserKeyEnvelope = "pinProtectedUserKeyEnvelope",
             )
+            storePinLength(userId = USER_ID, pinLength = 4)
         }
 
         settingsRepository.clearUnlockPin()
@@ -1229,6 +1230,7 @@ class SettingsRepositoryTest {
                 userId = USER_ID,
                 pinProtectedUserKeyEnvelope = null,
             )
+            assertPinLength(userId = USER_ID, pinLength = null)
         }
     }
 

app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt

@@ -514,6 +514,7 @@ private const val CIPHER_JSON = """
     "password": "mockPassword-1",
     "passwordRevisionDate": "2023-10-27T12:00:00.000Z",
     "autofillOnPageLoad": false,
+    "httpAuthenticationEnabled": false,
     "uri": "mockUri-1",
     "username": "mockUsername-1",
     "fido2Credentials": [

app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt

@@ -246,6 +246,7 @@ fun createMockSdkLogin(number: Int, clock: Clock): Login =
             number = number,
             clock = clock,
         ),
+        httpAuthenticationEnabled = false,
     )
 
 /**