Fix auto upgrade for oauth provider (#824)

firebase · Jan 9, 2020 · b92607b · b92607b
1 parent 6d6dfd6
commit b92607b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/Auth/FirebaseAuthUI/FUIAuth.m b/Auth/FirebaseAuthUI/FUIAuth.m
@@ -237,15 +237,11 @@ - (void)autoUpgradeAccountWithProviderUI:(id<FUIAuthProvider>)providerUI
     if (error) {
       // Check for "credential in use" conflict error and handle appropriately.
       if (error.code == FIRAuthErrorCodeCredentialAlreadyInUse) {
-        FIRAuthCredential *newCredential = credential;
-        // Check for and handle special case for Phone Auth Provider.
-        if (providerUI.providerID == FIRPhoneAuthProviderID) {
-          // Obtain temporary Phone Auth credential.
-          newCredential = error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey];
+        FIRAuthCredential *newCredential = error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey];
+        NSDictionary *userInfo = @{ };
+        if (newCredential) {
+          userInfo = @{ FUIAuthCredentialKey : newCredential };
         }
-        NSDictionary *userInfo = @{
-          FUIAuthCredentialKey : newCredential,
-        };
         NSError *mergeError = [FUIAuthErrorUtils mergeConflictErrorWithUserInfo:userInfo
                                                                 underlyingError:error];
         [self completeSignInWithResult:authResult

diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m
@@ -221,7 +221,7 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
 }
 
 - (void)signOut {
-
+  return;
 }
 
 - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)sourceApplication {

diff --git a/OAuth/FirebaseOAuthUI/FUIOAuth.m b/OAuth/FirebaseOAuthUI/FUIOAuth.m
@@ -284,16 +284,7 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
 }
 
 - (void)signOut {
-  FIRUser *user = _authUI.auth.currentUser;
-  __weak UIViewController *weakController = self.presentingViewController;
-  [user deleteWithCompletion:^(NSError * _Nullable error) {
-    if (error) {
-      __strong UIViewController *presentingViewController = weakController;
-      [FUIAuthBaseViewController showAlertWithMessage:error.localizedDescription
-                             presentingViewController:presentingViewController];
-      return;
-    }
-  }];
+  return;
 }
 
 - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)sourceApplication {

diff --git a/PhoneAuth/FirebasePhoneAuthUI/FUIPhoneAuth.m b/PhoneAuth/FirebasePhoneAuthUI/FUIPhoneAuth.m
@@ -165,6 +165,7 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
 }
 
 - (void)signOut {
+  return;
 }
 
 - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)sourceApplication {
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     - (void)signOut {
+      return;
     }
     - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)sourceApplication {
@@ Expand Down @@