Merge pull request #1201 from firebase/nc/providerid

ncooke3 · web-flow · commit 81052b4a25d8 · 2024-08-16T10:03:07.000-04:00
[Auth] Use 'password' for Email/Password provider ID
diff --git a/FirebaseAuthUI.podspec b/FirebaseAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseAuthUI'
-  s.version      = '14.2.1'
+  s.version      = '14.2.3'
   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' }
diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperation.m b/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:@"email"]) {
+    if (![provider.providerID isEqualToString:@"password"]) {
       [self reauthenticateWithProvider:provider.providerID actionHandler:handler];
     } else {
       [self showVerifyPasswordViewWithMessage:message providerHandler:handler];
diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationDeleteAccount.m b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationDeleteAccount.m
@@ -44,7 +44,7 @@ - (void)showDeleteAccountDialog {
                               alertCloseButton:FUILocalizedString(kStr_Cancel)
                                providerHandler:^(id<FIRUserInfo> provider) {
     // TODO: Use public API after Firebase 11 minimum.
-    if (![provider.providerID isEqualToString:@"email"]) {
+    if (![provider.providerID isEqualToString:@"password"]) {
       [self reauthenticateWithProvider:provider.providerID actionHandler:^{
         [self showDeleteAccountView];
       }];
diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsViewController.m b/FirebaseAuthUI/Sources/FUIAccountSettingsViewController.m
@@ -79,11 +79,11 @@ - (FUIASAccountState)accountState {
 
   for (id<FIRUserInfo> userInfo in providers) {
     if (userInfo.email.length > 0 &&
-        ![userInfo.providerID isEqualToString:@"email"]) {
+        ![userInfo.providerID isEqualToString:@"password"]) {
       hasEmailInLinkedProvider = YES;
     }
 
-    if ([userInfo.providerID isEqualToString:@"email"]) {
+    if ([userInfo.providerID isEqualToString:@"password"]) {
       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:@"email"]) {
+    if ([userInfo.providerID isEqualToString:@"password"]) {
       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:@"email"]) {
+    if ([userInfo.providerID isEqualToString:@"password"]) {
       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:@"email"]) {
+    if ([userInfo.providerID isEqualToString:@"password"]) {
       continue;
     }
     FUIStaticContentTableViewCell *cell =
diff --git a/FirebaseAuthUI/Sources/FUIAuthBaseViewController.m b/FirebaseAuthUI/Sources/FUIAuthBaseViewController.m
@@ -430,7 +430,7 @@ - (void)cancelAuthorization {
 }
 
 + (NSString *)providerLocalizedName:(NSString *)providerId {
-  if ([providerId isEqualToString:@"email"]) {
+  if ([providerId isEqualToString:@"password"]) {
     return FUILocalizedString(kStr_ProviderTitlePassword);
   } else if ([providerId isEqualToString:@"google.com"]) {
     return FUILocalizedString(kStr_ProviderTitleGoogle);
diff --git a/FirebaseEmailAuthUI.podspec b/FirebaseEmailAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseEmailAuthUI'
-  s.version      = '14.2.0'
+  s.version      = '14.2.3'
   s.summary      = 'An email authentication provider for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
diff --git a/FirebaseEmailAuthUI/Sources/FUIConfirmEmailViewController.m b/FirebaseEmailAuthUI/Sources/FUIConfirmEmailViewController.m
@@ -138,7 +138,7 @@ - (void)next {
 
 - (void)onNext:(NSString *)emailText {
   // TODO: After Firebase 11 minimum, change to EmailAuthProvider.id.
-  FUIEmailAuth *emailAuth = [self.authUI providerWithID:@"email"];
+  FUIEmailAuth *emailAuth = [self.authUI providerWithID:@"password"];
 
   if (![[self class] isValidEmail:emailText]) {
     [self showAlertWithMessage:FUILocalizedString(kStr_InvalidEmailError)];
diff --git a/FirebaseEmailAuthUI/Sources/FUIEmailAuth.m b/FirebaseEmailAuthUI/Sources/FUIEmailAuth.m
@@ -77,7 +77,7 @@ + (NSBundle *)bundle {
 
 - (instancetype)init {
   return [self initAuthAuthUI:[FUIAuth defaultAuthUI]
-                 signInMethod:@"email"
+                 signInMethod:@"password"
               forceSameDevice:NO
         allowNewEmailAccounts:YES
            requireDisplayName:YES
@@ -121,7 +121,7 @@ - (instancetype)initAuthAuthUI:(FUIAuth *)authUI
 #pragma mark - FUIAuthProvider
 
 - (nullable NSString *)providerID {
-  return @"email";
+  return @"password";
 }
 
 /** @fn accessToken:
@@ -534,10 +534,10 @@ - (void)signInWithEmailHint:(NSString *)emailHint
     NSSet *supportedProviders =
         [NSSet setWithObjects:@"google.com",
                               @"facebook.com",
-                              @"email",
+                              @"password",
                               nil];
     if ([supportedProviders containsObject:existingFederatedProviderID]) {
-      if ([existingFederatedProviderID isEqualToString:@"email"]) {
+      if ([existingFederatedProviderID isEqualToString:@"password"]) {
 
         [FUIAuthBaseViewController showSignInAlertWithEmail:emailHint
                                           providerShortName:@"Email/Password"
@@ -669,7 +669,7 @@ - (void)handleAccountLinkingForEmail:(NSString *)email
       return;
     }
     NSString *bestProviderID = providers[0];
-    if ([bestProviderID isEqual:@"email"]) {
+    if ([bestProviderID isEqual:@"password"]) {
       // Password verification.
       UIViewController *passwordController;
       if ([delegate respondsToSelector:
@@ -856,7 +856,7 @@ - (nullable NSString *)authProviderFromProviders:(NSArray <NSString *> *) provid
   NSSet *providerSet =
   [NSSet setWithArray:@[ @"facebook.com",
                          @"google.com",
-                         @"email" ]];
+                         @"password" ]];
   for (NSString *provider in providers) {
     if ( [providerSet containsObject:provider]) {
       return provider;
diff --git a/FirebaseEmailAuthUI/Sources/FUIEmailEntryViewController.m b/FirebaseEmailAuthUI/Sources/FUIEmailEntryViewController.m
@@ -138,7 +138,7 @@ - (void)next {
 }
 
 - (void)onNext:(NSString *)emailText {
-  FUIEmailAuth *emailAuth = [self.authUI providerWithID:@"email"];
+  FUIEmailAuth *emailAuth = [self.authUI providerWithID:@"password"];
   id<FUIAuthDelegate> delegate = self.authUI.delegate;
 
   if (![[self class] isValidEmail:emailText]) {
@@ -165,7 +165,7 @@ - (void)onNext:(NSString *)emailText {
     }
 
     id<FUIAuthProvider> provider = [self bestProviderFromProviderIDs:providers];
-    if (provider && ![provider.providerID isEqualToString:@"email"]) {
+    if (provider && ![provider.providerID isEqualToString:@"password"]) {
       NSString *email = emailText;
       [[self class] showSignInAlertWithEmail:email
                                     provider:provider
@@ -176,7 +176,7 @@ - (void)onNext:(NSString *)emailText {
                                cancelHandler:^{
         [self.authUI signOutWithError:nil];
       }];
-    } else if ([providers containsObject:@"email"]) {
+    } else if ([providers containsObject:@"password"]) {
       UIViewController *controller;
       if ([delegate respondsToSelector:@selector(passwordSignInViewControllerForAuthUI:email:)]) {
         controller = [delegate passwordSignInViewControllerForAuthUI:self.authUI
@@ -225,7 +225,7 @@ - (void)sendSignInLinkToEmail:(NSString*)email {
   }
 
   [self incrementActivity];
-  FUIEmailAuth *emailAuth = [self.authUI providerWithID:@"email"];
+  FUIEmailAuth *emailAuth = [self.authUI providerWithID:@"password"];
   [emailAuth generateURLParametersAndLocalCache:email linkingProvider:nil];
   [self.auth sendSignInLinkToEmail:email
                 actionCodeSettings:emailAuth.actionCodeSettings
diff --git a/UITests/FirebaseUISample/FUIViewController.m b/UITests/FirebaseUISample/FUIViewController.m
@@ -85,15 +85,15 @@ - (IBAction)onAuthorization:(id)sender {
   BOOL shouldSkipPhoneAuthPicker = _authProviders.count == 1 &&
       ([firstProviderID isEqualToString:FIRPhoneAuthProviderID] ||
        [firstProviderID isEqualToString:@
-@"email"]);
+@"password"]);
   if (!shouldSkipPhoneAuthPicker) {
     UIViewController *controller = [self.authUIMock authViewController];
     [self presentViewController:controller animated:YES completion:nil];
   } else if ([firstProviderID isEqualToString:FIRPhoneAuthProviderID]) {
     FUIPhoneAuth *provider = _authProviders.firstObject;
     [provider signInWithPresentingViewController:self phoneNumber:nil];
   } else if ([firstProviderID isEqualToString:@
-@"email"]) {
+@"password"]) {
     FUIEmailAuth *provider = _authProviders.firstObject;
     [provider signInWithPresentingViewController:self email:nil];
   }
@@ -439,7 +439,7 @@ - (void)prepareForAccountManagerWithoutPasswordWithLinkedAccountWithEmail {
 - (id)createPasswordProvider {
   id emailPasswordProviderMock = OCMProtocolMock(@protocol(FIRUserInfo));
   OCMStub([emailPasswordProviderMock providerID]).andReturn(@
-@"email");
+@"password");
   OCMStub([emailPasswordProviderMock email]).andReturn(@"password@email.com");
   OCMStub([emailPasswordProviderMock displayName]).andReturn(@"password displayName");
 
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m b/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m
@@ -263,7 +263,7 @@ - (IBAction)onAuthorization:(id)sender {
     NSString *providerID = self.authUI.providers.firstObject.providerID;
     BOOL isPhoneAuth = [providerID isEqualToString:FIRPhoneAuthProviderID];
     BOOL isEmailAuth = [providerID isEqualToString:@
-@"email"];
+@"password"];
     BOOL shouldSkipAuthPicker = self.authUI.providers.count == 1 && (isPhoneAuth || isEmailAuth);
     if (shouldSkipAuthPicker) {
       if (isPhoneAuth) {

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ - (void)cancelAuthorization {`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`+ (NSString )providerLocalizedName:(NSString )providerId {`
`433`		`- if ([providerId isEqualToString:@"email"]) {`
	`433`	`+ if ([providerId isEqualToString:@"password"]) {`
`434`	`434`	`return FUILocalizedString(kStr_ProviderTitlePassword);`
`435`	`435`	`} else if ([providerId isEqualToString:@"google.com"]) {`
`436`	`436`	`return FUILocalizedString(kStr_ProviderTitleGoogle);`