Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(auth): Crash in getToken api #4290

Merged
merged 2 commits into from Sep 8, 2022
Merged

fix(auth): Crash in getToken api #4290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6439ac3
fix(auth): Crash in getToken api
royjit Aug 31, 2022
042a4f8
Merge branch 'main' into royjit.fixtokens
royjit Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions AWSAuthSDK/Sources/AWSMobileClient/AWSMobileClientOperations/AWSMobileClient+Tokens.swift
View file
Open in desktop
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions AWSCognitoIdentityProviderASF/Internal/AWSCognitoIdentityASF.m
View file
Open in desktop
Expand Up @@ -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];
Expand Down