Conversation
GIDGoogleUser tokens
w-goog
marked this pull request as ready for review
September 24, 2026 00:48
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a data race on
GIDGoogleUsertokens. This addresses a number of potential issues. (Yes, I used Markdown to write this, an LLM didn't write it :P)What changed
@synchronized(self))What could have gone wrong
Previously, accessing these properties on different threads could have resulted in a crash. AppAuth & GSI mostly deliver everything on the main queue, but it seems likely that
user.accessToken.tokenStringwould be read by networking code on the background queue. A refresh on the main queue at the same time could result inEXC_BAD_ACCESS. When you multiply that (small) likelihood by the number of times this code runs...it's probably happening.Additionally:
updateTokensWithAuthStatewas updating each token individually, and the synchronized self only applied inupdateWithTokenResponse; calls to the token update from elsewhere had no lock.synchronized(googleUser)would share the library's lock, potentially leading to deadlocks.What might still go wrong
authStatecan still be read directly, byGIDSignInand others viafetcherAuthorizer. There's a TODO on the property, but the fix would be a public API change.performActionWithFreshTokensin AppAuth still readsOIDAuthStatewithout a lock if GTMAppAuth allows that off of the main thread. This is existing behaviour, and would require a fix in AppAuth.