From a36fa95f08ed6c2cb0736eb0d0871cfb1c58f04a Mon Sep 17 00:00:00 2001 From: German Saprykin Date: Thu, 5 Oct 2017 22:29:11 +0800 Subject: [PATCH 1/5] Update firebase_auth deprecated api --- .../io/flutter/firebaseauth/FirebaseAuthPlugin.java | 4 ++-- packages/firebase_auth/lib/firebase_auth.dart | 4 ++-- packages/firebase_auth/test/firebase_auth_test.dart | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/firebaseauth/FirebaseAuthPlugin.java index ee922d8654f1..406751732ecd 100755 --- a/packages/firebase_auth/android/src/main/java/io/flutter/firebaseauth/FirebaseAuthPlugin.java +++ b/packages/firebase_auth/android/src/main/java/io/flutter/firebaseauth/FirebaseAuthPlugin.java @@ -70,7 +70,7 @@ public void onMethodCall(MethodCall call, Result result) { case "signOut": handleSignOut(call, result); break; - case "getToken": + case "getIdToken": handleGetToken(call, result); break; case "linkWithEmailAndPassword": @@ -170,7 +170,7 @@ private void handleGetToken(MethodCall call, final Result result) { boolean refresh = arguments.get("refresh"); firebaseAuth .getCurrentUser() - .getToken(refresh) + .getIdToken(refresh) .addOnCompleteListener( new OnCompleteListener() { public void onComplete(@NonNull Task task) { diff --git a/packages/firebase_auth/lib/firebase_auth.dart b/packages/firebase_auth/lib/firebase_auth.dart index 5fee7c040d69..679d043572d9 100755 --- a/packages/firebase_auth/lib/firebase_auth.dart +++ b/packages/firebase_auth/lib/firebase_auth.dart @@ -55,8 +55,8 @@ class FirebaseUser extends UserInfo { /// Obtains the id token for the current user, forcing a [refresh] if desired. /// /// Completes with an error if the user is signed out. - Future getToken({bool refresh: false}) { - return FirebaseAuth.channel.invokeMethod('getToken', { + Future getIdToken({bool refresh: false}) { + return FirebaseAuth.channel.invokeMethod('getIdToken', { 'refresh': refresh, }); } diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart index c69962d7da08..c7a9acc00790 100755 --- a/packages/firebase_auth/test/firebase_auth_test.dart +++ b/packages/firebase_auth/test/firebase_auth_test.dart @@ -27,7 +27,7 @@ void main() { FirebaseAuth.channel.setMockMethodCallHandler((MethodCall call) async { log.add(call); switch (call.method) { - case "getToken": + case "getIdToken": return kMockIdToken; break; default: @@ -75,14 +75,15 @@ void main() { test('signInAnonymously', () async { final FirebaseUser user = await auth.signInAnonymously(); verifyUser(user); - expect(await user.getToken(), equals(kMockIdToken)); - expect(await user.getToken(refresh: true), equals(kMockIdToken)); + expect(await user.getIdToken(), equals(kMockIdToken)); + expect(await user.getIdToken(refresh: true), equals(kMockIdToken)); expect( log, equals([ const MethodCall('signInAnonymously'), - const MethodCall('getToken', const {'refresh': false}), - const MethodCall('getToken', const {'refresh': true}), + const MethodCall( + 'getIdToken', const {'refresh': false}), + const MethodCall('getIdToken', const {'refresh': true}), ]), ); }); From 890559f546d640abab44c8978b651936dc4255d6 Mon Sep 17 00:00:00 2001 From: German Saprykin Date: Thu, 5 Oct 2017 22:29:57 +0800 Subject: [PATCH 2/5] Suppress unchecked warning in firebase_database --- .../plugins/firebase/database/FirebaseDatabasePlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/firebase_database/android/src/main/java/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.java b/packages/firebase_database/android/src/main/java/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.java index ed9e561bf46d..3c7930433f8b 100644 --- a/packages/firebase_database/android/src/main/java/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.java +++ b/packages/firebase_database/android/src/main/java/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.java @@ -263,7 +263,8 @@ public void onMethodCall(MethodCall call, final Result result) { case "DatabaseReference#update": { Map arguments = call.arguments(); - Map value = (Map) arguments.get("value"); + @SuppressWarnings("unchecked") + Map value = (Map) arguments.get("value"); DatabaseReference reference = getReference(arguments); reference.updateChildren(value, new DefaultCompletionListener(result)); break; From 6516cadb16ee04f09cc4f227936c45fc10882edd Mon Sep 17 00:00:00 2001 From: German Saprykin Date: Thu, 5 Oct 2017 22:37:30 +0800 Subject: [PATCH 3/5] Update example for firebase_auth --- packages/firebase_auth/example/lib/main.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_auth/example/lib/main.dart b/packages/firebase_auth/example/lib/main.dart index acd8c9312e54..37b1eaa66c28 100755 --- a/packages/firebase_auth/example/lib/main.dart +++ b/packages/firebase_auth/example/lib/main.dart @@ -43,7 +43,7 @@ class _MyHomePageState extends State { assert(user != null); assert(user.isAnonymous); assert(!user.isEmailVerified); - assert(await user.getToken() != null); + assert(await user.getIdToken() != null); if (Platform.isIOS) { // Anonymous auth doesn't show up as a provider on iOS assert(user.providerData.isEmpty); @@ -74,7 +74,7 @@ class _MyHomePageState extends State { assert(user.email != null); assert(user.displayName != null); assert(!user.isAnonymous); - assert(await user.getToken() != null); + assert(await user.getIdToken() != null); final FirebaseUser currentUser = await _auth.currentUser(); assert(user.uid == currentUser.uid); From 0474a49811affb9da9febbc7cc4160e9a6148bc4 Mon Sep 17 00:00:00 2001 From: German Saprykin Date: Tue, 10 Oct 2017 09:03:41 +0800 Subject: [PATCH 4/5] Fix iOS warnings --- .../firebase_auth/ios/Classes/FirebaseAuthPlugin.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m index 5f02f1d0e2c0..e53e4319a7a0 100644 --- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m +++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m @@ -101,17 +101,17 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result } else { [self sendResult:result forUser:nil error:nil]; } - } else if ([@"getToken" isEqualToString:call.method]) { + } else if ([@"getIdToken" isEqualToString:call.method]) { [[FIRAuth auth].currentUser - getTokenForcingRefresh:YES - completion:^(NSString *_Nullable token, NSError *_Nullable error) { - result(error != nil ? error.flutterError : token); - }]; + getIDTokenForcingRefresh:YES + completion:^(NSString *_Nullable token, NSError *_Nullable error) { + result(error != nil ? error.flutterError : token); + }]; } else if ([@"linkWithEmailAndPassword" isEqualToString:call.method]) { NSString *email = call.arguments[@"email"]; NSString *password = call.arguments[@"password"]; FIRAuthCredential *credential = - [FIREmailPasswordAuthProvider credentialWithEmail:email password:password]; + [FIREmailAuthProvider credentialWithEmail:email password:password]; [[FIRAuth auth].currentUser linkWithCredential:credential completion:^(FIRUser *user, NSError *error) { [self sendResult:result forUser:user error:error]; From 4219e26682252b545be43147f4ee81b91104db6f Mon Sep 17 00:00:00 2001 From: German Saprykin Date: Tue, 10 Oct 2017 09:08:44 +0800 Subject: [PATCH 5/5] Updated pubspec.yaml and CHANGELOG --- packages/firebase_auth/CHANGELOG.md | 4 ++++ packages/firebase_auth/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md index 0d879f3dcc30..7784c1ef5155 100644 --- a/packages/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0 + +* **Breaking Change**: Method FirebaseUser getToken was renamed to getIdToken. + ## 0.2.3+1 * Aligned author name with rest of repo. diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml index a7ce37b78785..12430d6d62fe 100755 --- a/packages/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/pubspec.yaml @@ -3,7 +3,7 @@ name: firebase_auth description: Firebase Auth plugin for Flutter. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth -version: 0.2.3+1 +version: 0.3.0 flutter: plugin: