fix(auth): clear credentials values only if namespacing has changed

aws-amplify · Aug 21, 2024 · eb7e2b3 · eb7e2b3
1 parent bdfa37a
commit eb7e2b3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...s/Auth/Sources/AWSCognitoAuthPlugin/CredentialStorage/AWSCognitoAuthCredentialStore.swift b/...s/Auth/Sources/AWSCognitoAuthPlugin/CredentialStorage/AWSCognitoAuthCredentialStore.swift
@@ -65,12 +65,12 @@ struct AWSCognitoAuthCredentialStore {
             newIdentityConfigData != nil &&
             oldIdentityPoolConfiguration == newIdentityConfigData
         {
-
             // retrieve data from the old namespace and save with the new namespace
             if let oldCognitoCredentialsData = try? keychain._getData(oldNameSpace) {
                 try? keychain._set(oldCognitoCredentialsData, key: newNameSpace)
             }
-        } else if oldAuthConfigData != currentAuthConfig {
+        } else if oldAuthConfigData != currentAuthConfig &&
+                    oldNameSpace != newNameSpace {
             // Clear the old credentials
             try? keychain._remove(oldNameSpace)
         }

diff --git a/.../AuthHostApp/AuthIntegrationTests/CredentialStore/CredentialStoreConfigurationTests.swift b/.../AuthHostApp/AuthIntegrationTests/CredentialStore/CredentialStoreConfigurationTests.swift
@@ -89,8 +89,16 @@ class CredentialStoreConfigurationTests: AWSAuthBaseTest {
             XCTFail("Unable to save credentials")
         }
 
+        // When configuration changed
+        let updatedConfig = AuthConfiguration.userPoolsAndIdentityPools(
+            UserPoolConfigurationData(poolId: Defaults.userPoolId,
+                                      clientId: Defaults.appClientId,
+                                      region: Defaults.regionString,
+                                      clientSecret: Defaults.appClientSecret,
+                                      pinpointAppId: "somethingNew"),
+            Defaults.makeIdentityConfigData())
         // When configuration don't change changed
-        let newCredentialStore = AWSCognitoAuthCredentialStore(authConfiguration: initialAuthConfig)
+        let newCredentialStore = AWSCognitoAuthCredentialStore(authConfiguration: updatedConfig)
 
         // Then
         guard let credentials = try? newCredentialStore.retrieveCredential(),