Repository navigation
Replace the NSBundle swizzle with an injected GIDBundle seam - #658
Merged
Merged
Conversation
…thStateMigration and GIDSignInCallbackSchemes
…h a GIDFakeBundle subclass
…r defaults in GIDSignInTest
ch40w31
approved these changes
Oct 21, 2026
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.
It's happening!!!!!!!! First of a stack of ~9 PRs removing OCMock & GULSwizzler from the unit tests. This one takes out the
NSBundleswizzle inGIDFakeMainBundleand the mockedNSBundle/NSUserDefaultsin the migration test.GIDBundleprotocol covering the two things the SDK reads from a bundle (bundleIdentifierandobjectForInfoDictionaryKey:), withNSBundleconforming and aGIDFakeBundlefor tests.GIDSignIn,GIDAuthStateMigration, andGIDSignInCallbackSchemestake the bundle (and the first two, user defaults) through new private designated initializers. The existing initializers passmainBundle/standardUserDefaults.GIDFakeMainBundleis now aGIDFakeBundlesubclass with the same helpers - no more swizzling!!! :DNote for reviewers: the OS routes callbacks by the main bundle regardless of what's injected, and the URL scheme check + legacy keychain fingerprint both read the injected one - so, the bundle has to be the running app's. I documented that on the initializers (rather than enforcing it), as they're private.
Known follow-up:
GIDAppCheckstill readsGIDClientIDfrom the main bundle on its own...on my TODO list as future work.