Merge pull request #334 from firebase/default_phone

Add default phone number to the Phone Auth number flow.

Author: yramanchuk

FirebaseAuthUI/AccountManagement/FUIAccountSettingsOperation.m

@@ -165,7 +165,7 @@ - (void)reauthenticateWithProvider:(NSString *)providerID
   [self.delegate incrementActivity];
   // Sign out first to make sure sign in starts with a clean state.
   [providerUI signOut];
-  [providerUI signInWithEmail:self.delegate.auth.currentUser.email
+  [providerUI signInWithDefaultValue:self.delegate.auth.currentUser.email
      presentingViewController:[self.delegate presentingController]
                    completion:^(FIRAuthCredential *_Nullable credential,
                                 NSError *_Nullable error,

FirebaseAuthUI/FUIAuth.m

@@ -128,11 +128,12 @@ - (BOOL)signOutWithError:(NSError *_Nullable *_Nullable)error {
 }
 
 - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
-    presentingViewController:(UIViewController *)presentingViewController {
+    presentingViewController:(UIViewController *)presentingViewController
+                defaultValue:(nullable NSString *)defaultValue {
 
   // Sign out first to make sure sign in starts with a clean state.
   [providerUI signOut];
-  [providerUI signInWithEmail:nil
+  [providerUI signInWithDefaultValue:defaultValue
      presentingViewController:presentingViewController
                    completion:^(FIRAuthCredential *_Nullable credential,
                                 NSError *_Nullable error,
@@ -247,7 +248,7 @@ - (void)handleAccountLinkingForEmail:(NSString *)email
                                           signinHandler:^{
       // Sign out first to make sure sign in starts with a clean state.
       [bestProvider signOut];
-      [bestProvider signInWithEmail:email
+      [bestProvider signInWithDefaultValue:email
            presentingViewController:presentingViewController
                          completion:^(FIRAuthCredential *_Nullable credential,
                                       NSError *_Nullable error,

FirebaseAuthUI/FUIAuthPickerViewController.m

@@ -152,7 +152,9 @@ - (void)signInWithEmail {
 }
 
 - (void)didTapSignInButton:(FUIAuthSignInButton *)button {
-  [self.authUI signInWithProviderUI:button.providerUI presentingViewController:self];
+  [self.authUI signInWithProviderUI:button.providerUI
+           presentingViewController:self
+                       defaultValue:nil];
 }
 
 @end

FirebaseAuthUI/FUIAuthProvider.h

@@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /** @typedef FIRAuthProviderSignInCompletionBlock
     @brief The type of block used to notify the auth system of the result of a sign-in flow.
-        @see FUIAuthProvider.signInWithEmail:presentingViewController:completion:
+        @see FUIAuthProvider.signInWithDefaultValue:presentingViewController:completion:
     @param credential The @c FIRAuthCredential object created after user interaction with third 
         party provider.
     @param error The error which may happen during creation of The @c FIRAuthCredential object.
@@ -90,7 +90,26 @@ typedef void (^FIRAuthProviderSignInCompletionBlock) (
  */
 - (void)signInWithEmail:(nullable NSString *)email
     presentingViewController:(nullable UIViewController *)presentingViewController
-                  completion:(nullable FIRAuthProviderSignInCompletionBlock)completion;
+                  completion:(nullable FIRAuthProviderSignInCompletionBlock)completion
+__attribute__((deprecated("This is deprecated API and will be removed in a future release."
+                          "Use signInWithDefaultValue:presentingViewController:completion:")));
+
+/** @fn signInWithDefaultValue:presentingViewController:completion:
+    @brief Called when the user wants to sign in using this auth provider.
+    @remarks Implementors should invoke the completion block when the sign-in process has terminated
+        or is canceled. There are two valid combinations of parameters; either @c credentials and
+        @c userInfo are both non-nil, or @c error is non-nil. Errors must specify an error code
+        which is one of the @c FIRAuthErrorCode codes. It is very important that all possible code
+        paths eventually call this method to inform the auth system of the result of the sign-in
+        flow.
+    @param defaultValue The default initialization value of the provider (email, phone number etc.).
+    @param presentingViewController The view controller used to present the UI.
+    @param completion See remarks. A block which should be invoked when the sign-in process 
+        (using @c FIRAuthCredential) completes.
+ */
+- (void)signInWithDefaultValue:(nullable NSString *)defaultValue
+      presentingViewController:(nullable UIViewController *)presentingViewController
+                    completion:(nullable FIRAuthProviderSignInCompletionBlock)completion;
 
 /** @fn signOut
     @brief Called when the user wants to sign out.

FirebaseAuthUI/FUIAuth_Internal.h

@@ -42,14 +42,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable id<FUIAuthProvider>)providerWithID:(NSString *)providerID;
 
-/** @fn signInWithProviderUI:presentingViewController:
+/** @fn signInWithProviderUI:presentingViewController:defaultValue:
     @brief Signs in with specified provider. @see FUIAuthDelegate.authUI:didSignInWithUser: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)
+        used for signing in.
  */
 - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
-    presentingViewController:(UIViewController *)presentingViewController;
+    presentingViewController:(UIViewController *)presentingViewController
+                defaultValue:(nullable NSString *)defaultValue;
 
 @end
 

FirebaseAuthUI/FUIEmailEntryViewController.m

@@ -255,7 +255,7 @@ - (void)signInWithProvider:(id<FUIAuthProvider>)provider email:(NSString *)email
 
   // Sign out first to make sure sign in starts with a clean state.
   [provider signOut];
-  [provider signInWithEmail:email
+  [provider signInWithDefaultValue:email
    presentingViewController:self
                  completion:^(FIRAuthCredential *_Nullable credential,
                               NSError *_Nullable error,

FirebaseAuthUI/FUIPasswordSignInViewController.h

@@ -71,12 +71,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)didChangeEmail:(NSString *)email andPassword:(NSString *)password;
 
-/** @fn signInWithEmail:andPassword:
+/** @fn signInWithDefaultValue:andPassword:
     @brief Should be called when user entered credentials. Sends authorization request
     @param email The email address of the user.
     @param password The password which user uses.
  */
-- (void)signInWithEmail:(NSString *)email andPassword:(NSString *)password;
+- (void)signInWithDefaultValue:(NSString *)email andPassword:(NSString *)password;
 
 @end
 

FirebaseAuthUI/FUIPasswordSignInViewController.m

@@ -97,7 +97,7 @@ - (void)viewDidLoad {
 
 #pragma mark - Actions
 
-- (void)signInWithEmail:(NSString *)email andPassword:(NSString *)password {
+- (void)signInWithDefaultValue:(NSString *)email andPassword:(NSString *)password {
   if (![[self class] isValidEmail:email]) {
     [self showAlertWithMessage:FUILocalizedString(kStr_InvalidEmailError)];
     return;
@@ -138,7 +138,7 @@ - (void)signInWithEmail:(NSString *)email andPassword:(NSString *)password {
 }
 
 - (void)signIn {
-  [self signInWithEmail:_emailField.text andPassword:_passwordField.text];
+  [self signInWithDefaultValue:_emailField.text andPassword:_passwordField.text];
 }
 
 - (void)forgotPasswordForEmail:(NSString *)email {

FirebaseFacebookAuthUI/FUIFacebookAuth.m

@@ -117,6 +117,14 @@ - (UIColor *)buttonTextColor {
 - (void)signInWithEmail:(nullable NSString *)email
     presentingViewController:(nullable UIViewController *)presentingViewController
                   completion:(nullable FIRAuthProviderSignInCompletionBlock)completion {
+  [self signInWithDefaultValue:email
+      presentingViewController:presentingViewController
+                    completion:completion];
+}
+
+- (void)signInWithDefaultValue:(nullable NSString *)defaultValue
+      presentingViewController:(nullable UIViewController *)presentingViewController
+                    completion:(nullable FIRAuthProviderSignInCompletionBlock)completion {
   _pendingSignInCallback = completion;
   _presentingViewController = presentingViewController;
 

FirebaseGoogleAuthUI/FUIGoogleAuth.m

@@ -106,6 +106,14 @@ - (UIColor *)buttonTextColor {
 - (void)signInWithEmail:(nullable NSString *)email
     presentingViewController:(nullable UIViewController *)presentingViewController
                   completion:(nullable FIRAuthProviderSignInCompletionBlock)completion {
+  [self signInWithDefaultValue:email
+      presentingViewController:presentingViewController
+                    completion:completion];
+}
+
+- (void)signInWithDefaultValue:(nullable NSString *)defaultValue
+      presentingViewController:(nullable UIViewController *)presentingViewController
+                    completion:(nullable FIRAuthProviderSignInCompletionBlock)completion {
   _presentingViewController = presentingViewController;
 
   GIDSignIn *signIn = [self configuredGoogleSignIn];
@@ -118,7 +126,7 @@ - (void)signInWithEmail:(nullable NSString *)email
     }
   };
 
-  signIn.loginHint = email;
+  signIn.loginHint = defaultValue;
   [signIn signIn];
 }