Merge branch 'master' of github.com:firebase/FirebaseUI-iOS

Change-Id: I588f3fcc20698ffd5245f979b67b65c8a189f085

Author: morganchen12

FirebaseAuthUI/FUIAuth.m

@@ -158,10 +158,10 @@ - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
   // Sign out first to make sure sign in starts with a clean state.
   [providerUI signOut];
   [providerUI signInWithDefaultValue:defaultValue
-     presentingViewController:presentingViewController
-                   completion:^(FIRAuthCredential *_Nullable credential,
-                                NSError *_Nullable error,
-                                _Nullable FIRAuthResultCallback result) {
+            presentingViewController:presentingViewController
+                          completion:^(FIRAuthCredential *_Nullable credential,
+                                       NSError *_Nullable error,
+                                       _Nullable FIRAuthResultCallback result) {
     BOOL isAuthPickerShown =
         [presentingViewController isKindOfClass:[FUIAuthPickerViewController class]];
     if (error) {
@@ -177,12 +177,12 @@ - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
     [self.auth signInAndRetrieveDataWithCredential:credential
                                         completion:^(FIRAuthDataResult *_Nullable authResult,
                                                      NSError *_Nullable error) {
-      if (error && error.code == FIRAuthErrorCodeAccountExistsWithDifferentCredential) {
+      if (error.code == FIRAuthErrorCodeAccountExistsWithDifferentCredential) {
         NSString *email = error.userInfo[kErrorUserInfoEmailKey];
         [self handleAccountLinkingForEmail:email
                              newCredential:credential
                   presentingViewController:presentingViewController
-                              singInResult:result];
+                              signInResult:result];
         return;
       }
 
@@ -208,10 +208,20 @@ - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
   }];
 }
 
+/** @fn handleAccountLinkingForEmail:newCredential:presentingViewController:signInResult
+    @brief Handles the account linking case after a user tries to sign-in which has a credential
+        with an email which is already used by a different account.
+    @param email The email address used by an existing account and and also the credential used in
+        the sign-in attempt.
+    @param newCredential The credential used in the lastest sign-in attempt.
+    @param presentingViewController The view controller used to present the UI.
+    @param signInResult block which takes the result of this method as a parameter; a nullable
+        AuthResult indicating success or a nullable Error indicating failure.
+ */
 - (void)handleAccountLinkingForEmail:(NSString *)email
                        newCredential:(FIRAuthCredential *)newCredential
             presentingViewController:(UIViewController *)presentingViewController
-                        singInResult:(_Nullable FIRAuthResultCallback) result {
+                        signInResult:(_Nullable FIRAuthResultCallback)result {
 
   [self.auth fetchProvidersForEmail:email
                          completion:^(NSArray<NSString *> *_Nullable providers,

FirebaseAuthUI/FUIAuth_Internal.h

@@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
         @see FUIAuthDelegate.authUI:didSignInWithAuthDataResult:error: for method callback.
     @param providerUI The authentication provider used for signing in.
     @param presentingViewController The view controller used to present the UI.
-    @param defaultValue The provider default initialization value (e g email or phone number)
+    @param defaultValue The provider default initialization value (e.g. email or phone number)
         used for signing in.
  */
 - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI