Skip to content

Attempt migrations once #528

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
camden-king merged 2 commits into from
Jun 9, 2025
Merged

Attempt migrations once #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8b5411
attempt migration once
camden-king Jun 5, 2025
ea26eea
update test
camden-king Jun 6, 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: 0 additions & 8 deletions GoogleSignIn/Sources/GIDAuthStateMigration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@ - (void)performDataProtectedMigrationIfNeeded {
if (authSession) {
NSError *err;
[self.keychainStore saveAuthSession:authSession error:&err];
// If we're unable to save to the keychain, return without marking migration performed.
if (err) {
return;
};
[keychainStoreLegacy removeAuthSessionWithError:nil];
}

Expand Down Expand Up @@ -138,10 +134,6 @@ - (void)performGIDMigrationIfNeededWithTokenURL:(NSURL *)tokenURL
if (authSession) {
NSError *err;
[self.keychainStore saveAuthSession:authSession error:&err];
// If we're unable to save to the keychain, return without marking migration performed.
if (err) {
return;
};
}

// Mark the migration check as having been performed.
Expand Down
2 changes: 1 addition & 1 deletion GoogleSignIn/Tests/Unit/GIDAuthStateMigrationTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ - (void)testMigrateIfNeeded_KeychainFailure_DataProtectedMigration {
callbackPath:kCallbackPath
keychainName:kKeychainName
isFreshInstall:NO];
XCTAssertNotNil([_realLegacyGTMKeychainStore retrieveAuthSessionWithError:nil]);
XCTAssertNil([_realLegacyGTMKeychainStore retrieveAuthSessionWithError:nil]);
}

#else
Expand Down