Adding support for FirebaseUser.unlink(providerId)

* Unlink an auth provider from a user account

Author: ko2ic

packages/firebase_auth/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.3
+
+* Adding support for FirebaseUser.unlink(providerId)
+
 ## 0.6.2+1
 
 * Bump Android dependencies to latest.

packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java

@@ -118,6 +118,8 @@ public void onMethodCall(MethodCall call, Result result) {
         break;
       case "linkWithTwitterCredential":
         handleLinkWithTwitterCredential(call, result, getAuth(call));
+      case "unlink":
+        handleUnlink(call, result, getAuth(call));
         break;
       case "updateEmail":
         handleUpdateEmail(call, result, getAuth(call));
@@ -434,6 +436,15 @@ private void handleSignInWithCustomToken(
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
+  private void handleUnlink(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
+    String providerId = arguments.get("providerId");
+    firebaseAuth
+        .getCurrentUser()
+        .unlink(providerId)
+        .addOnCompleteListener(new SignInCompleteListener(result));
+  }
+
   private void handleSignOut(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
     firebaseAuth.signOut();
     result.success(null);

packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m

@@ -199,6 +199,16 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                 completion:^(FIRUser *user, NSError *error) {
                   [self sendResult:result forUser:user error:error];
                 }];
+    [[FIRAuth auth].currentUser linkWithCredential:credential
+                                        completion:^(FIRUser *user, NSError *error) {
+                                          [self sendResult:result forUser:user error:error];
+                                        }];
+  } else if ([@"unlink" isEqualToString:call.method]) {
+    NSString *providerId = call.arguments[@"providerId"];
+    [[FIRAuth auth].currentUser unlinkFromProvider:providerId
+                                        completion:^(FIRUser *user, NSError *error) {
+                                          [self sendResult:result forUser:user error:error];
+                                        }];
   } else if ([@"updateEmail" isEqualToString:call.method]) {
     NSString *email = call.arguments[@"email"];
     [[self getAuth:call.arguments].currentUser updateEmail:email
@@ -212,6 +222,10 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
             completion:^(NSError *error) {
               [self sendResult:result forUser:nil error:error];
             }];
+    [[FIRAuth auth].currentUser updatePassword:password
+                                    completion:^(NSError *error) {
+                                      [self sendResult:result forUser:nil error:error];
+                                    }];
   } else if ([@"updateProfile" isEqualToString:call.method]) {
     FIRUserProfileChangeRequest *changeRequest =
         [[self getAuth:call.arguments].currentUser profileChangeRequest];

packages/firebase_auth/lib/firebase_auth.dart

@@ -16,6 +16,7 @@ class FirebaseUserMetadata {
   final Map<dynamic, dynamic> _data;
 
   int get creationTimestamp => _data['creationTimestamp'];
+
   int get lastSignInTimestamp => _data['lastSignInTimestamp'];
 }
 
@@ -57,8 +58,7 @@ class UserUpdateInfo {
   /// Container of data that will be send in update request
   final Map<String, String> _updateData = <String, String>{};
 
-  set displayName(String displayName) =>
-      _updateData["displayName"] = displayName;
+  set displayName(String displayName) => _updateData["displayName"] = displayName;
 
   String get displayName => _updateData["displayName"];
 
@@ -70,9 +70,7 @@ class UserUpdateInfo {
 /// Represents a user.
 class FirebaseUser extends UserInfo {
   FirebaseUser._(Map<dynamic, dynamic> data, FirebaseApp app)
-      : providerData = data['providerData']
-            .map<UserInfo>((dynamic item) => UserInfo._(item, app))
-            .toList(),
+      : providerData = data['providerData'].map<UserInfo>((dynamic item) => UserInfo._(item, app)).toList(),
         _metadata = FirebaseUserMetadata._(data),
         super._(data, app);
 
@@ -93,28 +91,24 @@ class FirebaseUser extends UserInfo {
   ///
   /// Completes with an error if the user is signed out.
   Future<String> getIdToken({bool refresh = false}) async {
-    return await FirebaseAuth.channel
-        .invokeMethod('getIdToken', <String, dynamic>{
+    return await FirebaseAuth.channel.invokeMethod('getIdToken', <String, dynamic>{
       'refresh': refresh,
       'app': app.name,
     });
   }
 
   Future<void> sendEmailVerification() async {
-    await FirebaseAuth.channel.invokeMethod(
-        'sendEmailVerification', <String, String>{'app': app.name});
+    await FirebaseAuth.channel.invokeMethod('sendEmailVerification', <String, String>{'app': app.name});
   }
 
   /// Manually refreshes the data of the current user (for example, attached providers, display name, and so on).
   Future<void> reload() async {
-    await FirebaseAuth.channel
-        .invokeMethod('reload', <String, String>{'app': app.name});
+    await FirebaseAuth.channel.invokeMethod('reload', <String, String>{'app': app.name});
   }
 
   /// Deletes the user record from your Firebase project's database.
   Future<void> delete() async {
-    await FirebaseAuth.channel
-        .invokeMethod('delete', <String, String>{'app': app.name});
+    await FirebaseAuth.channel.invokeMethod('delete', <String, String>{'app': app.name});
   }
 
   /// Updates the email address of the user.
@@ -165,8 +159,7 @@ typedef void PhoneCodeSent(String verificationId, [int forceResendingToken]);
 typedef void PhoneCodeAutoRetrievalTimeout(String verificationId);
 
 class FirebaseAuth {
-  FirebaseAuth({FirebaseApp app})
-      : app = app != null ? app : FirebaseApp.instance {
+  FirebaseAuth({FirebaseApp app}) : app = app != null ? app : FirebaseApp.instance {
     channel.setMethodCallHandler(_callHandler);
   }
 
@@ -179,12 +172,10 @@ class FirebaseAuth {
     'plugins.flutter.io/firebase_auth',
   );
 
-  final Map<int, StreamController<FirebaseUser>> _authStateChangedControllers =
-      <int, StreamController<FirebaseUser>>{};
+  final Map<int, StreamController<FirebaseUser>> _authStateChangedControllers = <int, StreamController<FirebaseUser>>{};
 
   static int nextHandle = 0;
-  final Map<int, Map<String, dynamic>> _phoneAuthCallbacks =
-      <int, Map<String, dynamic>>{};
+  final Map<int, Map<String, dynamic>> _phoneAuthCallbacks = <int, Map<String, dynamic>>{};
 
   FirebaseApp app;
 
@@ -194,15 +185,13 @@ class FirebaseAuth {
 
     StreamController<FirebaseUser> controller;
     controller = StreamController<FirebaseUser>.broadcast(onListen: () {
-      _handle = channel.invokeMethod('startListeningAuthState',
-          <String, String>{"app": app.name}).then<int>((dynamic v) => v);
+      _handle = channel.invokeMethod('startListeningAuthState', <String, String>{"app": app.name}).then<int>((dynamic v) => v);
       _handle.then((int handle) {
         _authStateChangedControllers[handle] = controller;
       });
     }, onCancel: () {
       _handle.then((int handle) async {
-        await channel.invokeMethod("stopListeningAuthState",
-            <String, dynamic>{"id": handle, "app": app.name});
+        await channel.invokeMethod("stopListeningAuthState", <String, dynamic>{"id": handle, "app": app.name});
         _authStateChangedControllers.remove(handle);
       });
     });
@@ -220,8 +209,7 @@ class FirebaseAuth {
   /// FIRAuthErrorCodeOperationNotAllowed - Indicates that anonymous accounts are not enabled. Enable them in the Auth section of the Firebase console.
   /// See FIRAuthErrors for a list of error codes that are common to all API methods.
   Future<FirebaseUser> signInAnonymously() async {
-    final Map<dynamic, dynamic> data = await channel
-        .invokeMethod('signInAnonymously', <String, String>{"app": app.name});
+    final Map<dynamic, dynamic> data = await channel.invokeMethod('signInAnonymously', <String, String>{"app": app.name});
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
@@ -275,12 +263,9 @@ class FirebaseAuth {
     return currentUser;
   }
 
-  Future<FirebaseUser> signInWithFacebook(
-      {@required String accessToken}) async {
+  Future<FirebaseUser> signInWithFacebook({@required String accessToken}) async {
     assert(accessToken != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-        'signInWithFacebook',
-        <String, String>{'accessToken': accessToken, 'app': app.name});
+    final Map<dynamic, dynamic> data = await channel.invokeMethod('signInWithFacebook', <String, String>{'accessToken': accessToken, 'app': app.name});
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
@@ -294,12 +279,7 @@ class FirebaseAuth {
   }) async {
     assert(authToken != null);
     assert(authTokenSecret != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-        'signInWithTwitter', <String, String>{
-      'authToken': authToken,
-      'authTokenSecret': authTokenSecret,
-      'app': app.name
-    });
+    final Map<dynamic, dynamic> data = await channel.invokeMethod('signInWithTwitter', <String, String>{'authToken': authToken, 'authTokenSecret': authTokenSecret, 'app': app.name});
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
@@ -312,11 +292,7 @@ class FirebaseAuth {
     assert(accessToken != null);
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'signInWithGoogle',
-      <String, String>{
-        'idToken': idToken,
-        'accessToken': accessToken,
-        'app': app.name
-      },
+      <String, String>{'idToken': idToken, 'accessToken': accessToken, 'app': app.name},
     );
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
@@ -328,11 +304,7 @@ class FirebaseAuth {
   }) async {
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'signInWithPhoneNumber',
-      <String, String>{
-        'verificationId': verificationId,
-        'smsCode': smsCode,
-        'app': app.name
-      },
+      <String, String>{'verificationId': verificationId, 'smsCode': smsCode, 'app': app.name},
     );
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
@@ -378,16 +350,13 @@ class FirebaseAuth {
   }
 
   Future<void> signOut() async {
-    return await channel
-        .invokeMethod("signOut", <String, String>{'app': app.name});
+    return await channel.invokeMethod("signOut", <String, String>{'app': app.name});
   }
 
   /// Asynchronously gets current user, or `null` if there is none.
   Future<FirebaseUser> currentUser() async {
-    final Map<dynamic, dynamic> data = await channel
-        .invokeMethod("currentUser", <String, String>{'app': app.name});
-    final FirebaseUser currentUser =
-        data == null ? null : FirebaseUser._(data, app);
+    final Map<dynamic, dynamic> data = await channel.invokeMethod("currentUser", <String, String>{'app': app.name});
+    final FirebaseUser currentUser = data == null ? null : FirebaseUser._(data, app);
     return currentUser;
   }
 
@@ -427,11 +396,7 @@ class FirebaseAuth {
     assert(accessToken != null);
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'linkWithGoogleCredential',
-      <String, String>{
-        'idToken': idToken,
-        'accessToken': accessToken,
-        'app': app.name
-      },
+      <String, String>{'idToken': idToken, 'accessToken': accessToken, 'app': app.name},
     );
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
@@ -465,6 +430,19 @@ class FirebaseAuth {
     return currentUser;
   }
 
+  Future<FirebaseUser> unlink({
+    @required String providerId,
+  }) async {
+    final Map<dynamic, dynamic> data = await channel.invokeMethod(
+      'unlink',
+      <String, String>{
+        'providerId': providerId,
+      },
+    );
+    final FirebaseUser currentUser = FirebaseUser._(data, app);
+    return currentUser;
+  }
+
   /// Sets the user-facing language code for auth operations that can be
   /// internationalized, such as [sendEmailVerification]. This language
   /// code should follow the conventions defined by the IETF in BCP47.
@@ -483,25 +461,21 @@ class FirebaseAuth {
         break;
       case 'phoneVerificationCompleted':
         final int handle = call.arguments['handle'];
-        final PhoneVerificationCompleted verificationCompleted =
-            _phoneAuthCallbacks[handle]['PhoneVerificationCompleted'];
+        final PhoneVerificationCompleted verificationCompleted = _phoneAuthCallbacks[handle]['PhoneVerificationCompleted'];
         verificationCompleted(await currentUser());
         break;
       case 'phoneVerificationFailed':
         final int handle = call.arguments['handle'];
-        final PhoneVerificationFailed verificationFailed =
-            _phoneAuthCallbacks[handle]['PhoneVerificationFailed'];
+        final PhoneVerificationFailed verificationFailed = _phoneAuthCallbacks[handle]['PhoneVerificationFailed'];
         final Map<dynamic, dynamic> exception = call.arguments['exception'];
-        verificationFailed(
-            AuthException(exception['code'], exception['message']));
+        verificationFailed(AuthException(exception['code'], exception['message']));
         break;
       case 'phoneCodeSent':
         final int handle = call.arguments['handle'];
         final String verificationId = call.arguments['verificationId'];
         final int forceResendingToken = call.arguments['forceResendingToken'];
 
-        final PhoneCodeSent codeSent =
-            _phoneAuthCallbacks[handle]['PhoneCodeSent'];
+        final PhoneCodeSent codeSent = _phoneAuthCallbacks[handle]['PhoneCodeSent'];
         if (forceResendingToken == null) {
           codeSent(verificationId);
         } else {
@@ -510,8 +484,7 @@ class FirebaseAuth {
         break;
       case 'phoneCodeAutoRetrievalTimeout':
         final int handle = call.arguments['handle'];
-        final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
-            _phoneAuthCallbacks[handle]['PhoneCodeAutoRetrievealTimeout'];
+        final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout = _phoneAuthCallbacks[handle]['PhoneCodeAutoRetrievealTimeout'];
         final String verificationId = call.arguments['verificationId'];
         codeAutoRetrievalTimeout(verificationId);
         break;
@@ -522,8 +495,7 @@ class FirebaseAuth {
     final Map<dynamic, dynamic> data = call.arguments["user"];
     final int id = call.arguments["id"];
 
-    final FirebaseUser currentUser =
-        data != null ? FirebaseUser._(data, app) : null;
+    final FirebaseUser currentUser = data != null ? FirebaseUser._(data, app) : null;
     _authStateChangedControllers[id].add(currentUser);
   }
 }

packages/firebase_auth/test/firebase_auth_test.dart

@@ -287,6 +287,24 @@ void main() {
       );
     });
 
+    test('unlink', () async {
+      final FirebaseUser user = await auth.unlink(
+        providerId: kMockProviderId,
+      );
+      verifyUser(user);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'unlink',
+            arguments: <String, String>{
+              'providerId': kMockProviderId,
+            },
+          ),
+        ],
+      );
+    });
+
     test('signInWithFacebook', () async {
       final FirebaseUser user = await auth.signInWithFacebook(
         accessToken: kMockAccessToken,