From 3198736120b0f7a478346ea419e828f93c62615d Mon Sep 17 00:00:00 2001 From: azaiats Date: Thu, 31 Oct 2019 12:26:31 +0200 Subject: [PATCH 1/7] getIdToken use actual refresh value instead of checking if object exists --- packages/firebase_auth/CHANGELOG.md | 4 ++++ packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md index 134ac8763d1f..080723d07dca 100644 --- a/packages/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/CHANGELOG.md @@ -4,7 +4,11 @@ ## 0.14.0+7 +<<<<<<< HEAD * Remove AndroidX warning. +======= +* Do not ignore "refresh" value for "getIdToken" on iOS +>>>>>>> getIdToken use actual refresh value instead of checking if object exists ## 0.14.0+6 diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m index 0700f7489d5f..927a8692a1a1 100644 --- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m +++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m @@ -205,7 +205,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result } } else if ([@"getIdToken" isEqualToString:call.method]) { NSDictionary *args = call.arguments; - BOOL refresh = [args objectForKey:@"refresh"]; + BOOL refresh = [[args objectForKey:@"refresh"] boolValue]; [[self getAuth:call.arguments].currentUser getIDTokenResultForcingRefresh:refresh completion:^(FIRAuthTokenResult *_Nullable tokenResult, From 8431a0d73678f098c61a2a9b206fbe75aadfac81 Mon Sep 17 00:00:00 2001 From: azaiats Date: Thu, 31 Oct 2019 19:29:28 +0200 Subject: [PATCH 2/7] getIdToken refresh integration test --- packages/firebase_auth/example/test/firebase_auth.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/firebase_auth/example/test/firebase_auth.dart b/packages/firebase_auth/example/test/firebase_auth.dart index 52545e1e72b7..d6142e27f49f 100644 --- a/packages/firebase_auth/example/test/firebase_auth.dart +++ b/packages/firebase_auth/example/test/firebase_auth.dart @@ -40,6 +40,7 @@ void main() { expect(user.metadata.creationTime.isAfter(DateTime(2018, 1, 1)), isTrue); expect(user.metadata.creationTime.isBefore(DateTime.now()), isTrue); final IdTokenResult tokenResult = await user.getIdToken(); + final String originalToken = tokenResult.token; expect(tokenResult.token, isNotNull); expect(tokenResult.expirationTime.isAfter(DateTime.now()), isTrue); expect(tokenResult.authTime, isNotNull); @@ -53,6 +54,9 @@ void main() { expect(tokenResult.claims['provider_id'], 'anonymous'); expect(tokenResult.claims['firebase']['sign_in_provider'], 'anonymous'); expect(tokenResult.claims['user_id'], user.uid); + // Verify that token will be the same after another getIdToken call with refresh = false option + final IdTokenResult newTokenResultWithoutRefresh = await user.getIdToken(refresh: false); + expect(originalToken, newTokenResultWithoutRefresh.token); await auth.signOut(); final FirebaseUser user2 = (await auth.signInAnonymously()).user; expect(user2.uid, isNot(equals(user.uid))); From 279365ddc5ad3cc2636c2e3d6848367f3acb3516 Mon Sep 17 00:00:00 2001 From: azaiats Date: Fri, 1 Nov 2019 12:56:45 +0200 Subject: [PATCH 3/7] Fixed code style issues in auth test --- packages/firebase_auth/example/test/firebase_auth.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/firebase_auth/example/test/firebase_auth.dart b/packages/firebase_auth/example/test/firebase_auth.dart index d6142e27f49f..cbbe7d4f23bf 100644 --- a/packages/firebase_auth/example/test/firebase_auth.dart +++ b/packages/firebase_auth/example/test/firebase_auth.dart @@ -55,7 +55,8 @@ void main() { expect(tokenResult.claims['firebase']['sign_in_provider'], 'anonymous'); expect(tokenResult.claims['user_id'], user.uid); // Verify that token will be the same after another getIdToken call with refresh = false option - final IdTokenResult newTokenResultWithoutRefresh = await user.getIdToken(refresh: false); + final IdTokenResult newTokenResultWithoutRefresh = + await user.getIdToken(refresh: false); expect(originalToken, newTokenResultWithoutRefresh.token); await auth.signOut(); final FirebaseUser user2 = (await auth.signInAnonymously()).user; From 72f8765a268a9f47cb92156a3f5b668658cd41eb Mon Sep 17 00:00:00 2001 From: azaiats Date: Thu, 7 Nov 2019 18:04:13 +0200 Subject: [PATCH 4/7] Rebase fixes --- packages/firebase_auth/CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md index 080723d07dca..bb40d9149cac 100644 --- a/packages/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/CHANGELOG.md @@ -1,14 +1,15 @@ ## 0.14.0+8 +<<<<<<< HEAD * Updated README instructions for contributing for consistency with other Flutterfire plugins. +======= +* getIdToken use actual refresh value instead of checking if object exists +>>>>>>> Rebase fixes ## 0.14.0+7 -<<<<<<< HEAD * Remove AndroidX warning. -======= -* Do not ignore "refresh" value for "getIdToken" on iOS ->>>>>>> getIdToken use actual refresh value instead of checking if object exists + ## 0.14.0+6 From 86bee232a7fb98da8f36cf8233eb664451611276 Mon Sep 17 00:00:00 2001 From: azaiats Date: Fri, 8 Nov 2019 11:13:25 +0200 Subject: [PATCH 5/7] CollinJackson review fixes --- packages/firebase_auth/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md index bb40d9149cac..9caeeaf14c3f 100644 --- a/packages/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/CHANGELOG.md @@ -10,7 +10,6 @@ * Remove AndroidX warning. - ## 0.14.0+6 * Update example app with correct const constructors. From 6aa503e406582e0d63213083ba5f2eb9e92bb8dd Mon Sep 17 00:00:00 2001 From: azaiats Date: Fri, 8 Nov 2019 12:26:32 +0200 Subject: [PATCH 6/7] Rebase with master --- packages/firebase_auth/CHANGELOG.md | 8 ++++---- packages/firebase_auth/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md index 9caeeaf14c3f..25631173bfc5 100644 --- a/packages/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/CHANGELOG.md @@ -1,10 +1,10 @@ +## 0.14.0+9 + +* getIdToken use actual refresh value instead of checking if object exists + ## 0.14.0+8 -<<<<<<< HEAD * Updated README instructions for contributing for consistency with other Flutterfire plugins. -======= -* getIdToken use actual refresh value instead of checking if object exists ->>>>>>> Rebase fixes ## 0.14.0+7 diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml index 398d4238c312..8d005e860373 100755 --- a/packages/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/pubspec.yaml @@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS like Google, Facebook and Twitter. author: Flutter Team homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_auth -version: 0.14.0+8 +version: 0.14.0+9 flutter: plugin: From f6d1bdc59fa3685ddca3a16fe95d8b55aa71fb38 Mon Sep 17 00:00:00 2001 From: Alexei Date: Wed, 13 Nov 2019 16:49:06 +0200 Subject: [PATCH 7/7] Update packages/firebase_auth/CHANGELOG.md Co-Authored-By: Collin Jackson --- packages/firebase_auth/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md index 25631173bfc5..6b76e208b3df 100644 --- a/packages/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.14.0+9 -* getIdToken use actual refresh value instead of checking if object exists +* Fix the behavior of `getIdToken` to use the `refresh` parameter instead of always refreshing. ## 0.14.0+8