Implement additional FUIAuth sign-in call back which returns FIRAuthDataResult

Author: yramanchuk

FirebaseAuthUI/AccountManagement/FUIAccountSettingsOperationForgotPassword.m

@@ -65,30 +65,26 @@ - (void)onPasswordRecovery:(NSString *)email {
 
   [self.delegate.auth sendPasswordResetWithEmail:email
                              completion:^(NSError *_Nullable error) {
-    // The dispatch is a workaround for a bug in FirebaseAuth 3.0.2, which doesn't call the
-    // completion block on the main queue.
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self.delegate decrementActivity];
+    [self.delegate decrementActivity];
 
-      if (error) {
-        [self finishOperationWithError:error];
-        return;
-      }
+    if (error) {
+      [self finishOperationWithError:error];
+      return;
+    }
 
-      NSString *message = [NSString stringWithFormat:
-                              FUILocalizedString(kStr_PasswordRecoveryEmailSentMessage), email];
-      UIAlertController *alertController =
-          [UIAlertController alertControllerWithTitle:nil
-                                              message:message
-                                       preferredStyle:UIAlertControllerStyleAlert];
-      UIAlertAction *okAction = [UIAlertAction actionWithTitle:FUILocalizedString(kStr_OK)
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction *_Nonnull action) {
-                                  [self finishOperationWithError:error];
-                                }];
-      [alertController addAction:okAction];
-      [self.delegate presentViewController:alertController];
-    });
+    NSString *message = [NSString stringWithFormat:
+                            FUILocalizedString(kStr_PasswordRecoveryEmailSentMessage), email];
+    UIAlertController *alertController =
+        [UIAlertController alertControllerWithTitle:nil
+                                            message:message
+                                     preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertAction *okAction = [UIAlertAction actionWithTitle:FUILocalizedString(kStr_OK)
+                                                       style:UIAlertActionStyleDefault
+                                                     handler:^(UIAlertAction *_Nonnull action) {
+                                [self finishOperationWithError:error];
+                              }];
+    [alertController addAction:okAction];
+    [self.delegate presentViewController:alertController];
   }];
 }
 

FirebaseAuthUI/FUIAuth.h

@@ -70,7 +70,7 @@ typedef void (^FUIAuthResultCallback)(FIRUser *_Nullable user, NSError *_Nullabl
     didSignInWithUser:(nullable FIRUser *)user
                 error:(nullable NSError *)error
 __attribute__((deprecated("This is deprecated API and will be removed in a future release."
-                          "Use authUI:didSignInWithAuthDataResult:error:")));
+                          "Instead use authUI:didSignInWithAuthDataResult:error:")));
 
 
 /** @fn authUI:didFinishOperation:error:

FirebaseAuthUI/FUIAuth.m

@@ -186,20 +186,22 @@ - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
         return;
       }
 
-      if (result) {
-        result(authResult.user, error);
-      }
-
       if (error) {
-        [self invokeResultCallbackWithAuthDataResult:authResult error:error];
+        if (result) {
+          result(nil, error);
+        }
+        [self invokeResultCallbackWithAuthDataResult:nil error:error];
       } else {
+        if (result) {
+          result(authResult.user, nil);
+        }
         // Hide Auth Picker Controller which was presented modally.
         if (isAuthPickerShown && presentingViewController.presentingViewController) {
           [presentingViewController dismissViewControllerAnimated:YES completion:^{
-            [self invokeResultCallbackWithAuthDataResult:authResult error:error];
+            [self invokeResultCallbackWithAuthDataResult:authResult error:nil];
           }];
         } else {
-          [self invokeResultCallbackWithAuthDataResult:authResult error:error];
+          [self invokeResultCallbackWithAuthDataResult:authResult error:nil];
         }
       }
     }];

FirebaseAuthUI/FUIPasswordRecoveryViewController.m

@@ -121,28 +121,24 @@ - (void)recoverEmail:(NSString *)email {
 
   [self.auth sendPasswordResetWithEmail:email
                              completion:^(NSError *_Nullable error) {
-     // The dispatch is a workaround for a bug in FirebaseAuth 3.0.2, which doesn't call the
-     // completion block on the main queue.
-     dispatch_async(dispatch_get_main_queue(), ^{
-       [self decrementActivity];
-
-       if (error) {
-         if (error.code == FIRAuthErrorCodeUserNotFound) {
-           [self showAlertWithMessage:FUILocalizedString(kStr_UserNotFoundError)];
-           return;
-         }
-
-         [self.navigationController dismissViewControllerAnimated:YES completion:^{
-           [self.authUI invokeResultCallbackWithAuthDataResult:nil error:error];
-         }];
-         return;
-       }
-
-       NSString *message =
-       [NSString stringWithFormat:FUILocalizedString(kStr_PasswordRecoveryEmailSentMessage), email];
-       [self showAlertWithMessage:message];
-     });
-   }];
+    [self decrementActivity];
+
+    if (error) {
+      if (error.code == FIRAuthErrorCodeUserNotFound) {
+        [self showAlertWithMessage:FUILocalizedString(kStr_UserNotFoundError)];
+        return;
+      }
+
+      [self.navigationController dismissViewControllerAnimated:YES completion:^{
+        [self.authUI invokeResultCallbackWithAuthDataResult:nil error:error];
+      }];
+      return;
+    }
+
+    NSString *message = [NSString stringWithFormat:
+                            FUILocalizedString(kStr_PasswordRecoveryEmailSentMessage), email];
+    [self showAlertWithMessage:message];
+  }];
 }
 
 - (void)textFieldDidChange {