fix(auth): Crash in getToken api (aws-amplify#4290)

samkudr · Sep 26, 2022 · f63c967 · f63c967
1 parent 7f94a29
commit f63c967
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/AWSAuthSDK/Sources/AWSMobileClient/AWSMobileClientOperations/AWSMobileClient+Tokens.swift b/AWSAuthSDK/Sources/AWSMobileClient/AWSMobileClientOperations/AWSMobileClient+Tokens.swift
@@ -34,15 +34,19 @@ extension AWSMobileClient {
             AWSMobileClientLogging.verbose("Adding FetchUserPoolTokensOperation operation")
             let operation = FetchUserPoolTokensOperation(completion: completionHandler)
             operation.delegate = self
-            tokenOperations.add(operation)
+            tokenFetchOperationQueue.addOperation {
+                self.tokenOperations.add(operation)
+            }
             tokenFetchOperationQueue.addOperation(operation)
         case .hostedUI:
             AWSMobileClientLogging.verbose("Invoking hostedUI getTokens")
             let operation = FetchUserPoolTokensOperation(
                 userPool: AWSCognitoAuth(forKey: AWSMobileClientConstants.CognitoAuthRegistrationKey),
                 completion: completionHandler)
             operation.delegate = self
-            tokenOperations.add(operation)
+            tokenFetchOperationQueue.addOperation {
+                self.tokenOperations.add(operation)
+            }
             tokenFetchOperationQueue.addOperation(operation)
         default:
             let message = AWSMobileClientConstants.notSignedInMessage

diff --git a/AWSCognitoIdentityProviderASF/Internal/AWSCognitoIdentityASF.m b/AWSCognitoIdentityProviderASF/Internal/AWSCognitoIdentityASF.m
@@ -55,12 +55,12 @@ + (NSString *) userContextString:(int) minTarget
     CGRect bounds = [[UIScreen mainScreen] nativeBounds];
     CGFloat screenWidth = bounds.size.width;
     CGFloat screenHeight = bounds.size.height;
-    
+
     NSDateFormatter *localTimeZoneFormatter = [NSDateFormatter new];
     localTimeZoneFormatter.timeZone = [NSTimeZone localTimeZone];
     localTimeZoneFormatter.dateFormat = @"Z";
     NSString *localTimeZoneOffset = [localTimeZoneFormatter stringFromDate:[NSDate date]];
-    
+
     NSString *hourOffset = [localTimeZoneOffset substringToIndex:[localTimeZoneOffset length] - 2];
     NSString *minuteOffset = [localTimeZoneOffset substringFromIndex:[localTimeZoneOffset length] - 2];
     NSString *timezoneOffset = [NSString stringWithFormat:@"%@:%@",hourOffset,minuteOffset];