Firebase Phone Auth. Update error messages.

Change-Id: I117c6d40cd0aae6abe51730f20e13abf00c0dd2c

Author: yramanchuk

FirebasePhoneAuthUI/FUIPhoneAuth.m

@@ -121,6 +121,42 @@ - (void)callbackWithCredential:(nullable FIRAuthCredential *)credential
   }
 }
 
++ (UIAlertController *)alertControllerForError:(NSError *)error
+                                 actionHandler:(nullable FUIAuthAlertActionHandler)actionHandler {
+  NSString *message;
+  if (error.code == FIRAuthErrorCodeInvalidPhoneNumber) {
+    message = FUIPhoneAuthLocalizedString(kPAStr_IncorrectPhoneMessage);
+  } else if (error.code == FIRAuthErrorCodeInvalidVerificationCode) {
+    message = FUIPhoneAuthLocalizedString(kPAStr_IncorrectCodeMessage);
+  } else if (error.code == FIRAuthErrorCodeTooManyRequests) {
+    message = FUIPhoneAuthLocalizedString(kPAStr_TooManyCodesSent);
+  } else if (error.code == FIRAuthErrorCodeQuotaExceeded) {
+    message = FUIPhoneAuthLocalizedString(kPAStr_MessageQuotaExceeded);
+  } else if (error.code == FIRAuthErrorCodeSessionExpired) {
+    message = FUIPhoneAuthLocalizedString(kPAStr_MessageExpired);
+  } else if ((error.code >= FIRAuthErrorCodeMissingPhoneNumber
+             && error.code <= FIRAuthErrorCodeAppNotVerified)
+             || error.code >= FIRAuthErrorCodeInternalError) {
+    message = FUIPhoneAuthLocalizedString(kPAStr_InternalErrorMessage);
+  } else {
+    message = error.localizedDescription;
+  }
+  UIAlertController *alertController =
+      [UIAlertController alertControllerWithTitle:nil
+                                          message:message
+                                   preferredStyle:UIAlertControllerStyleAlert];
+  UIAlertAction *okAction =
+      [UIAlertAction actionWithTitle:FUIPhoneAuthLocalizedString(kPAStr_Done)
+                              style:UIAlertActionStyleDefault
+                            handler:^(UIAlertAction *_Nonnull action) {
+        if (actionHandler) {
+          actionHandler();
+        }
+      }];
+  [alertController addAction:okAction];
+  return alertController;
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

FirebasePhoneAuthUI/FUIPhoneAuthStrings.h

@@ -39,6 +39,9 @@ extern NSString *const kPAStr_Back;
 extern NSString *const kPAStr_IncorrectPhoneTitle;
 extern NSString *const kPAStr_IncorrectPhoneMessage;
 extern NSString *const kPAStr_InternalErrorMessage;
+extern NSString *const kPAStr_TooManyCodesSent;
+extern NSString *const kPAStr_MessageQuotaExceeded;
+extern NSString *const kPAStr_MessageExpired;
 
 #ifdef __cplusplus
 extern "C" {

FirebasePhoneAuthUI/FUIPhoneAuthStrings.m

@@ -41,6 +41,9 @@
 NSString *const kPAStr_IncorrectPhoneTitle = @"IncorrectPhoneTitle";
 NSString *const kPAStr_IncorrectPhoneMessage = @"IncorrectPhoneMessage";
 NSString *const kPAStr_InternalErrorMessage = @"InternalErrorMessage";
+NSString *const kPAStr_TooManyCodesSent = @"TooManyCodesSent";
+NSString *const kPAStr_MessageQuotaExceeded = @"MessageQuotaExceeded";
+NSString *const kPAStr_MessageExpired = @"MessageExpired";
 
 /** @var kPhoneAuthProviderTableName
     @brief The name of the strings table to search for localized strings.

FirebasePhoneAuthUI/FUIPhoneAuth_Internal.h

@@ -17,6 +17,7 @@
 #import "FUIPhoneAuth.h"
 
 #import <FirebasePhoneAuthUI/FirebasePhoneAuthUI.h>
+#import "FUIAuthBaseViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -33,6 +34,14 @@ NS_ASSUME_NONNULL_BEGIN
                          error:(nullable NSError *)error
                         result:(nullable FIRAuthResultCallback)result;
 
+/** @fn alertControllerForError:actionHandler:
+    @brief Creates alert controller for specified phone auth error.
+    @param error The error which should be shown in alert.
+    @param actionHandler The handler of alert action button, if any.
+ */
++ (UIAlertController *)alertControllerForError:(NSError *)error
+                                 actionHandler:(nullable FUIAuthAlertActionHandler)actionHandler;
+
 @end
 
 NS_ASSUME_NONNULL_END

FirebasePhoneAuthUI/FUIPhoneEntryViewController.m

@@ -143,22 +143,10 @@ - (void)onNext:(NSString *)phoneNumber {
     self.navigationItem.rightBarButtonItem.enabled = YES;
 
     if (error) {
-      if (error.code == FIRAuthErrorCodeInvalidPhoneNumber) {
-        NSString *title = FUIPhoneAuthLocalizedString(kPAStr_IncorrectPhoneTitle);
-        NSString *message = FUIPhoneAuthLocalizedString(kPAStr_IncorrectPhoneMessage);
-        [[self class] showAlertWithTitle:title
-                                 message:message
-                             actionTitle:FUIPhoneAuthLocalizedString(kPAStr_Done)
-                presentingViewController:self];
-      } if (error.code >= FIRAuthErrorCodeInternalError) {
-        NSString *message = FUIPhoneAuthLocalizedString(kPAStr_InternalErrorMessage);
-        [[self class] showAlertWithTitle:nil
-                                 message:message
-                             actionTitle:FUIPhoneAuthLocalizedString(kPAStr_Done)
-                presentingViewController:self];
-      } else {
-        [self showAlertWithMessage:error.localizedDescription];
-      }
+      UIAlertController *alertController = [FUIPhoneAuth alertControllerForError:error
+                                                                   actionHandler:nil];
+      [self presentViewController:alertController animated:YES completion:nil];
+      
       FUIPhoneAuth *delegate = [self.authUI providerWithID:FIRPhoneAuthProviderID];
       [delegate callbackWithCredential:nil error:error result:nil];
       return;

FirebasePhoneAuthUI/FUIPhoneVerificationViewController.m

@@ -176,28 +176,10 @@ - (void)onNext:(NSString *)verificationCode {
     if (!error || error.code == FUIAuthErrorCodeUserCancelledSignIn) {
       [self.navigationController dismissViewControllerAnimated:YES completion:nil];
     } else {
-      NSString *title;
-      NSString *message;
-      if (error.code >= FIRAuthErrorCodeMissingPhoneNumber
-              && error.code <= FIRAuthErrorCodeInvalidVerificationID) {
-        title = FUIPhoneAuthLocalizedString(kPAStr_IncorrectCodeTitle);
-        message = FUIPhoneAuthLocalizedString(kPAStr_IncorrectCodeMessage);
-      } if (error.code >= FIRAuthErrorCodeInternalError) {
-        message = FUIPhoneAuthLocalizedString(kPAStr_InternalErrorMessage);
-      } else {
-        message = error.localizedDescription;
-      }
-      UIAlertController *alertController =
-          [UIAlertController alertControllerWithTitle:title
-                                              message:message
-                                       preferredStyle:UIAlertControllerStyleAlert];
-      UIAlertAction *okAction =
-          [UIAlertAction actionWithTitle:FUIPhoneAuthLocalizedString(kPAStr_Done)
-                                   style:UIAlertActionStyleDefault
-                                 handler:^(UIAlertAction *_Nonnull action) {
-            [_codeField clearCodeInput];
-          }];
-      [alertController addAction:okAction];
+      UIAlertController *alertController = [FUIPhoneAuth alertControllerForError:error
+                                                                   actionHandler:^{
+                                             [_codeField clearCodeInput];
+                                           }];
       [self presentViewController:alertController animated:YES completion:nil];
     }
   }];

FirebasePhoneAuthUI/Strings/en.lproj/FirebasePhoneAuthUI.strings

@@ -47,7 +47,7 @@
 "IncorrectPhoneTitle" = "Invalid phone number";
 
 /* The body message of alert shown when user entered invalid phone number format. */
-"IncorrectPhoneMessage" = "Try entering your phone number again.";
+"IncorrectPhoneMessage" = "Enter a valid phone number.";
 
 /* The body message of alert shown when user tapped resend verification code button. */
 "ResendCodeResult" = "Code was sent to %@";
@@ -56,7 +56,16 @@
 "IncorrectCodeTitle" = "Incorrect verification code";
 
 /* The body message of alert shown when user entered invalid verification code. */
-"IncorrectCodeMessage" = "Try entering your verification code again.";
+"IncorrectCodeMessage" = "Wrong code. Try again.";
 
 /* The body message of alert shown when internal server error appeared. */
-"InternalErrorMessage" = "Your request couldn't be completed. Try again later.";
+"InternalErrorMessage" = "Something went wrong. Please try again.";
+
+/* The body message of alert shown when the user has tried to send too many SMS messages. */
+"TooManyCodesSent" = "This phone number has been used too many times.";
+
+/* The body message of alert shown when Firebase project has tried to send too many SMS messages for its price tier. */
+"MessageQuotaExceeded" = "There was a problem verifying your phone number.";
+
+/* The body message of alert shown when the SMS confirmation code has expired, so the user should send a new one. */
+"MessageExpired" = "This code is no longer valid.";