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

feat(auth, ios): fix an iOS crash when using Sign In With Apple due to invalid return of nil instead of NSNull #9644

Merged
merged 1 commit into from Oct 3, 2022
Merged

feat(auth, ios): fix an iOS crash when using Sign In With Apple due to invalid return of nil instead of NSNull #9644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions packages/firebase_auth/firebase_auth/ios/Classes/FLTFirebaseAuthPlugin.m
View file
Open in desktop
Expand Up @@ -1676,15 +1676,23 @@ + (id)getNSDictionaryFromAuthCredential:(FIRAuthCredential *)authCredential {
return [NSNull null];
}

NSString *accessToken = nil;
if ([authCredential isKindOfClass:[FIROAuthCredential class]]) {
if (((FIROAuthCredential *)authCredential).accessToken != nil) {
accessToken = ((FIROAuthCredential *)authCredential).accessToken;
} else if (((FIROAuthCredential *)authCredential).IDToken != nil) {
// For Sign In With Apple, the token is stored in IDToken
accessToken = ((FIROAuthCredential *)authCredential).IDToken;
}
}

return @{
kArgumentProviderId : authCredential.provider,
// Note: "signInMethod" does not exist on iOS SDK, so using provider
// instead.
kArgumentSignInMethod : authCredential.provider,
kArgumentToken : @([authCredential hash]),
kArgumentAccessToken : ([authCredential isKindOfClass:[FIROAuthCredential class]])
? ((FIROAuthCredential *)authCredential).accessToken
: nil,
kArgumentAccessToken : accessToken ?: [NSNull null],
};
}

Expand Down