fix(auth): device metadata migration (#2114)

aws-amplify · Nov 22, 2022 · e69c425 · e69c425
1 parent 1bbdc48
commit e69c425
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.../src/main/java/com/amplifyframework/auth/cognito/actions/CredentialStoreCognitoActions.kt b/.../src/main/java/com/amplifyframework/auth/cognito/actions/CredentialStoreCognitoActions.kt
@@ -34,15 +34,15 @@ internal object CredentialStoreCognitoActions : CredentialStoreActions {
                     // migrate credentials
                     credentialStore.saveCredential(credentials)
                     legacyCredentialStore.deleteCredential()
+                }
 
-                    // migrate device data
-                    if (credentials is AmplifyCredential.UserPoolTypeCredential) {
-                        val username = credentials.signedInData.username
-                        val deviceMetaData = legacyCredentialStore.retrieveDeviceMetadata(username)
-                        if (deviceMetaData != DeviceMetadata.Empty) {
-                            credentialStore.saveDeviceMetadata(username, deviceMetaData)
-                            legacyCredentialStore.deleteDeviceKeyCredential(username)
-                        }
+                // migrate device data
+                val lastAuthUserId = legacyCredentialStore.retrieveLastAuthUserId()
+                lastAuthUserId?.let {
+                    val deviceMetaData = legacyCredentialStore.retrieveDeviceMetadata(lastAuthUserId)
+                    if (deviceMetaData != DeviceMetadata.Empty) {
+                        credentialStore.saveDeviceMetadata(lastAuthUserId, deviceMetaData)
+                        legacyCredentialStore.deleteDeviceKeyCredential(lastAuthUserId)
                     }
                 }
 

diff --git a/...o/src/main/java/com/amplifyframework/auth/cognito/data/AWSCognitoLegacyCredentialStore.kt b/...o/src/main/java/com/amplifyframework/auth/cognito/data/AWSCognitoLegacyCredentialStore.kt
@@ -91,6 +91,12 @@ internal class AWSCognitoLegacyCredentialStore(
     override fun saveDeviceMetadata(username: String, deviceMetadata: DeviceMetadata) = Unit
     override fun saveASFDevice(device: AmplifyCredential.ASFDevice) = Unit
 
+    @Synchronized
+    fun retrieveLastAuthUserId(): String? {
+        val keys = getTokenKeys()
+        return keys[APP_LAST_AUTH_USER]?.let { tokensKeyValue.get(it) }
+    }
+
     @Synchronized
     override fun retrieveCredential(): AmplifyCredential {
         val signedInData = retrieveSignedInData()
@@ -133,6 +139,9 @@ internal class AWSCognitoLegacyCredentialStore(
     }
 
     override fun deleteDeviceKeyCredential(username: String) {
+        val keys = getTokenKeys()
+        keys[APP_LAST_AUTH_USER]?.let { tokensKeyValue.remove(it) }
+
         deviceKeyValue.apply {
             remove(DEVICE_KEY)
             remove(DEVICE_GROUP_KEY)
@@ -147,7 +156,6 @@ internal class AWSCognitoLegacyCredentialStore(
 
     private fun deleteCognitoUserPoolTokens() {
         val keys = getTokenKeys()
-        keys[APP_LAST_AUTH_USER]?.let { tokensKeyValue.remove(it) }
         keys[TOKEN_TYPE_ID]?.let { tokensKeyValue.remove(it) }
         keys[TOKEN_TYPE_ACCESS]?.let { tokensKeyValue.remove(it) }
         keys[TOKEN_TYPE_REFRESH]?.let { tokensKeyValue.remove(it) }