Allows user to enter country code into phone number authentication field (E.g. by copy/pasting or from keyboard suggestions) (firebase#530)

Updates phone number validation to strip off the country code if it was duplicated in the actual phone number entry field

Author: andyboyd

FirebasePhoneAuthUI/FUIPhoneEntryViewController.m

@@ -187,8 +187,16 @@ - (void)onNext:(NSString *)phoneNumber {
  [self incrementActivity];
  self.navigationItem.rightBarButtonItem.enabled = NO;
  FIRPhoneAuthProvider *provider = [FIRPhoneAuthProvider providerWithAuth:self.auth];
- NSString *phoneNumberWithCountryCode =
- [NSString stringWithFormat:@"+%@%@", _selectedCountryCode.dialCode, phoneNumber];
+ NSString *selectedCountryCodeString =
+ [NSString stringWithFormat:@"+%@", _selectedCountryCode.dialCode];
+ BOOL isPhoneNumberAlreadyPrefixed = [phoneNumber hasPrefix:selectedCountryCodeString];
+ NSString *phoneNumberWithCountryCode;
+ if (isPhoneNumberAlreadyPrefixed) {
+ phoneNumberWithCountryCode = phoneNumber;
+ } else {
+ phoneNumberWithCountryCode =
+ [NSString stringWithFormat:@"%@%@", selectedCountryCodeString, phoneNumber];
+ }
  [provider verifyPhoneNumber:phoneNumberWithCountryCode
  UIDelegate:self
  completion:^(NSString *_Nullable verificationID, NSError *_Nullable error) {