From 7d1edd2ed4495d2728e48c1a25edcec152303fb8 Mon Sep 17 00:00:00 2001 From: Yue-Wang-Google Date: Wed, 13 Mar 2019 00:08:10 -0700 Subject: [PATCH 1/2] Use oauthAccessToken instead of IDToken when returnIDPCredential is yes Another fix for #2522 --- Firebase/Auth/Source/FIRUser.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firebase/Auth/Source/FIRUser.m b/Firebase/Auth/Source/FIRUser.m index cbe360751d5..ab22e69644e 100644 --- a/Firebase/Auth/Source/FIRUser.m +++ b/Firebase/Auth/Source/FIRUser.m @@ -1115,7 +1115,7 @@ - (void)linkAndRetrieveDataWithCredential:(FIRAuthCredential *)credential // Update the new token and refresh user info again. self->_tokenService = [[FIRSecureTokenService alloc] initWithRequestConfiguration:requestConfiguration - accessToken:response.IDToken + accessToken:response.oauthAccessToken accessTokenExpirationDate:response.approximateExpirationDate refreshToken:response.refreshToken]; [self internalGetTokenWithCallback:^(NSString *_Nullable accessToken, From 6866873a7bf17cca2642bcb00e137bc068e3378a Mon Sep 17 00:00:00 2001 From: Yue-Wang-Google Date: Wed, 13 Mar 2019 00:10:05 -0700 Subject: [PATCH 2/2] Update Changelog --- Firebase/Auth/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firebase/Auth/CHANGELOG.md b/Firebase/Auth/CHANGELOG.md index 33ba983745a..aca1facd622 100644 --- a/Firebase/Auth/CHANGELOG.md +++ b/Firebase/Auth/CHANGELOG.md @@ -1,7 +1,7 @@ # v5.4.1 - Deprecate Microsoft and Yahoo OAuth Provider ID (#2517) - Fix an issue where an exception was thrown when linking OAuth credentials. (#2521) -- Fix an issue where a wrong error was thrown when upgrading anonymous user. (#2530) +- Fix an issue where a wrong error was thrown when upgrading anonymous user. (#2530, #2541) # v5.4.0 - Add support of Generic IDP (#2405).