Skip to content

Commit 4b445a8

Browse files
committed
Assign to keychainStore asap in initializer
1 parent 3996d90 commit 4b445a8

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

GoogleSignIn/Sources/GIDSignIn.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,8 @@ - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore
541541
authStateMigrationService:(GIDAuthStateMigration *)authStateMigrationService {
542542
self = [super init];
543543
if (self) {
544+
_keychainStore = keychainStore;
545+
544546
// Get the bundle of the current executable.
545547
NSBundle *bundle = NSBundle.mainBundle;
546548

@@ -564,7 +566,6 @@ - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore
564566
_appAuthConfiguration = [[OIDServiceConfiguration alloc]
565567
initWithAuthorizationEndpoint:[NSURL URLWithString:authorizationEnpointURL]
566568
tokenEndpoint:[NSURL URLWithString:tokenEndpointURL]];
567-
_keychainStore = keychainStore;
568569
// Perform migration of auth state from old versions of the SDK if needed.
569570
[authStateMigrationService migrateIfNeededWithTokenURL:_appAuthConfiguration.tokenEndpoint
570571
callbackPath:kBrowserCallbackPath

Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -556,7 +556,7 @@
556556
CODE_SIGN_IDENTITY = "Apple Development";
557557
CODE_SIGN_STYLE = Automatic;
558558
DEVELOPMENT_ASSET_PATHS = "\"iOS/Preview Content\"";
559-
DEVELOPMENT_TEAM = "";
559+
DEVELOPMENT_TEAM = 93P2X7NCZC;
560560
ENABLE_PREVIEWS = YES;
561561
INFOPLIST_FILE = iOS/Info.plist;
562562
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -580,7 +580,7 @@
580580
CODE_SIGN_IDENTITY = "Apple Development";
581581
CODE_SIGN_STYLE = Automatic;
582582
DEVELOPMENT_ASSET_PATHS = "\"iOS/Preview Content\"";
583-
DEVELOPMENT_TEAM = "";
583+
DEVELOPMENT_TEAM = 93P2X7NCZC;
584584
ENABLE_PREVIEWS = YES;
585585
INFOPLIST_FILE = iOS/Info.plist;
586586
IPHONEOS_DEPLOYMENT_TARGET = 14.0;

Samples/Swift/DaysUntilBirthday/Shared/DaysUntilBirthday.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ struct DaysUntilBirthday: App {
2626
ContentView()
2727
.environmentObject(authViewModel)
2828
.onAppear {
29+
2930
GIDSignIn.sharedInstance.restorePreviousSignIn { user, error in
3031
if let user = user {
3132
self.authViewModel.state = .signedIn(user)

0 commit comments

Comments
 (0)