4343 */
4444static NSString *const kSignInWithGoogle = @" SignInWithGoogle" ;
4545
46- @interface FUIGoogleAuth () <GIDSignInDelegate, GIDSignInUIDelegate >
46+ @interface FUIGoogleAuth () <GIDSignInDelegate>
4747@end
4848@implementation FUIGoogleAuth {
4949 /* * @var _presentingViewController
@@ -125,6 +125,7 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
125125 _presentingViewController = presentingViewController;
126126
127127 GIDSignIn *signIn = [self configuredGoogleSignIn ];
128+ signIn.presentingViewController = presentingViewController;
128129 _pendingSignInCallback = ^(FIRAuthCredential *_Nullable credential,
129130 NSError *_Nullable error,
130131 _Nullable FIRAuthResultCallback result,
@@ -146,7 +147,7 @@ - (void)signOut {
146147
147148- (BOOL )handleOpenURL : (NSURL *)URL sourceApplication : (NSString *)sourceApplication {
148149 GIDSignIn *signIn = [self configuredGoogleSignIn ];
149- return [signIn handleURL: URL sourceApplication: sourceApplication annotation: nil ];
150+ return [signIn handleURL: URL];
150151}
151152
152153- (NSString *)email {
@@ -185,16 +186,6 @@ - (void)signIn:(GIDSignIn *)signIn
185186 }];
186187}
187188
188- #pragma mark - GIDSignInUIDelegate methods
189-
190- - (void )signIn : (GIDSignIn *)signIn presentViewController : (UIViewController *)viewController {
191- [_presentingViewController presentViewController: viewController animated: YES completion: nil ];
192- }
193-
194- - (void )signIn : (GIDSignIn *)signIn dismissViewController : (UIViewController *)viewController {
195- [_presentingViewController dismissViewControllerAnimated: YES completion: nil ];
196- }
197-
198189#pragma mark - Helpers
199190
200191/* * @fn configuredGoogleSignIn
@@ -204,7 +195,6 @@ - (void)signIn:(GIDSignIn *)signIn dismissViewController:(UIViewController *)vie
204195- (GIDSignIn *)configuredGoogleSignIn {
205196 GIDSignIn *signIn = [GIDSignIn sharedInstance ];
206197 signIn.delegate = self;
207- signIn.uiDelegate = self;
208198 signIn.shouldFetchBasicProfile = YES ;
209199 signIn.clientID = [[FIRApp defaultApp ] options ].clientID ;
210200 signIn.scopes = _scopes;
0 commit comments