Fix pr issues

Author: Chuan Ren

Auth/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h

@@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /** @fn showAlertWithMessage:
     @brief Displays an alert view with given title and message on top of the current view
-    controller.
+        controller.
     @param message The message of the alert.
  */
 + (void)showAlertWithMessage:(NSString *)message;

EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.m

@@ -85,7 +85,6 @@ - (instancetype)initWithAuthUI:(FUIAuth *)authUI {
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil
                          bundle:(NSBundle *)nibBundleOrNil
                          authUI:(FUIAuth *)authUI {
-
   self = [super initWithNibName:nibNameOrNil
                          bundle:nibBundleOrNil
                          authUI:authUI];

EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m

@@ -229,28 +229,36 @@ - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)source
   }
   // Retrieve parameters from local storage
   NSMutableDictionary *localParameterDict = [NSMutableDictionary dictionary];
-  localParameterDict[kEmailLinkSignInEmailKey] = [GULUserDefaults.standardUserDefaults stringForKey:kEmailLinkSignInEmailKey];
+  localParameterDict[kEmailLinkSignInEmailKey] = [GULUserDefaults.standardUserDefaults
+                                                  stringForKey:kEmailLinkSignInEmailKey];
   localParameterDict[@"ui_sid"] = [GULUserDefaults.standardUserDefaults stringForKey:@"ui_sid"];
 
   // Handling flows
   NSString *urlSessionID = urlParameterDict[@"ui_sid"];
   NSString *localSessionID = localParameterDict[@"ui_sid"];
   BOOL sameDevice = urlSessionID && localSessionID && [urlSessionID isEqualToString:localSessionID];
 
-  if (sameDevice) { // Same device
-    if (urlParameterDict[@"ui_pid"] != nil) { // Unverified provider linking
+  if (sameDevice) {
+    // Same device
+    if (urlParameterDict[@"ui_pid"]) {
+      // Unverified provider linking
       [self handleUnverifiedProviderLinking:urlParameterDict[@"ui_pid"]
                                       email:localParameterDict[kEmailLinkSignInEmailKey]];
-    } else if (urlParameterDict[@"ui_auid"] != nil) { // Anonymous upgrade
+    } else if (urlParameterDict[@"ui_auid"]) {
+      // Anonymous upgrade
       [self handleAnonymousUpgrade:urlParameterDict[@"ui_auid"]
                              email:localParameterDict[kEmailLinkSignInEmailKey]];
-    } else { // Normal email link sign in
+    } else {
+      // Normal email link sign in
       [self handleEmaiLinkSignIn:localParameterDict[kEmailLinkSignInEmailKey]];
     }
-  } else { // Different device
-    if ([urlParameterDict[@"ui_sd"] isEqualToString:@"1"]) { // Force same device enabled
+  } else {
+    // Different device
+    if ([urlParameterDict[@"ui_sd"] isEqualToString:@"1"]) {
+      // Force same device enabled
       [self handleDifferentDevice];
-    } else { // Force same device not enabled
+    } else {
+      // Force same device not enabled
       [self handleConfirmEmail];
     }
   }
@@ -261,8 +269,10 @@ - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)source
 - (void)handleUnverifiedProviderLinking:(NSString *)providerID
                                   email:(NSString *)email {
   if ([providerID isEqualToString:FIRFacebookAuthProviderID]) {
-    NSData *unverifiedProviderCredentialData = [GULUserDefaults.standardUserDefaults objectForKey:kEmailLinkSignInLinkingCredentialKey];
-    FIRAuthCredential *unverifiedProviderCredential = [NSKeyedUnarchiver unarchiveObjectWithData:unverifiedProviderCredentialData];
+    NSData *unverifiedProviderCredentialData = [GULUserDefaults.standardUserDefaults
+                                                objectForKey:kEmailLinkSignInLinkingCredentialKey];
+    FIRAuthCredential *unverifiedProviderCredential =
+        [NSKeyedUnarchiver unarchiveObjectWithData:unverifiedProviderCredentialData];
 
     FIRAuthCredential *emailLinkCredential =
     [FIREmailAuthProvider credentialWithEmail:email link:self.emailLink];
@@ -663,34 +673,36 @@ - (void)handleAccountLinkingForEmail:(NSString *)email
           "link below. \n \n For this flow to successfully connect your "
           "account with this email, you have to open the link on the same "
           "device or browser.", email, providerName, email];
+      void (^actionHandler)(void) = ^() {
+        [self generateURLParametersAndLocalCache:email
+                                 linkingProvider:newCredential.provider];
+
+        NSData *data = [NSKeyedArchiver archivedDataWithRootObject:newCredential];
+        [GULUserDefaults.standardUserDefaults setObject:data forKey:kEmailLinkSignInLinkingCredentialKey];
+
+        void (^completion)(NSError * _Nullable error) = ^(NSError * _Nullable error){
+          if (error) {
+            [FUIAuthBaseViewController showAlertWithMessage:error.description];
+          } else {
+            NSString *signInMessage = [NSString stringWithFormat:
+                                       @"A sign-in email with additional instrucitons was sent to %@. Check your "
+                                       "email to complete sign-in.", email];
+            [FUIAuthBaseViewController
+             showAlertWithTitle:@"Sign-in email sent"
+             message:signInMessage
+             presentingViewController:nil];
+          }
+        };
+        [self.authUI.auth sendSignInLinkToEmail:email
+                             actionCodeSettings:self.actionCodeSettings
+                                     completion:completion];
+      };
+
       [FUIAuthBaseViewController
           showAlertWithTitle:@"Sign in"
                      message:message
                  actionTitle:@"Sign in"
-               actionHandler:^{
-                 [self generateURLParametersAndLocalCache:email
-                                          linkingProvider:newCredential.provider];
-
-                 NSData *data = [NSKeyedArchiver archivedDataWithRootObject:newCredential];
-                 [GULUserDefaults.standardUserDefaults setObject:data forKey:kEmailLinkSignInLinkingCredentialKey];
-
-                 void (^completion)(NSError * _Nullable error) = ^(NSError * _Nullable error){
-                   if (error) {
-                     [FUIAuthBaseViewController showAlertWithMessage:error.description];
-                   } else {
-                     NSString *signInMessage = [NSString stringWithFormat:
-                         @"A sign-in email with additional instrucitons was sent to %@. Check your "
-                         "email to complete sign-in.", email];
-                     [FUIAuthBaseViewController
-                      showAlertWithTitle:@"Sign-in email sent"
-                      message:signInMessage
-                      presentingViewController:nil];
-                   }
-                 };
-                 [self.authUI.auth sendSignInLinkToEmail:email
-                                      actionCodeSettings:self.actionCodeSettings
-                                              completion:completion];
-               }
+               actionHandler:actionHandler
                 dismissTitle:nil
               dismissHandler:nil
     presentingViewController:nil];
@@ -769,10 +781,8 @@ - (void)generateURLParametersAndLocalCache:(NSString *)email linkingProvider:(NS
   NSURLComponents *urlComponents = [NSURLComponents componentsWithString:url.absoluteString];
   NSMutableArray<NSURLQueryItem *> *urlQuertItems = [NSMutableArray array];
 
-  // kEmailLinkSignInEmailKey
   [GULUserDefaults.standardUserDefaults setObject:email forKey:kEmailLinkSignInEmailKey];
 
-  // ui_auid
   if (self.authUI.auth.currentUser.isAnonymous && self.authUI.shouldAutoUpgradeAnonymousUsers) {
     NSString *auid = self.authUI.auth.currentUser.uid;
 
@@ -781,7 +791,6 @@ - (void)generateURLParametersAndLocalCache:(NSString *)email linkingProvider:(NS
     [urlQuertItems addObject:anonymousUserIDQueryItem];
   }
 
-  // ui_sid
   NSInteger ui_sid = arc4random_uniform(999999999);
   NSString *sidString = [NSString stringWithFormat:@"%ld", (long)ui_sid];
   [GULUserDefaults.standardUserDefaults setObject:sidString forKey:@"ui_sid"];
@@ -790,7 +799,6 @@ - (void)generateURLParametersAndLocalCache:(NSString *)email linkingProvider:(NS
       [NSURLQueryItem queryItemWithName:@"ui_sid" value:sidString];
   [urlQuertItems addObject:sessionIDQueryItem];
 
-  // ui_sd
   NSString *sameDeviceValueString;
   if (self.forceSameDevice) {
     sameDeviceValueString = @"1";
@@ -800,7 +808,6 @@ - (void)generateURLParametersAndLocalCache:(NSString *)email linkingProvider:(NS
   NSURLQueryItem *sameDeviceQueryItem = [NSURLQueryItem queryItemWithName:@"ui_sd" value:sameDeviceValueString];
   [urlQuertItems addObject:sameDeviceQueryItem];
 
-  // ui_pid
   if (linkingProvider) {
     NSURLQueryItem *providerIDQueryItem = [NSURLQueryItem queryItemWithName:@"ui_pid" value:linkingProvider];
     [urlQuertItems addObject:providerIDQueryItem];

EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m

@@ -264,8 +264,7 @@ - (void)sendSignInLinkToEmail:(NSString*)email {
                                      dismissHandler:^{
                                        [self.navigationController popToRootViewControllerAnimated:YES];
                                      }
-                           presentingViewController:self
-       ];
+                           presentingViewController:self];
     }
   }];
 }

samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m

@@ -27,7 +27,8 @@
 
 @implementation FUIAppDelegate
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+- (BOOL)application:(UIApplication *)application
+didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   if (kTwitterConsumerKey.length && kTwitterConsumerSecret.length) {
     [[TWTRTwitter sharedInstance] startWithConsumerKey:kTwitterConsumerKey
                                         consumerSecret:kTwitterConsumerSecret];
@@ -38,32 +39,40 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
-- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString*, id> *)options {
+- (BOOL)application:(UIApplication *)app
+            openURL:(NSURL *)url
+            options:(NSDictionary<NSString*, id> *)options {
   NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
   return [self handleOpenUrl:url sourceApplication:sourceApplication];
 }
 
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(nullable NSString *)sourceApplication annotation:(id)annotation {
+- (BOOL)application:(UIApplication *)application
+            openURL:(NSURL *)url
+  sourceApplication:(nullable NSString *)sourceApplication
+         annotation:(id)annotation {
   return [self handleOpenUrl:url sourceApplication:sourceApplication];
 }
 
-- (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:
+- (BOOL)application:(UIApplication *)application
+continueUserActivity:(nonnull NSUserActivity *)userActivity
+ restorationHandler:
 #if defined(__IPHONE_12_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0)
   (nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler {
 #else
   (nonnull void (^)(NSArray *_Nullable))restorationHandler {
 #endif  // __IPHONE_12_0
-  BOOL handled = [[FIRDynamicLinks dynamicLinks] handleUniversalLink:userActivity.webpageURL
-                                                          completion:^(FIRDynamicLink * _Nullable dynamicLink,
-                                                                       NSError * _Nullable error) {
-                                                            if (error) {
-                                                              NSLog(@"%@", error.description);
-                                                            } else {
-                                                              [self handleOpenUrl:dynamicLink.url sourceApplication:nil];
-                                                            }
-                                                          }];
-  return handled;
-}
+    BOOL handled = [[FIRDynamicLinks dynamicLinks]
+                    handleUniversalLink:userActivity.webpageURL
+                    completion:^(FIRDynamicLink * _Nullable dynamicLink,
+                                 NSError * _Nullable error) {
+                      if (error) {
+                        NSLog(@"%@", error.description);
+                      } else {
+                        [self handleOpenUrl:dynamicLink.url sourceApplication:nil];
+                      }
+                    }];
+    return handled;
+  }
 
 - (BOOL)handleOpenUrl:(NSURL *)url sourceApplication:(nullable NSString *)sourceApplication {
   if ([FUIAuth.defaultAuthUI handleOpenURL:url sourceApplication:sourceApplication]) {

samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m

@@ -373,9 +373,8 @@ + (NSArray *)getListOfIDPs:(NSArray<NSIndexPath *> *)selectedRows
           if (useEmaiLink) {
             // ActionCodeSettings for email link sign-in.
             FIRActionCodeSettings *actionCodeSettings = [[FIRActionCodeSettings alloc] init];
-            [actionCodeSettings setURL:[NSURL URLWithString:@"https://fb-sa-1211.appspot.com"]];
+            actionCodeSettings.URL = [NSURL URLWithString:@"https://fb-sa-1211.appspot.com"];
             actionCodeSettings.handleCodeInApp = YES;
-            [actionCodeSettings setIOSBundleID:[[NSBundle mainBundle] bundleIdentifier]];
             [actionCodeSettings setAndroidPackageName:@"com.example.android"
                                 installIfNotAvailable:NO
                                        minimumVersion:@"12"];