Use GTMAppAuth's new delegate protocol by mdmathias · Pull Request #299 · google/GoogleSignIn-iOS

mdmathias · 2023-03-27T22:10:16Z

GTMAppAuth added a new protocol to provide an interface for dependencies to both add additional token refresh parameters and update errors issued by GTMAppAuth. The latter is especially for the case of EMM error handling.

Fixes#304

paulb777

CocoaPods and SPM config changes LGTM.

Stub GTMKeychainStore saveAuthSession method to sometimes succeed and sometimes fill in an error.

Also add an empty Swift file for CocoaPods in SignInSample

Xcode was warning that GIDAuthStateMigration did not override the designated initializer of the superclass.

… test case category

This updated name makes it more explicit that we expect the fetch to fail and that we want to inspect the error in the completion handler.

This change supports CocoaPods using a host application for running tests.

Also use ivar in GIDGoogleUser init instead of accessing via self.

mdmathias requested review from XiangtianDai and ch40w31 April 12, 2023 20:53

ch40w31 requested changes Apr 12, 2023
View reviewed changes

ch40w31 requested changes Apr 13, 2023
View reviewed changes

paulb777 reviewed Apr 13, 2023
View reviewed changes

Comment thread.github/workflows/unit_tests.yml
Comment threadGoogleSignIn.podspec Outdated
Comment threadPackage.swift Outdated

paulb777 reviewed Apr 14, 2023
View reviewed changes

XiangtianDai reviewed Apr 21, 2023
View reviewed changes

Comment threadGoogleSignIn/Sources/GIDEMMSupport.m Outdated
Comment threadGoogleSignIn/Sources/GIDEMMSupport.m Outdated
Comment threadGoogleSignIn/Tests/Unit/GIDAuthStateMigrationTest.m

mdmathias mentioned this pull request Apr 22, 2023
Add a method taking a completion argument for asynchronous error updates google/GTMAppAuth#229
Merged

mdmathias force-pushed the mdmathias/gtmaa-error-handling branch from 0764b95 to bb10b39Compare April 28, 2023 23:16

XiangtianDai approved these changes May 9, 2023
View reviewed changes

mdmathias added 20 commits May 15, 2023 18:00

Initial setup for GTMAA error handling
528e534

Set the authorizer on the fetcher
0600090

Add the error handling delegate on the authorization
e25d044

Add some support for testing emm support
aea7ec0

Do not expose method creating fetcher with an error as unneeded
99b73d2

Add test for testing EMM error handling flow with GTMAppAuth
193ea42

Add doc comments to GIDEMMSupport
0eb2f1f

Fix GIDAuthStateMigrationTest
bd8325e

Fix most of GIDSignInTests
4e2ee95

Fix GIDSignInTest
b9d9b8f
Stub GTMKeychainStore saveAuthSession method to sometimes succeed and sometimes fill in an error.

Some cocoapods import fixes
96c8c3b

Do not forward declare protocol conformance
55aeb46

Bump dependencies for AppAuth-iOS and GTMAppAuth
614111f

Update sample apps
c024c52

Use frameworks with static linkage in Swift sample
4febcdb

Remove use_libraries and use_static_frameworks flags from pod lib lint
52cef30

Add swift version
e113cdb

Clean up imports
a8aa402
Also add an empty Swift file for CocoaPods in SignInSample

Fix typos and alignment issues from PR feedback
d4df1fc

Set require app host to true in GoogleSignInSwiftSupport podspec
c04dc0c

mdmathias added 17 commits May 15, 2023 18:00

Update EMM support test to be more clear
434ec5a

Remove unused init override in GIDAuthStateMigration
61daac5

Add back init in GIDAuthStateMigration.m to remove warning
23bbea2
Xcode was warning that GIDAuthStateMigration did not override the designated initializer of the superclass.

Move extractAuthorizationWithTokenURL from GIDAuthStateMigration.h to…
10677ae
… test case category

Add typedef to NS_ENUM
74f01ee

Fix version numbers for deps in podspec and package
bbe1557

Remove reference to fake fetcher error property
26d8f57

Remove GIDTestWorker
61a08bd

Rename authState to failingAuthState in EMM error handling test
a87b934
This updated name makes it more explicit that we expect the fetch to fail and that we want to inspect the error in the completion handler.

Update GIDEMMSupport to more clearly handle the updated error
38641b7

Update GIDEMMSupport to use new update error delegate method
1a1041d

Remove duplicated constants
b16fbb8

Use new EMM error handling delegate method name
cce884e

Depend upon main GTMAppAuth branch
ca7f78f

Update GIDEMMSupportTest to swizzle a key window and alert controller
10b6b60
This change supports CocoaPods using a host application for running tests.

Depend upon GTMAppAuth 4.0.0
b940af4

Stub expected method on keychainStore in GIDSignInTest
2dab4df

mdmathias force-pushed the mdmathias/gtmaa-error-handling branch from 0015161 to 2dab4dfCompare May 16, 2023 01:10

ch40w31 requested changes May 16, 2023
View reviewed changes

Rename authorization -> authSession
e862376
Also use ivar in GIDGoogleUser init instead of accessing via self.

ch40w31 approved these changes May 16, 2023
View reviewed changes

mdmathias merged commit 55bf5d0 into mainMay 16, 2023

mdmathias deleted the mdmathias/gtmaa-error-handling branch May 16, 2023 20:01

Uh oh!

Conversation

mdmathias commented Mar 27, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

paulb777 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mdmathias commented Mar 27, 2023•
edited
Loading