Skip to content

Assign to keychainStore asap in initializer #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdmathias merged 4 commits into from
Aug 23, 2025
Merged

Assign to keychainStore asap in initializer #540

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b445a8
Assign to keychainStore asap in initializer
mdmathias Aug 1, 2025
d70c48d
Do not remove keychain entries on reinstall
mdmathias Aug 21, 2025
5e8393a
Revert objectVersion increment in pbxproj
mdmathias Aug 22, 2025
8f8c481
Merge branch 'main' into mdmathias/fix-keychainstore-init
mdmathias Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions GoogleSignIn/Sources/GIDSignIn.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,8 @@ - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore
authStateMigrationService:(GIDAuthStateMigration *)authStateMigrationService {
self = [super init];
if (self) {
_keychainStore = keychainStore;

// Get the bundle of the current executable.
NSBundle *bundle = NSBundle.mainBundle;

Expand All @@ -552,19 +554,13 @@ - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore
// Check to see if the 3P app is being run for the first time after a fresh install.
BOOL isFreshInstall = [self isFreshInstall];

// If this is a fresh install, ensure that any pre-existing keychain data is purged.
if (isFreshInstall) {
[self removeAllKeychainEntries];
}

NSString *authorizationEnpointURL = [NSString stringWithFormat:kAuthorizationURLTemplate,
[GIDSignInPreferences googleAuthorizationServer]];
NSString *tokenEndpointURL = [NSString stringWithFormat:kTokenURLTemplate,
[GIDSignInPreferences googleTokenServer]];
_appAuthConfiguration = [[OIDServiceConfiguration alloc]
initWithAuthorizationEndpoint:[NSURL URLWithString:authorizationEnpointURL]
tokenEndpoint:[NSURL URLWithString:tokenEndpointURL]];
_keychainStore = keychainStore;
// Perform migration of auth state from old versions of the SDK if needed.
[authStateMigrationService migrateIfNeededWithTokenURL:_appAuthConfiguration.tokenEndpoint
callbackPath:kBrowserCallbackPath
Expand Down