Revert "Added updatePassword functionality to firebase_auth plugin. (flutter#678)"

andreidiaconu · web-flow · commit bb15df624901 · 2019-02-17T22:00:59.000+02:00
This reverts commit 8e1a4e5.
diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
@@ -1,9 +1,3 @@
-## 0.6.0
-
-* Added support for `updatePassword` in `FirebaseUser`.
-* **Breaking Change** Moved `updateEmail` and `updateProfile` to `FirebaseUser`.
-  This brings the `firebase_auth` package inline with other implementations and documentation.
-
 ## 0.5.20
 
 * Replaced usages of guava's: ImmutableList and ImmutableMap with platform
@@ -21,7 +15,7 @@ Collections.unmodifiableList() and Collections.unmodifiableMap().
 
 ## 0.5.17
 
-* Adding support for FirebaseUser.delete.
+* Adding support for FirebaseUser.delete. 
 
 ## 0.5.16
 
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -111,15 +111,12 @@ public void onMethodCall(MethodCall call, Result result) {
       case "linkWithFacebookCredential":
         handleLinkWithFacebookCredential(call, result);
         break;
-      case "updateEmail":
-        handleUpdateEmail(call, result);
-        break;
-      case "updatePassword":
-        handleUpdatePassword(call, result);
-        break;
       case "updateProfile":
         handleUpdateProfile(call, result);
         break;
+      case "updateEmail":
+        handleUpdateEmail(call, result);
+        break;
       case "startListeningAuthState":
         handleStartListeningAuthState(call, result);
         break;
@@ -142,7 +139,6 @@ public void onMethodCall(MethodCall call, Result result) {
   }
 
   private void handleSignInWithPhoneNumber(MethodCall call, Result result) {
-    @SuppressWarnings("unchecked")
     Map<String, String> arguments = (Map<String, String>) call.arguments;
     String verificationId = arguments.get("verificationId");
     String smsCode = arguments.get("smsCode");
@@ -428,24 +424,6 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
             });
   }
 
-  private void handleUpdateEmail(MethodCall call, final Result result) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
-    firebaseAuth
-        .getCurrentUser()
-        .updateEmail(arguments.get("email"))
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
-  }
-
-  private void handleUpdatePassword(MethodCall call, final Result result) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
-    firebaseAuth
-        .getCurrentUser()
-        .updatePassword(arguments.get("password"))
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
-  }
-
   private void handleUpdateProfile(MethodCall call, final Result result) {
     @SuppressWarnings("unchecked")
     Map<String, String> arguments = (Map<String, String>) call.arguments;
@@ -461,7 +439,40 @@ private void handleUpdateProfile(MethodCall call, final Result result) {
     firebaseAuth
         .getCurrentUser()
         .updateProfile(builder.build())
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
+        .addOnCompleteListener(
+            new OnCompleteListener<Void>() {
+              @Override
+              public void onComplete(@NonNull Task<Void> task) {
+                if (!task.isSuccessful()) {
+                  Exception e = task.getException();
+                  result.error(ERROR_REASON_EXCEPTION, e.getMessage(), null);
+                } else {
+                  result.success(null);
+                }
+              }
+            });
+  }
+
+  private void handleUpdateEmail(MethodCall call, final Result result) {
+    @SuppressWarnings("unchecked")
+    Map<String, String> arguments = (Map<String, String>) call.arguments;
+    String email = arguments.get("email");
+
+    firebaseAuth
+        .getCurrentUser()
+        .updateEmail(email)
+        .addOnCompleteListener(
+            new OnCompleteListener<Void>() {
+              @Override
+              public void onComplete(@NonNull Task<Void> task) {
+                if (!task.isSuccessful()) {
+                  Exception e = task.getException();
+                  result.error(ERROR_REASON_EXCEPTION, e.getMessage(), null);
+                } else {
+                  result.success(null);
+                }
+              }
+            });
   }
 
   private void handleStartListeningAuthState(MethodCall call, final Result result) {
diff --git a/packages/firebase_auth/example/lib/main.dart b/packages/firebase_auth/example/lib/main.dart
@@ -99,7 +99,7 @@ class _MyHomePageState extends State<MyHomePage> {
         (AuthException authException) {
       setState(() {
         _message = Future<String>.value(
-            'Phone number verification failed. Code: ${authException.code}. Message: ${authException.message}');
+            'Phone numbber verification failed. Code: ${authException.code}. Message: ${authException.message}');
       });
     };
 
diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
@@ -176,18 +176,6 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                                         completion:^(FIRUser *user, NSError *error) {
                                           [self sendResult:result forUser:user error:error];
                                         }];
-  } else if ([@"updateEmail" isEqualToString:call.method]) {
-    NSString *email = call.arguments[@"email"];
-    [[FIRAuth auth].currentUser updateEmail:email
-                                 completion:^(NSError *error) {
-                                   [self sendResult:result forUser:nil error:error];
-                                 }];
-  } else if ([@"updatePassword" isEqualToString:call.method]) {
-    NSString *password = call.arguments[@"password"];
-    [[FIRAuth auth].currentUser updatePassword:password
-                                    completion:^(NSError *error) {
-                                      [self sendResult:result forUser:nil error:error];
-                                    }];
   } else if ([@"updateProfile" isEqualToString:call.method]) {
     FIRUserProfileChangeRequest *changeRequest = [[FIRAuth auth].currentUser profileChangeRequest];
     if (call.arguments[@"displayName"]) {
@@ -199,6 +187,12 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [changeRequest commitChangesWithCompletion:^(NSError *error) {
       [self sendResult:result forUser:nil error:error];
     }];
+  } else if ([@"updateEmail" isEqualToString:call.method]) {
+    NSString *toEmail = call.arguments[@"email"];
+    [[FIRAuth auth].currentUser updateEmail:toEmail
+                                 completion:^(NSError *_Nullable error) {
+                                   [self sendResult:result forUser:nil error:error];
+                                 }];
   } else if ([@"signInWithCustomToken" isEqualToString:call.method]) {
     NSString *token = call.arguments[@"token"];
     [[FIRAuth auth] signInWithCustomToken:token
diff --git a/packages/firebase_auth/lib/firebase_auth.dart b/packages/firebase_auth/lib/firebase_auth.dart
@@ -95,33 +95,6 @@ class FirebaseUser extends UserInfo {
     await FirebaseAuth.channel.invokeMethod('delete');
   }
 
-  /// Updates the email address of the user.
-  Future<void> updateEmail(String email) async {
-    assert(email != null);
-    return await FirebaseAuth.channel.invokeMethod(
-      'updateEmail',
-      <String, String>{'email': email},
-    );
-  }
-
-  /// Updates the password of the user.
-  Future<void> updatePassword(String password) async {
-    assert(password != null);
-    return await FirebaseAuth.channel.invokeMethod(
-      'updatePassword',
-      <String, String>{'password': password},
-    );
-  }
-
-  /// Updates the user profile information.
-  Future<void> updateProfile(UserUpdateInfo userUpdateInfo) async {
-    assert(userUpdateInfo != null);
-    return await FirebaseAuth.channel.invokeMethod(
-      'updateProfile',
-      userUpdateInfo._updateData,
-    );
-  }
-
   @override
   String toString() {
     return '$runtimeType($_data)';
@@ -395,6 +368,26 @@ class FirebaseAuth {
     return currentUser;
   }
 
+  Future<void> updateEmail({
+    @required String email,
+  }) async {
+    assert(email != null);
+    return await channel.invokeMethod(
+      'updateEmail',
+      <String, String>{
+        'email': email,
+      },
+    );
+  }
+
+  Future<void> updateProfile(UserUpdateInfo userUpdateInfo) async {
+    assert(userUpdateInfo != null);
+    return await channel.invokeMethod(
+      'updateProfile',
+      userUpdateInfo._updateData,
+    );
+  }
+
   /// Links google account with current user and returns [Future<FirebaseUser>]
   ///
   /// throws [PlatformException] when
diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart
@@ -41,11 +41,12 @@ void main() {
             return mockHandleId++;
             break;
           case "sendPasswordResetEmail":
-          case "updateEmail":
-          case "updatePassword":
           case "updateProfile":
             return null;
             break;
+          case "updateEmail":
+            return null;
+            break;
           case "fetchProvidersForEmail":
             return List<String>(0);
             break;
@@ -358,52 +359,13 @@ void main() {
       );
     });
 
-    test('updateEmail', () async {
-      final FirebaseUser user = await auth.currentUser();
-      await user.updateEmail(kMockEmail);
-      expect(log, <Matcher>[
-        isMethodCall(
-          'currentUser',
-          arguments: null,
-        ),
-        isMethodCall(
-          'updateEmail',
-          arguments: <String, String>{
-            'email': kMockEmail,
-          },
-        ),
-      ]);
-    });
-
-    test('updatePassword', () async {
-      final FirebaseUser user = await auth.currentUser();
-      await user.updatePassword(kMockPassword);
-      expect(log, <Matcher>[
-        isMethodCall(
-          'currentUser',
-          arguments: null,
-        ),
-        isMethodCall(
-          'updatePassword',
-          arguments: <String, String>{
-            'password': kMockPassword,
-          },
-        ),
-      ]);
-    });
-
     test('updateProfile', () async {
       final UserUpdateInfo userUpdateInfo = UserUpdateInfo();
       userUpdateInfo.photoUrl = kMockPhotoUrl;
       userUpdateInfo.displayName = kMockDisplayName;
 
-      final FirebaseUser user = await auth.currentUser();
-      await user.updateProfile(userUpdateInfo);
+      await auth.updateProfile(userUpdateInfo);
       expect(log, <Matcher>[
-        isMethodCall(
-          'currentUser',
-          arguments: null,
-        ),
         isMethodCall(
           'updateProfile',
           arguments: <String, String>{
@@ -414,6 +376,20 @@ void main() {
       ]);
     });
 
+    test('updateEmail', () async {
+      final String updatedEmail = 'atestemail@gmail.com';
+      auth.updateEmail(email: updatedEmail);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'updateEmail',
+            arguments: <String, String>{'email': updatedEmail},
+          ),
+        ],
+      );
+    });
+
     test('signInWithCustomToken', () async {
       final FirebaseUser user =
           await auth.signInWithCustomToken(token: kMockCustomToken);
