Skip to content

Bug fix in account linking flows #8196

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

Merged
merged 5 commits into from
Jun 14, 2021
Merged

Bug fix in account linking flows #8196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80d740f
Fix bug where stored ID token is not updated after linking account wi…
rosalyntan May 26, 2021
72c8cf2
Update changelog.
rosalyntan Jun 4, 2021
1d7fb04
Fix the Game Center and phone auth flows as well.
rosalyntan Jun 5, 2021
4d13ebe
Update upcoming release version number in changelog.
rosalyntan Jun 14, 2021
1fc215a
Merge branch 'master' into rosalyntan.link
rosalyntan Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion FirebaseAuth/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# 8.2.0
- [fixed] Fixed analyze issues introduced in Xcode 12.5. (#8210)
- [fixed] Fixed a bug in the link with email link, Game Center, and phone auth flows. (#8196)

# 8.0.0
- [fixed] Fixed a crash that occurred when assigning auth settings (#7670).
- [fixed] Fixed a crash that occurred when assigning auth settings. (#7670)

# 7.8.0
- [fixed] Fixed auth state sharing during first app launch. (#7472)
Expand Down
21 changes: 21 additions & 0 deletions FirebaseAuth/Sources/User/FIRUser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#import "FirebaseAuth/Sources/Backend/RPC/FIRDeleteAccountRequest.h"
#import "FirebaseAuth/Sources/Backend/RPC/FIRDeleteAccountResponse.h"
#import "FirebaseAuth/Sources/Backend/RPC/FIREmailLinkSignInRequest.h"
#import "FirebaseAuth/Sources/Backend/RPC/FIREmailLinkSignInResponse.h"
#import "FirebaseAuth/Sources/Backend/RPC/FIRGetAccountInfoRequest.h"
#import "FirebaseAuth/Sources/Backend/RPC/FIRGetAccountInfoResponse.h"
#import "FirebaseAuth/Sources/Backend/RPC/FIRGetOOBConfirmationCodeRequest.h"
Expand Down Expand Up @@ -718,6 +719,14 @@ - (void)internalUpdateOrLinkPhoneNumberCredential:(FIRPhoneAuthCredential *)phon
completion(error);
return;
}
FIRAuthRequestConfiguration *requestConfiguration =
self.auth.requestConfiguration;
// Update the new token and refresh user info again.
self->_tokenService = [[FIRSecureTokenService alloc]
initWithRequestConfiguration:requestConfiguration
accessToken:response.IDToken
accessTokenExpirationDate:response.approximateExpirationDate
refreshToken:response.refreshToken];
// Get account info to update cached user info.
[self getAccountInfoRefreshingCache:^(
FIRGetAccountInfoResponseUser *_Nullable user,
Expand Down Expand Up @@ -1104,6 +1113,12 @@ - (void)linkWithCredential:(FIRAuthCredential *)credential
if (error) {
callInMainThreadWithAuthDataResultAndError(completion, nil, error);
} else {
// Update the new token and refresh user info again.
self->_tokenService = [[FIRSecureTokenService alloc]
initWithRequestConfiguration:requestConfiguration
accessToken:response.IDToken
accessTokenExpirationDate:response.approximateExpirationDate
refreshToken:response.refreshToken];
[self internalGetTokenWithCallback:^(NSString *_Nullable accessToken,
NSError *_Nullable error) {
if (error) {
Expand Down Expand Up @@ -1165,6 +1180,12 @@ - (void)linkWithCredential:(FIRAuthCredential *)credential
if (error) {
callInMainThreadWithAuthDataResultAndError(completion, nil, error);
} else {
// Update the new token and refresh user info again.
self->_tokenService = [[FIRSecureTokenService alloc]
initWithRequestConfiguration:requestConfiguration
accessToken:response.IDToken
accessTokenExpirationDate:response.approximateExpirationDate
refreshToken:response.refreshToken];
[self internalGetTokenWithCallback:^(NSString *_Nullable accessToken,
NSError *_Nullable error) {
if (error) {
Expand Down
4 changes: 4 additions & 0 deletions FirebaseAuth/Tests/Unit/FIRUserTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3126,6 +3126,10 @@ - (void)expectVerifyPhoneNumberRequestWithPhoneNumber:(nullable NSString *)phone
}
id mockVerifyPhoneNumberResponse = OCMClassMock([FIRVerifyPhoneNumberResponse class]);
OCMStub([mockVerifyPhoneNumberResponse phoneNumber]).andReturn(phoneNumber);
OCMStub([mockVerifyPhoneNumberResponse IDToken]).andReturn(kAccessToken);
OCMStub([mockVerifyPhoneNumberResponse approximateExpirationDate])
.andReturn([NSDate dateWithTimeIntervalSinceNow:kAccessTokenTimeToLive]);
OCMStub([mockVerifyPhoneNumberResponse refreshToken]).andReturn(kRefreshToken);
callback(mockVerifyPhoneNumberResponse, nil);
});
});
Expand Down