Merge pull request #1159 from firebase/mc/ct

Add API for manually specifying default phone number country code

Author: morganchen12

FirebasePhoneAuthUI/Sources/FUICountryCodes.h

@@ -18,7 +18,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FUICountryCodeInfo : NSObject
+@interface FUICountryCodeInfo : NSObject <NSCopying>
 
 @property (nonatomic, copy) NSString *countryName;
 @property (nonatomic, copy) NSString *localizedCountryName;
@@ -32,6 +32,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FUICountryCodes : NSObject
 
+/** @property defaultCountryCodeInfo
+    @brief Get the default country code info
+    The default country code. Formerly this was set via CTCarrier information, but CTCarrier is now
+    deprecated, so this value must be manually set. Defaults to the country code for the United States.
+*/
+@property (nonatomic, copy) FUICountryCodeInfo *defaultCountryCodeInfo;
+
 /** @fn count:
     @brief Return the number of available country codes.
 */
@@ -55,16 +62,6 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (nullable FUICountryCodeInfo *)countryCodeInfoForCode:(NSString *)countryCode;
 
-/** @fn defaultCountryCodeInfo
-    @brief Get the default country code info
-    @detail The default country is retrieved based on the following logic:
-            1. The country code info of user's carrier provider if available.
-            2. The country code info of user's device locale, if available.
-            3. A hard coded coutry code info (US), if available.
-            4. The first available country code info in the instance.
-*/
-- (FUICountryCodeInfo *)defaultCountryCodeInfo;
-
 /** @fn blacklistCountries:
     @brief Remove the set of countries from available country codes.
     @param countries A set of blacklisted country codes. Country codes are in NSString format, and

FirebasePhoneAuthUI/Sources/FUICountryCodes.m

@@ -57,6 +57,31 @@ - (NSString *)countryFlagEmoji {
                                   length:sizeof(bytes)
                                 encoding:NSUTF32LittleEndianStringEncoding];
 }
+
+- (id)copyWithZone:(NSZone *_Nullable)zone {
+  FUICountryCodeInfo *newInfo = [[FUICountryCodeInfo alloc] init];
+  newInfo.countryName = self.countryName;
+  newInfo.localizedCountryName = self.localizedCountryName;
+  newInfo.countryCode = self.countryCode;
+  newInfo.dialCode = self.dialCode;
+  newInfo.level = self.level;
+  return newInfo;
+}
+
+- (BOOL)isEqual:(FUICountryCodeInfo *)object {
+  if (object == self) {
+    return YES;
+  }
+  if (![object isKindOfClass:[self class]]) {
+    return NO;
+  }
+  return object.countryName == self.countryName &&
+      object.localizedCountryName == self.localizedCountryName &&
+      object.countryCode == self.countryCode &&
+      object.dialCode == self.dialCode &&
+      object.level == self.level;
+}
+
 @end
 
 @interface FUICountryCodes ()
@@ -114,48 +139,10 @@ - (FUICountryCodeInfo *)countryCodeInfoAtIndex:(NSInteger)index {
 }
 
 - (FUICountryCodeInfo *)defaultCountryCodeInfo {
-  // Get the country code based on the information of user's telecommunication carrier provider.
-  CTCarrier *carrier;
-  if (@available(iOS 12, *)) {
-    NSDictionary *carriers =
-        [[[CTTelephonyNetworkInfo alloc] init] serviceSubscriberCellularProviders];
-    // For multi-sim phones, use the current locale to make an educated guess for
-    // which carrier to use.
-    NSString *currentCountryCode = [NSLocale currentLocale].countryCode;
-    for (CTCarrier *provider in carriers.allValues) {
-      if ([provider isKindOfClass:[CTCarrier class]] &&
-          [provider.isoCountryCode isEqualToString:currentCountryCode]) {
-        carrier = provider;
-        break;
-      }
-    }
-
-    // If the carrier is still nil, grab a random carrier from the dictionary.
-    if (carrier == nil) {
-      for (CTCarrier *provider in carriers.allValues) {
-        if ([provider isKindOfClass:[CTCarrier class]]) {
-          carrier = provider;
-          break;
-        }
-      }
-    }
-  } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    carrier = [[[CTTelephonyNetworkInfo alloc] init] subscriberCellularProvider];
-#pragma clang diagnostic pop
+  if (_defaultCountryCodeInfo == nil) {
+    return [self countryCodeInfoForCode:kFUIDefaultCountryCode] ?: [self countryCodeInfoAtIndex:0];
   }
-  NSString *countryCode = carrier.isoCountryCode ?: [[self class] countryCodeFromDeviceLocale];
-  FUICountryCodeInfo *countryCodeInfo = [self countryCodeInfoForCode:countryCode];
-  // If carrier is not available, get the hard coded default country code.
-  if (!countryCodeInfo) {
-    countryCodeInfo = [self countryCodeInfoForCode:kFUIDefaultCountryCode];
-  }
-  // If the hard coded default country code is not available, get the first available country code.
-  if (!countryCodeInfo) {
-    countryCodeInfo = [self countryCodeInfoAtIndex:0];
-  }
-  return countryCodeInfo;
+  return _defaultCountryCodeInfo;
 }
 
 - (FUICountryCodeInfo *)countryCodeInfoForPhoneNumber:(NSString *)phoneNumber {

FirebasePhoneAuthUI/Sources/FUIPhoneEntryViewController.m

@@ -113,6 +113,10 @@ - (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil
   if (self) {
     self.title = FUIPhoneAuthLocalizedString(kPAStr_EnterPhoneTitle);
     _countryCodes = countryCodes ?: [[FUICountryCodes alloc] init];
+    FUIPhoneAuth *provider = [authUI providerWithID:FIRPhoneAuthProviderID];
+    NSString *defaultCountryCode = provider.defaultCountryCode;
+    _countryCodes.defaultCountryCodeInfo =
+        [_countryCodes countryCodeInfoForCode:defaultCountryCode];
     if (phoneNumber.length) {
       _phoneNumber = [[FUIPhoneNumber alloc] initWithNormalizedPhoneNumber:phoneNumber
                                                               countryCodes:_countryCodes];

FirebasePhoneAuthUI/Sources/FUIPhoneNumber.m

@@ -40,7 +40,7 @@ - (instancetype)initWithNormalizedPhoneNumber:(NSString *)normalizedPhoneNumber
   }
   if (!rawPhoneNumber) {
     rawPhoneNumber = normalizedPhoneNumber;
-    countryCode = [countryCodes defaultCountryCodeInfo];
+    countryCode = countryCodes.defaultCountryCodeInfo;
   }
   return [self initWithRawPhoneNumber:rawPhoneNumber countryCode:countryCode];
 }

FirebasePhoneAuthUI/Sources/Public/FirebasePhoneAuthUI/FUIPhoneAuth.h

@@ -28,6 +28,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
 
+/** @property defaultCountryCode
+    Returns the default country code. If unspecified, this will default to the United States country code.
+    If overwriting the default country code, this value must be set before the phone auth flow is
+    presented.
+*/
+@property (nonatomic, copy, readwrite) NSString *defaultCountryCode;
+
 /** @fn bundle
     @brief Returns the resource bundle required by this class.
  */

samples/swift/FirebaseUI-demo-swift/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>FacebookClientToken</key>
+	<string>aaaaa</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

samples/swift/FirebaseUI-demo-swift/Samples/Auth/FUIAuthViewController.swift

@@ -323,7 +323,9 @@ class FUIAuthViewController: UITableViewController {
               provider = nil
             }
           case Providers.Phone.rawValue:
-            provider = FUIPhoneAuth(authUI: self.authUI!)
+            let phoneAuth = FUIPhoneAuth(authUI: self.authUI!)
+            phoneAuth.defaultCountryCode = "JP"
+            provider = phoneAuth
           default: provider = nil
           }