Update FirebaseUI/Auth 2.0, synced @122079078.

Change-Id: I7bce0d3b7bb0b1e04be1301dfe38c1cb162af047

Author: ch40w31

FirebaseUI/Auth/AuthProviderUI/Facebook/Resources/facebook.png

@@ -28,6 +28,11 @@
  */
 static NSString *const kBundleFileName = @"FirebaseFacebookAuthUIBundle.bundle";
 
+/** @var kTableName
+    @brief The name of the strings table to search for localized strings.
+*/
+static NSString *const kTableName = @"FirebaseFacebookAuthUI";
+
 /** @var kSignInWithFacebook
     @brief The string key for localized button text.
  */
@@ -98,7 +103,7 @@ + (UIImage *)imageNamed:(NSString *)name {
  */
 + (NSString *)localizedStringForKey:(NSString *)key {
   NSBundle *frameworkBundle = [[self class] frameworkBundle];
-  return [frameworkBundle localizedStringForKey:key value:nil table:@"FirebaseFacebookAuthUI"];
+  return [frameworkBundle localizedStringForKey:key value:nil table:kTableName];
 }
 
 #pragma mark - FIRAuthProviderUI
@@ -115,9 +120,22 @@ - (NSString *)signInLabel {
   return [[self class] localizedStringForKey:kSignInWithFacebook];
 }
 
-- (void)FIRAuth:(FIRAuth *)auth
-    signInWithPresentingViewController:(nullable UIViewController *)presentingViewController
-                            completion:(nullable FIRAuthProviderSignInCompletionBlock)completion {
+- (UIImage *)icon {
+  return [[self class] imageNamed:@"ic_facebook"];
+}
+
+- (UIColor *)buttonBackgroundColor {
+  return [UIColor colorWithRed:59.0f/255.0f green:89.0f/255.0f blue:152.0f/255.0f alpha:1.0f];
+}
+
+- (UIColor *)buttonTextColor {
+  return [UIColor whiteColor];
+}
+
+- (void)signInWithAuth:(FIRAuth *)auth
+                       email:(nullable NSString *)email
+    presentingViewController:(nullable UIViewController *)presentingViewController
+                  completion:(nullable FIRAuthProviderSignInCompletionBlock)completion {
   _pendingSignInCallback = completion;
   [_loginManager logInWithReadPermissions:_scopes
                        fromViewController:presentingViewController
@@ -138,7 +156,7 @@ - (void)FIRAuth:(FIRAuth *)auth
   }];
 }
 
-- (void)FIRAuthSignOut:(FIRAuth *)auth {
+- (void)signOutWithAuth:(FIRAuth *)auth {
   [_loginManager logOut];
 }
 

FirebaseUI/Auth/AuthProviderUI/Facebook/Resources/[email protected]

@@ -36,6 +36,11 @@
  */
 static NSString *const kGooglePlusScopesPrefix = @"https://www.googleapis.com/auth/plus.";
 
+/** @var kTableName
+    @brief The name of the strings table to search for localized strings.
+*/
+static NSString *const kTableName = @"FirebaseGoogleAuthUI";
+
 /** @var kSignInWithGoogle
     @brief The string key for localized button text.
  */
@@ -107,7 +112,7 @@ + (UIImage *)imageNamed:(NSString *)name {
  */
 + (NSString *)localizedStringForKey:(NSString *)key {
   NSBundle *frameworkBundle = [[self class] frameworkBundle];
-  return [frameworkBundle localizedStringForKey:key value:nil table:@"FirebaseGoogleAuthUI"];
+  return [frameworkBundle localizedStringForKey:key value:nil table:kTableName];
 }
 
 #pragma mark - FIRAuthProviderUI
@@ -124,16 +129,37 @@ - (NSString *)signInLabel {
   return [[self class] localizedStringForKey:kSignInWithGoogle];
 }
 
-- (void)FIRAuth:(FIRAuth *)auth
-    signInWithPresentingViewController:(nullable UIViewController *)presentingViewController
-                            completion:(nullable FIRAuthProviderSignInCompletionBlock)completion {
+- (UIImage *)icon {
+  return [[self class] imageNamed:@"ic_google"];
+}
+
+- (UIColor *)buttonBackgroundColor {
+  return [UIColor whiteColor];
+}
+
+- (UIColor *)buttonTextColor {
+  return [UIColor colorWithWhite:0 alpha:0.54f];
+}
+
+- (void)signInWithAuth:(FIRAuth *)auth
+                       email:(nullable NSString *)email
+    presentingViewController:(nullable UIViewController *)presentingViewController
+                  completion:(nullable FIRAuthProviderSignInCompletionBlock)completion {
   _presentingViewController = presentingViewController;
-  _pendingSignInCallback = completion;
+
   GIDSignIn *signIn = [self configuredGoogleSignIn];
+  _pendingSignInCallback = ^(FIRAuthCredential *_Nullable credential, NSError *_Nullable error) {
+    signIn.loginHint = nil;
+    if (completion) {
+      completion(credential, error);
+    }
+  };
+
+  signIn.loginHint = email;
   [signIn signIn];
 }
 
-- (void)FIRAuthSignOut:(FIRAuth *)auth {
+- (void)signOutWithAuth:(FIRAuth *)auth {
   GIDSignIn *signIn = [self configuredGoogleSignIn];
   [signIn signOut];
 }
@@ -191,23 +217,6 @@ - (GIDSignIn *)configuredGoogleSignIn {
   return signIn;
 }
 
-/** @fn clientIsRequestingGoogleSocialScopes
-    @brief Indicates the games scope or a plus.* scope (with the exception of plus.me) is included
-        in the additional scopes being requested for the google provider in the stared FIRAuth
-        instance.
-    @return YES if the client is requesting a social scope.
- */
-- (BOOL)clientIsRequestingGoogleSocialScopes {
-  for (NSString *scope in _scopes) {
-    if ([scope isEqualToString:kGoogleGamesScope] ||
-        ([scope rangeOfString:kGooglePlusScopesPrefix].location != NSNotFound
-        && ![scope isEqualToString:kGooglePlusMeScope])) {
-      return YES;
-    }
-  }
-  return NO;
-}
-
 /** @fn callbackWithCredential:error:
     @brief Ends the sign-in flow by cleaning up and calling back with given credential or error.
     @param credential The credential to pass back, if any.