update FUIGoogleAuth for GoogleSignIn 6

Author: morganchen12

FirebaseGoogleAuthUI.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.dependency 'FirebaseAuth'
   s.dependency 'FirebaseCore'
   s.dependency 'FirebaseAuthUI'
-  s.dependency 'GoogleSignIn', '~> 5.0'
+  s.dependency 'GoogleSignIn', '~> 6.0'
   s.resource_bundles = {
     'FirebaseGoogleAuthUI' => ['FirebaseGoogleAuthUI/Sources/{Resources,Strings}/*.{png,lproj}']
   }

FirebaseGoogleAuthUI/Podfile

@@ -6,7 +6,7 @@ platform :ios, '10.0'
 target 'FirebaseGoogleAuthUI' do
   use_frameworks!
 
-  pod 'GoogleSignIn', '~> 5.0'
+  pod 'GoogleSignIn', '~> 6.0'
   pod 'FirebaseAuthUI', :path => '../'
 
   target 'FirebaseGoogleAuthUITests' do

FirebaseGoogleAuthUI/Podfile.lock

@@ -25,8 +25,8 @@ PODS:
     - GoogleUtilities/Environment (~> 7.2)
     - nanopb (~> 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleSignIn (5.0.2):
-    - AppAuth (~> 1.2)
+  - GoogleSignIn (6.0.0):
+    - AppAuth (~> 1.4)
     - GTMAppAuth (~> 1.0)
     - GTMSessionFetcher/Core (~> 1.1)
   - GoogleUtilities/AppDelegateSwizzler (7.5.0):
@@ -58,7 +58,7 @@ PODS:
 
 DEPENDENCIES:
   - FirebaseAuthUI (from `../`)
-  - GoogleSignIn (~> 5.0)
+  - GoogleSignIn (~> 6.0)
   - OCMock
 
 SPEC REPOS:
@@ -87,14 +87,14 @@ SPEC CHECKSUMS:
   FirebaseCore: a6dba751680d7033b9d3831e1cfc95ead0605118
   FirebaseCoreDiagnostics: 7e873baabcfaa9512f538554ae4fa0817aaafbdb
   GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9
-  GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
+  GoogleSignIn: b7779a809e1dfb32ebb43131b10d8bfcd53c1383
   GoogleUtilities: eea970f4a389963963bffe8d8fabe43540678b9c
   GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
   GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934
   PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
 
-PODFILE CHECKSUM: 5b245dea8385cbe6f02f214577a97083894700bf
+PODFILE CHECKSUM: 0ab8f1a707baefc68f0b4f5320060c1502798f29
 
 COCOAPODS: 1.10.1

FirebaseGoogleAuthUI/Sources/FUIGoogleAuth.m

@@ -36,7 +36,7 @@
  */
 static NSString *const kSignInWithGoogle = @"SignInWithGoogle";
 
-@interface FUIGoogleAuth () <GIDSignInDelegate>
+@interface FUIGoogleAuth ()
 
 /** @property authUI
     @brief FUIAuth instance of the application.
@@ -50,16 +50,6 @@ @interface FUIGoogleAuth () <GIDSignInDelegate>
 
 @end
 @implementation FUIGoogleAuth {
-  /** @var _presentingViewController
-      @brief The presenting view controller for interactive sign-in.
-   */
-  UIViewController *_presentingViewController;
-
-  /** @var _pendingSignInCallback
-      @brief The callback which should be invoked when the sign in flow completes (or is cancelled.)
-   */
-  FUIAuthProviderSignInCompletionBlock _pendingSignInCallback;
-
   /** @var _email
       @brief The email address associated with this account.
    */
@@ -71,6 +61,10 @@ + (NSBundle *)bundle {
                  inFrameworkBundle:[NSBundle bundleForClass:[self class]]];
 }
 
++ (NSArray<NSString *> *)defaultScopes {
+  return @[kGoogleUserInfoEmailScope, kGoogleUserInfoProfileScope];
+}
+
 - (instancetype)initWithAuthUI:(FUIAuth *)authUI {
   return [self initWithAuthUI:authUI scopes:@[kGoogleUserInfoEmailScope, kGoogleUserInfoProfileScope]];
 }
@@ -90,7 +84,7 @@ - (instancetype)initWithAuthUI:(FUIAuth *)authUI scopes:(NSArray<NSString *> *)s
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (instancetype)init {
-  return [self initWithScopes:@[kGoogleUserInfoEmailScope, kGoogleUserInfoProfileScope]];
+  return [self initWithScopes:[[self class] defaultScopes]];
 }
 
 - (instancetype)initWithScopes:(NSArray *)scopes {
@@ -159,7 +153,6 @@ - (void)signInWithEmail:(nullable NSString *)email
 - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
       presentingViewController:(nullable UIViewController *)presentingViewController
                     completion:(nullable FUIAuthProviderSignInCompletionBlock)completion {
-  _presentingViewController = presentingViewController;
 
   if (self.authUI.isEmulatorEnabled) {
     [self signInWithOAuthProvider:self.providerForEmulator
@@ -168,26 +161,42 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
     return;
   }
 
-  GIDSignIn *signIn = [self configuredGoogleSignIn];
-  signIn.presentingViewController = presentingViewController;
-  _pendingSignInCallback = ^(FIRAuthCredential *_Nullable credential,
+  GIDSignIn *signIn = [GIDSignIn sharedInstance];
+  NSString *clientID = self.authUI.auth.app.options.clientID;
+
+  if (!clientID) {
+    [NSException raise:NSInternalInconsistencyException
+                format:@"OAuth client ID not found. Please make sure Google Sign-In is enabled in "
+     @"the Firebase console. You may have to download a new GoogleService-Info.plist file after "
+     @"enabling Google Sign-In."];
+  }
+
+  GIDConfiguration *config = [[GIDConfiguration alloc] initWithClientID:clientID];
+
+  FUIAuthProviderSignInCompletionBlock callback = ^(FIRAuthCredential *_Nullable credential,
                              NSError *_Nullable error,
                              _Nullable FIRAuthResultCallback result,
                              NSDictionary *_Nullable userInfo) {
-    signIn.loginHint = nil;
     if (completion) {
       completion(credential, error, result, nil);
     }
   };
 
-  signIn.loginHint = defaultValue;
-  [signIn signIn];
+  [signIn signInWithConfiguration:config
+         presentingViewController:presentingViewController
+                             hint:defaultValue
+                         callback:^(GIDGoogleUser *user, NSError *error) {
+    [self handleSignInWithUser:user
+                         error:error
+      presentingViewController:presentingViewController
+                      callback:callback];
+  }];
 }
 
 - (void)signInWithOAuthProvider:(FIROAuthProvider *)oauthProvider
        presentingViewController:(nullable UIViewController *)presentingViewController
                      completion:(nullable FUIAuthProviderSignInCompletionBlock)completion {
-  oauthProvider.scopes = self.scopes;
+  oauthProvider.scopes = [[self class] defaultScopes];
 
   [oauthProvider getCredentialWithUIDelegate:nil
                                   completion:^(FIRAuthCredential *_Nullable credential,
@@ -214,92 +223,77 @@ - (void)signInWithOAuthProvider:(FIROAuthProvider *)oauthProvider
   }];
 }
 
+- (void)requestScopesWithPresentingViewController:(UIViewController *)presentingViewController
+                                       completion:(FUIAuthProviderSignInCompletionBlock)completion {
+  GIDSignIn *signIn = [GIDSignIn sharedInstance];
+  [signIn addScopes:self.scopes presentingViewController:presentingViewController
+           callback:^(GIDGoogleUser *user, NSError *error) {
+    [self handleSignInWithUser:user
+                         error:error
+      presentingViewController:presentingViewController
+                      callback:^(FIRAuthCredential *credential,
+                                 NSError *error,
+                                 FIRAuthResultCallback result,
+                                 NSDictionary<NSString *,id> *userInfo) {
+      if (completion != nil) {
+        completion(credential, error, result, nil);
+      }
+    }];
+  }];
+}
+
 - (void)signOut {
   if (self.authUI.isEmulatorEnabled) {
     return;
   }
-  GIDSignIn *signIn = [self configuredGoogleSignIn];
+  GIDSignIn *signIn = [GIDSignIn sharedInstance];
   [signIn signOut];
 }
 
 - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(NSString *)sourceApplication {
   if (self.authUI.isEmulatorEnabled) {
     return NO;
   }
-  GIDSignIn *signIn = [self configuredGoogleSignIn];
+  GIDSignIn *signIn = [GIDSignIn sharedInstance];
   return [signIn handleURL:URL];
 }
 
 - (NSString *)email {
   return _email;
 }
 
-#pragma mark - GIDSignInDelegate methods
-
-- (void)signIn:(GIDSignIn *)signIn
-    didSignInForUser:(GIDGoogleUser *)user
-           withError:(NSError *)error {
+- (void)handleSignInWithUser:(GIDGoogleUser *)user
+                       error:(NSError *)error
+    presentingViewController:(UIViewController *)presentingViewController
+                    callback:(FUIAuthProviderSignInCompletionBlock)callback {
   if (error) {
     if (error.code == kGIDSignInErrorCodeCanceled) {
-      [self callbackWithCredential:nil
-                             error:[FUIAuthErrorUtils
-                                    userCancelledSignInError] result:nil];
+      NSError *newError = [FUIAuthErrorUtils userCancelledSignInError];
+      if (callback) {
+        callback(nil, newError, nil, nil);
+      }
     } else {
       NSError *newError =
           [FUIAuthErrorUtils providerErrorWithUnderlyingError:error
                                                      providerID:FIRGoogleAuthProviderID];
-      [self callbackWithCredential:nil error:newError result:nil];
+      if (callback) {
+        callback(nil, newError, nil, nil);
+      }
     }
     return;
   }
   _email = user.profile.email;
   UIActivityIndicatorView *activityView =
-      [FUIAuthBaseViewController addActivityIndicator:_presentingViewController.view];
+      [FUIAuthBaseViewController addActivityIndicator:presentingViewController.view];
   [activityView startAnimating];
   FIRAuthCredential *credential =
       [FIRGoogleAuthProvider credentialWithIDToken:user.authentication.idToken
                                        accessToken:user.authentication.accessToken];
-  [self callbackWithCredential:credential error:nil result:^(FIRUser *_Nullable user,
-                                                             NSError *_Nullable error) {
+  FIRAuthResultCallback result = ^(FIRUser *_Nullable user,
+                                   NSError *_Nullable error) {
     [activityView stopAnimating];
     [activityView removeFromSuperview];
-  }];
-}
-
-#pragma mark - Helpers
-
-/** @fn configuredGoogleSignIn
-    @brief Returns an instance of @c GIDSignIn which is configured to match the configuration
-        of this instance.
- */
-- (GIDSignIn *)configuredGoogleSignIn {
-  GIDSignIn *signIn = [GIDSignIn sharedInstance];
-  signIn.delegate = self;
-  signIn.shouldFetchBasicProfile = YES;
-  signIn.clientID = [[FIRApp defaultApp] options].clientID;
-  if (!signIn.clientID) {
-    [NSException raise:NSInternalInconsistencyException
-                format:@"OAuth client ID not found. Please make sure Google Sign-In is enabled in "
-     @"the Firebase console. You may have to download a new GoogleService-Info.plist file after "
-     @"enabling Google Sign-In."];
-  }
-  signIn.scopes = _scopes;
-  return signIn;
-}
-
-/** @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.
-    @param error The error to pass back, if any.
-    @param result The result of sign-in operation using provided @c FIRAuthCredential object.
-        @see @c FIRAuth.signInWithCredential:completion:
- */
-- (void)callbackWithCredential:(nullable FIRAuthCredential *)credential
-                         error:(nullable NSError *)error
-                        result:(nullable FIRAuthResultCallback)result {
-  FUIAuthProviderSignInCompletionBlock callback = _pendingSignInCallback;
-  _presentingViewController = nil;
-  _pendingSignInCallback = nil;
+  };
   if (callback) {
     callback(credential, error, result, nil);
   }

FirebaseGoogleAuthUI/Sources/Public/FirebaseGoogleAuthUI/FUIGoogleAuth.h

@@ -46,7 +46,9 @@ static NSString *const kGoogleUserInfoProfileScope = @"https://www.googleapis.co
 /** @property scopes
     @brief The scopes to use with Google Sign In.
     @remarks Defaults to using email and profile scopes. For a list of all scopes
-        see https://developers.google.com/identity/protocols/googlescopes
+        see https://developers.google.com/identity/protocols/googlescopes.
+        Starting with GoogleSignIn 6.0, scopes are no longer granted upon first authentication and
+        should be requested lazily.
  */
 @property(nonatomic, copy, readonly) NSArray<NSString *> *scopes;
 
@@ -66,7 +68,9 @@ static NSString *const kGoogleUserInfoProfileScope = @"https://www.googleapis.co
     @brief Designated initializer.
     @param authUI The @c FUIAuth instance that manages this provider.
     @param scopes   The user account scopes required by the app. A list of possible scopes can be
-        found at https://developers.google.com/identity/protocols/googlescopes
+        found at https://developers.google.com/identity/protocols/googlescopes.
+        Starting with GoogleSignIn 6.0, scopes are no longer granted upon first authentication and
+        should be requested lazily.
  */
 - (instancetype)initWithAuthUI:(FUIAuth *)authUI
                         scopes:(NSArray <NSString *> *)scopes NS_DESIGNATED_INITIALIZER;
@@ -85,6 +89,12 @@ __attribute__((deprecated("Instead use initWithAuthUI:")));
 - (instancetype)initWithScopes:(NSArray <NSString *> *)scopes
 __attribute__((deprecated("Instead use initWithAuthUI:permissions:"))) NS_DESIGNATED_INITIALIZER;
 
+/** @fn initWithAuthUI:scopes:
+    @brief Requests the scopes in the `scopes` array.
+ */
+- (void)requestScopesWithPresentingViewController:(UIViewController *)presentingViewController
+                                       completion:(FUIAuthProviderSignInCompletionBlock)completion;
+
 @end
 
 NS_ASSUME_NONNULL_END