fix(awsmobileclient): Makes fetch aws credentials serial with the res…

…t of the calls (#4202)
aws-amplify · Jul 7, 2022 · eec5a59 · eec5a59
1 parent 0fbe3b6
commit eec5a59
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/AWSAuthSDK/Sources/AWSMobileClient/AWSMobileClientOperations/AWSMobileClient+SignIn.swift b/AWSAuthSDK/Sources/AWSMobileClient/AWSMobileClientOperations/AWSMobileClient+SignIn.swift
@@ -250,7 +250,10 @@ extension AWSMobileClient {
         self.saveLoginsMapInKeychain()
         self.setLoginProviderMetadataAndSaveInKeychain(provider: provider)
         self.internalCredentialsProvider?.clearCredentials()
-        self.internalCredentialsProvider?.credentials(withCancellationToken:self.credentialsFetchCancellationSource)
+        self.getAWSCredentials { _, _ in
+            // We discard the result here, this call is to refresh the underlying credentials
+            // after signIn.
+        }
     }
 
 }
diff --git a/AWSAuthSDK/Tests/AWSMobileClientTests/AWSMobileClientCredentialsTest.swift b/AWSAuthSDK/Tests/AWSMobileClientTests/AWSMobileClientCredentialsTest.swift
@@ -233,7 +233,6 @@ class AWSMobileClientCredentialsTest: AWSMobileClientTestBase {
     }
 
     func testMultipleGetCredentials() {
-        AWSDDLog.sharedInstance.logLevel = .verbose
         AWSDDLog.add(AWSDDTTYLogger.sharedInstance)
         let username = "testUser" + UUID().uuidString
         let credentialFetchBeforeSignIn = expectation(description: "Request to getAWSCredentials before signIn")
@@ -267,6 +266,36 @@ class AWSMobileClientCredentialsTest: AWSMobileClientTestBase {
         })
         wait(for: [credentialFetchAfterSignIn2, credentialFetchBeforeSignIn, credentialFetchAfterSignOut], timeout: 15)
     }
+
+
+    func testMultipleConcurrentGetCredentials() {
+        AWSDDLog.add(AWSDDTTYLogger.sharedInstance)
+        let username = "testUser" + UUID().uuidString
+        let credentialFetchAfterSignIn = expectation(description: "Request to getAWSCredentials after signIn")
+        let credentialFetchAfterSignOut = expectation(description: "Request to getAWSCredentials after signOut")
+
+        signUpAndVerifyUser(username: username)
+        signIn(username: username)
+        credentialFetchAfterSignIn.expectedFulfillmentCount = 100
+        for _ in 1...100 {
+            DispatchQueue.global().async {
+                AWSMobileClient.default().getAWSCredentials({ (awscredentials, error) in
+                    XCTAssertNil(error)
+                    XCTAssertNotNil(awscredentials, "Credentials should not return nil.")
+                    credentialFetchAfterSignIn.fulfill()
+                })
+            }}
+
+        wait(for: [credentialFetchAfterSignIn], timeout: 25)
+
+        AWSMobileClient.default().signOut()
+        AWSMobileClient.default().getAWSCredentials({ (awscredentials, error) in
+            XCTAssertNil(error)
+            XCTAssertNotNil(awscredentials, "Credentials should not return nil.")
+            credentialFetchAfterSignOut.fulfill()
+        })
+        wait(for: [credentialFetchAfterSignOut], timeout: 15)
+    }
 
     /// Test AWS credentials fetched for different user are different
     ///

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Bug Fixes
+
+- **AWSMobileClient**
+  - Fixes concurrent execution of fetch AWS Credentials just after signIn
+
 ### Misc. Updates
 
 - Model updates for the following services