More Firebase 11 updates (#1193)

Author: paulb777

FirebaseAnonymousAuthUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseAnonymousAuthUI'
-  s.version      = '14.1.0'
+  s.version      = '14.2.0'
   s.summary      = 'Provides anonymous auth support for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUITests/FirebaseAnonymousAuthUITests.m

@@ -17,7 +17,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import <FirebaseAuth/FirebaseAuth.h>
+@import FirebaseAuth;
 #import <FirebaseAuthUI/FirebaseAuthUI.h>
 
 #import "FUIAnonymousAuth.h"

FirebaseAnonymousAuthUI/Sources/FUIAnonymousAuth.m

@@ -14,6 +14,8 @@
 //  limitations under the License.
 //
 
+@import FirebaseAuth;
+
 #import <FirebaseAuthUI/FirebaseAuthUI.h>
 
 #import "FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI/FUIAnonymousAuth.h"

FirebaseAuthUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseAuthUI'
-  s.version      = '14.1.0'
+  s.version      = '14.2.0'
   s.summary      = 'A prebuilt authentication UI flow for Firebase Auth.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

FirebaseAuthUI/Sources/FUIAccountSettingsOperation.m

@@ -230,7 +230,7 @@ - (void)showVerifyDialogWithMessage:(NSString *)message
                                   alertMessage:message
                               alertCloseButton:FUILocalizedString(kStr_Cancel)
                                providerHandler:^(id<FIRUserInfo> provider) {
-    if (![provider.providerID isEqualToString:FIREmailAuthProviderID]) {
+    if (![provider.providerID isEqualToString:@"email"]) {
       [self reauthenticateWithProvider:provider.providerID actionHandler:handler];
     } else {
       [self showVerifyPasswordViewWithMessage:message providerHandler:handler];

FirebaseAuthUI/Sources/FUIAccountSettingsOperationDeleteAccount.m

@@ -43,7 +43,8 @@ - (void)showDeleteAccountDialog {
                                   alertMessage:FUILocalizedString(kStr_DeleteAccountBody)
                               alertCloseButton:FUILocalizedString(kStr_Cancel)
                                providerHandler:^(id<FIRUserInfo> provider) {
-    if (![provider.providerID isEqualToString:FIREmailAuthProviderID]) {
+    // TODO: Use public API after Firebase 11 minimum.
+    if (![provider.providerID isEqualToString:@"email"]) {
       [self reauthenticateWithProvider:provider.providerID actionHandler:^{
         [self showDeleteAccountView];
       }];

FirebaseAuthUI/Sources/FUIAccountSettingsViewController.m

@@ -79,11 +79,11 @@ - (FUIASAccountState)accountState {
 
   for (id<FIRUserInfo> userInfo in providers) {
     if (userInfo.email.length > 0 &&
-        ![userInfo.providerID isEqualToString:FIREmailAuthProviderID]) {
+        ![userInfo.providerID isEqualToString:@"email"]) {
       hasEmailInLinkedProvider = YES;
     }
 
-    if ([userInfo.providerID isEqualToString:FIREmailAuthProviderID]) {
+    if ([userInfo.providerID isEqualToString:@"email"]) {
       hasPasswordProvider = YES;
     }
   }
@@ -225,7 +225,7 @@ - (void)updateTableStateLinkedAccountWithoutEmail {
   NSMutableArray *linkedAccounts =
       [[NSMutableArray alloc] initWithCapacity:self.auth.currentUser.providerData.count];
   for (id<FIRUserInfo> userInfo in self.auth.currentUser.providerData) {
-    if ([userInfo.providerID isEqualToString:FIREmailAuthProviderID]) {
+    if ([userInfo.providerID isEqualToString:@"email"]) {
       continue;
     }
     FUIStaticContentTableViewCell *cell =
@@ -262,7 +262,7 @@ - (void)updateTableStateLinkedAccountWithEmail {
   NSMutableArray *linkedAccounts =
       [[NSMutableArray alloc] initWithCapacity:self.auth.currentUser.providerData.count];
   for (id<FIRUserInfo> userInfo in self.auth.currentUser.providerData) {
-    if ([userInfo.providerID isEqualToString:FIREmailAuthProviderID]) {
+    if ([userInfo.providerID isEqualToString:@"email"]) {
       continue;
     }
     FUIStaticContentTableViewCell *cell =
@@ -309,7 +309,7 @@ - (void)updateTableStateLinkedAccountWithEmailPassword {
   NSMutableArray *linkedAccounts =
       [[NSMutableArray alloc] initWithCapacity:self.auth.currentUser.providerData.count];
   for (id<FIRUserInfo> userInfo in self.auth.currentUser.providerData) {
-    if ([userInfo.providerID isEqualToString:FIREmailAuthProviderID]) {
+    if ([userInfo.providerID isEqualToString:@"email"]) {
       continue;
     }
     FUIStaticContentTableViewCell *cell =

FirebaseAuthUI/Sources/FUIAuth.m

@@ -238,7 +238,10 @@ - (void)autoUpgradeAccountWithProviderUI:(id<FUIAuthProvider>)providerUI
     if (error) {
       // Check for "credential in use" conflict error and handle appropriately.
       if (error.code == FIRAuthErrorCodeCredentialAlreadyInUse) {
-        FIRAuthCredential *newCredential = error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey];
+        // TODO: When Firebase 11 is minimum update string to
+        // FIRAuthErrors.userInfoUpdatedCredentialKey
+        FIRAuthCredential *newCredential =
+          error.userInfo[@"FIRAuthErrorUserInfoUpdatedCredentialKey"];
         NSDictionary *userInfo = @{ };
         if (newCredential) {
           userInfo = @{ FUIAuthCredentialKey : newCredential };

FirebaseAuthUI/Sources/FUIAuthBaseViewController.m

@@ -16,7 +16,7 @@
 
 #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h"
 
-#import <FirebaseAuth/FirebaseAuth.h>
+@import FirebaseAuth;
 #import <objc/runtime.h>
 
 #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthErrorUtils.h"
@@ -430,13 +430,13 @@ - (void)cancelAuthorization {
 }
 
 + (NSString *)providerLocalizedName:(NSString *)providerId {
-  if ([providerId isEqualToString:FIREmailAuthProviderID]) {
+  if ([providerId isEqualToString:@"email"]) {
     return FUILocalizedString(kStr_ProviderTitlePassword);
-  } else if ([providerId isEqualToString:FIRGoogleAuthProviderID]) {
+  } else if ([providerId isEqualToString:@"google.com"]) {
     return FUILocalizedString(kStr_ProviderTitleGoogle);
-  } else if ([providerId isEqualToString:FIRFacebookAuthProviderID]) {
+  } else if ([providerId isEqualToString:@"facebook.com"]) {
     return FUILocalizedString(kStr_ProviderTitleFacebook);
-  } else if ([providerId isEqualToString:FIRTwitterAuthProviderID]) {
+  } else if ([providerId isEqualToString:@"twitter.com"]) {
     return FUILocalizedString(kStr_ProviderTitleTwitter);
   }
   return @"";

FirebaseAuthUI/Sources/FUIAuthPickerViewController.m

@@ -17,7 +17,7 @@
 #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthPickerViewController.h"
 
 #import <AuthenticationServices/AuthenticationServices.h>
-#import <FirebaseAuth/FirebaseAuth.h>
+@import FirebaseAuth;
 
 #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h"
 #import "FirebaseAuthUI/Sources/FUIAuthSignInButton.h"