Bläddra i källkod

Merge branch 'briannamorales/vwg-flow' into briannamorales/optionsValidation

brianna 1 år sedan
förälder
incheckning
731d3a8e8c

+ 0 - 6
GoogleSignIn/Sources/GIDSignIn.m

@@ -135,12 +135,6 @@ static NSString *const kHostedDomainParameter = @"hd";
 // Minimum time to expiration for a restored access token.
 static const NSTimeInterval kMinimumRestoredAccessTokenTimeToExpire = 600.0;
 
-// Info.plist config keys
-static NSString *const kConfigClientIDKey = @"GIDClientID";
-static NSString *const kConfigServerClientIDKey = @"GIDServerClientID";
-static NSString *const kConfigHostedDomainKey = @"GIDHostedDomain";
-static NSString *const kConfigOpenIDRealmKey = @"GIDOpenIDRealm";
-
 // The callback queue used for authentication flow.
 @interface GIDAuthFlow : GIDCallbackQueue
 

+ 1 - 0
GoogleSignIn/Sources/GIDSignInInternalOptions.m

@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
   GIDSignInInternalOptions *options = [[GIDSignInInternalOptions alloc] init];
   if (options) {
     options->_interactive = YES;
+    options->_continuation = NO; // Not relevant to VwG flow.
     options->_addScopesFlow = addScopesFlow;
     options->_configuration = configuration;
     options->_presentingViewController = presentingViewController;

+ 1 - 0
GoogleSignIn/Sources/GIDVerifyAccountDetail/Implementations/GIDVerifyAccountDetail.m

@@ -16,6 +16,7 @@
 
 #import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDVerifyAccountDetail.h"
 
+#import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDConfiguration.h"
 #import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDConfiguration.h"
 #import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDVerifiableAccountDetail.h"
 #import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDVerifiedAccountDetailResult.h"