Merge pull request #933 from firebase/morganchen/10

Prepare for FirebaseUI 10

Author: morganchen12

FacebookAuth/Podfile

@@ -9,7 +9,7 @@ target 'FirebaseFacebookAuthUI' do
   # The facebook pods generate an unreasonable number of warnings.
   inhibit_all_warnings!
 
-  pod 'FBSDKLoginKit', '~> 7.0'
+  pod 'FBSDKLoginKit', '~> 9.0'
   pod 'FBSDKCoreKit'
 
   pod 'FirebaseUI/Auth', :path => '../'

FacebookAuth/Podfile.lock

@@ -1,14 +1,14 @@
 PODS:
-  - FBSDKCoreKit (7.1.1):
-    - FBSDKCoreKit/Basics (= 7.1.1)
-    - FBSDKCoreKit/Core (= 7.1.1)
-  - FBSDKCoreKit/Basics (7.1.1)
-  - FBSDKCoreKit/Core (7.1.1):
+  - FBSDKCoreKit (9.0.0):
+    - FBSDKCoreKit/Basics (= 9.0.0)
+    - FBSDKCoreKit/Core (= 9.0.0)
+  - FBSDKCoreKit/Basics (9.0.0)
+  - FBSDKCoreKit/Core (9.0.0):
     - FBSDKCoreKit/Basics
-  - FBSDKLoginKit (7.1.1):
-    - FBSDKLoginKit/Login (= 7.1.1)
-  - FBSDKLoginKit/Login (7.1.1):
-    - FBSDKCoreKit (~> 7.1.1)
+  - FBSDKLoginKit (9.0.0):
+    - FBSDKLoginKit/Login (= 9.0.0)
+  - FBSDKLoginKit/Login (9.0.0):
+    - FBSDKCoreKit (~> 9.0.0)
   - Firebase/Auth (7.4.0):
     - Firebase/CoreOnly
     - FirebaseAuth (~> 7.4.0)
@@ -61,7 +61,7 @@ PODS:
 
 DEPENDENCIES:
   - FBSDKCoreKit
-  - FBSDKLoginKit (~> 7.0)
+  - FBSDKLoginKit (~> 9.0)
   - FirebaseUI/Auth (from `../`)
   - OCMock
 
@@ -85,20 +85,20 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  FBSDKCoreKit: b46507dc8b8cefed31d644e74d7cc30e2a715ef8
-  FBSDKLoginKit: 1a61d79e2b25e2fc0d03dccab1e34b38bbdf2546
+  FBSDKCoreKit: ac6cc500b8e104bb9a4dd20b1527b5d199123c2e
+  FBSDKLoginKit: e9b6542fdee322333502ab497f628b011dce7d78
   Firebase: 09fb40287b6dfc8ee65f726fa0b788719d3f2a07
   FirebaseAuth: d8dba8db90a1705ee2493857047282ca4f6e7598
   FirebaseCore: 99c06e5a1e8d6952e75cb1f0a6d0b23c0f5ccdcf
   FirebaseCoreDiagnostics: 3770093ac4f2be4590fa03cfa1d3a6e5602d4557
-  FirebaseUI: f0677a1cc235f6da602cbd5c9b5fbbd24544a6b3
+  FirebaseUI: ea730675a9a97e5282b5ea5c1db9b15dea51e1e2
   GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4
   GoogleUtilities: d866834472f1324d080496bc67ab3ce5d0d46027
   GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
   nanopb: 59221d7f958fb711001e6a449489542d92ae113e
   OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
 
-PODFILE CHECKSUM: bd55467c7e4a99e9a0956db8228918532b9a340f
+PODFILE CHECKSUM: 46618b1c5d74d8b0eadcee97838015eab3535a08
 
 COCOAPODS: 1.10.1

FirebaseUI.podspec

@@ -109,7 +109,7 @@ Pod::Spec.new do |s|
     facebook.public_header_files = 'FacebookAuth/FirebaseFacebookAuthUI/*.h'
     facebook.source_files = 'FacebookAuth/FirebaseFacebookAuthUI/*.{h,m}'
     facebook.dependency 'FirebaseUI/Auth'
-    facebook.dependency 'FBSDKLoginKit', '~> 7.0'
+    facebook.dependency 'FBSDKLoginKit', '~> 9.0'
     facebook.resource_bundle = {
       'FirebaseFacebookAuthUI' => ['FacebookAuth/FirebaseFacebookAuthUI/**/*.{png,lproj}']
     }

OAuth/FirebaseOAuthUI/FUIOAuth.m

@@ -191,7 +191,8 @@ + (FUIOAuth *)yahooAuthProvider {
 }
 
 + (FUIOAuth *)appleAuthProvider {
-  return [self appleAuthProviderWithUserInterfaceStyle:UITraitCollection.currentTraitCollection.userInterfaceStyle];
+  UIUserInterfaceStyle style = UITraitCollection.currentTraitCollection.userInterfaceStyle;
+  return [self appleAuthProviderWithUserInterfaceStyle:style];
 }
 
 + (FUIOAuth *)appleAuthProviderWithUserInterfaceStyle:(UIUserInterfaceStyle)userInterfaceStyle {
@@ -203,6 +204,12 @@ + (FUIOAuth *)appleAuthProviderWithUserInterfaceStyle:(UIUserInterfaceStyle)user
     iconImage = [iconImage imageWithTintColor:[UIColor blackColor]];
     buttonColor = [UIColor whiteColor];
     buttonTextColor = [UIColor blackColor];
+  } else if (userInterfaceStyle == UIUserInterfaceStyleLight) {
+    iconImage = [iconImage imageWithTintColor:[UIColor whiteColor]];
+    buttonColor = [UIColor blackColor];
+    buttonTextColor = [UIColor whiteColor];
+  } else {
+    iconImage = [iconImage imageWithTintColor:[UIColor whiteColor]];
   }
   FUIOAuth *provider = [[FUIOAuth alloc] initWithAuthUI:[FUIAuth defaultAuthUI]
                                              providerID:@"apple.com"
@@ -213,7 +220,7 @@ + (FUIOAuth *)appleAuthProviderWithUserInterfaceStyle:(UIUserInterfaceStyle)user
                                                  scopes:@[@"name", @"email"]
                                        customParameters:nil
                                            loginHintKey:nil];
-  provider.buttonAlignment = FUIButtonAlignmentCenter;
+  provider.buttonAlignment = FUIButtonAlignmentLeading;
   provider.buttonTextColor = buttonTextColor;
   return provider;
 }
@@ -310,13 +317,47 @@ - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)source
 
 #pragma mark - ASAuthorizationControllerDelegate
 
++ (NSPersonNameComponentsFormatter *)nameFormatter {
+  static NSPersonNameComponentsFormatter *nameFormatter;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    nameFormatter = [[NSPersonNameComponentsFormatter alloc] init];
+  });
+  return nameFormatter;
+}
+
 - (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization API_AVAILABLE(ios(13.0)) {
-  ASAuthorizationAppleIDCredential* appleIDCredential = authorization.credential;
+  ASAuthorizationAppleIDCredential *appleIDCredential = authorization.credential;
+  NSData *rawIdentityToken = appleIDCredential.identityToken;
+  if (rawIdentityToken == nil) {
+    // It's pretty awful to not have an error when login is unsuccessful, but Apple's docs
+    // don't provide any useful information here.
+    // https://developer.apple.com/documentation/authenticationservices/asauthorizationappleidcredential
+    NSLog(@"Sign in with Apple completed with authorization, but no jwt: %@", authorization);
+    _providerSignInCompletion(nil, nil, nil, nil);
+  }
   NSString *idToken = [[NSString alloc] initWithData:appleIDCredential.identityToken encoding:NSUTF8StringEncoding];
   FIROAuthCredential *credential = [FIROAuthProvider credentialWithProviderID:@"apple.com"
                                                                       IDToken:idToken
                                                                   accessToken:nil];
-  _providerSignInCompletion(credential, nil, nil, nil);
+  FIRAuthResultCallback result;
+  NSPersonNameComponents *nameComponents = appleIDCredential.fullName;
+  if (nameComponents != nil) {
+    NSPersonNameComponentsFormatter *formatter = [[self class] nameFormatter];
+    NSString *displayName = [formatter stringFromPersonNameComponents:nameComponents];
+    NSDictionary *userInfo = @{FIRAuthCredentialDisplayName: displayName};
+    credential.userInfo = userInfo;
+
+    result = ^(FIRUser *_Nullable user,
+               NSError *_Nullable error) {
+      if (user != nil) {
+        FIRUserProfileChangeRequest *displayNameUpdate = [user profileChangeRequest];
+        displayNameUpdate.displayName = displayName;
+        [displayNameUpdate commitChangesWithCompletion:^(NSError * _Nullable error) {}];
+      }
+    };
+  }
+  _providerSignInCompletion(credential, nil, result, nil);
 }
 
 - (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithError:(NSError *)error API_AVAILABLE(ios(13.0)) {

PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryCodes.m

@@ -115,7 +115,36 @@ - (FUICountryCodeInfo *)countryCodeInfoAtIndex:(NSInteger)index {
 
 - (FUICountryCodeInfo *)defaultCountryCodeInfo {
   // Get the country code based on the information of user's telecommunication carrier provider.
-  CTCarrier *carrier = [[[CTTelephonyNetworkInfo alloc] init] subscriberCellularProvider];
+  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
+  }
   NSString *countryCode = carrier.isoCountryCode ?: [[self class] countryCodeFromDeviceLocale];
   FUICountryCodeInfo *countryCodeInfo = [self countryCodeInfoForCode:countryCode];
   // If carrier is not available, get the hard coded default country code.

PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m

@@ -55,7 +55,9 @@ - (void)commonInit {
   UIView *paddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 20, self.bounds.size.height)];
   self.leftView = paddingView;
   self.leftViewMode = UITextFieldViewModeAlways;
-  self.textContentType = UITextContentTypeOneTimeCode;
+  if (@available(iOS 12.0, *)) {
+    self.textContentType = UITextContentTypeOneTimeCode;
+  }
 
   // Default values
   if (!self.codeLength) {
@@ -72,7 +74,7 @@ - (void)commonInit {
   [self updateText];
 }
 
-- (UIKeyboardType) keyboardType {
+- (UIKeyboardType)keyboardType {
   if (@available(iOS 10, *)) {
     return UIKeyboardTypeASCIICapableNumberPad;
   } else {