Skip to content

Update AddScopes to include previously requested tokenClaims in the… #557

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
AkshatG6 merged 6 commits into from
Sep 23, 2025
Merged

Update AddScopes to include previously requested tokenClaims in the… #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56c1a1a
Updated Add Scopes to include previously requested tokenClaims in the…
AkshatG6 Sep 19, 2025
0dbcb2d
Added unit test to test the updated implementation of AddScopes.
AkshatG6 Sep 22, 2025
fcd1a65
Updated method name from getAdditionalParametersWith... to additional…
AkshatG6 Sep 22, 2025
438aa69
Updated method name from getAdditionalParametersWith... to additional…
AkshatG6 Sep 22, 2025
8753da6
Fixed styling in GIDSignIn.m and GIDSignInTest.m
AkshatG6 Sep 22, 2025
cd754d6
Updated comments in GIDSignInTest.m
AkshatG6 Sep 23, 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
45 changes: 32 additions & 13 deletions GoogleSignIn/Sources/GIDSignIn.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,14 @@ - (void)addScopes:(NSArray<NSString *> *)scopes
addScopesFlow:YES
completion:completion];

OIDAuthorizationRequest *lastAuthorizationRequest =
self.currentUser.authState.lastAuthorizationResponse.request;
NSString *lastTokenClaimsAsJSON =
lastAuthorizationRequest.additionalParameters[kTokenClaimsParameter];
if (lastTokenClaimsAsJSON) {
options.tokenClaimsAsJSON = lastTokenClaimsAsJSON;
}

NSSet<NSString *> *requestedScopes = [NSSet setWithArray:scopes];
NSMutableSet<NSString *> *grantedScopes =
[NSMutableSet setWithArray:self.currentUser.grantedScopes];
Expand Down Expand Up @@ -499,6 +507,14 @@ - (void)addScopes:(NSArray<NSString *> *)scopes
addScopesFlow:YES
completion:completion];

OIDAuthorizationRequest *lastAuthorizationRequest =
self.currentUser.authState.lastAuthorizationResponse.request;
NSString *lastTokenClaimsAsJSON =
lastAuthorizationRequest.additionalParameters[kTokenClaimsParameter];
if (lastTokenClaimsAsJSON) {
options.tokenClaimsAsJSON = lastTokenClaimsAsJSON;
}

NSSet<NSString *> *requestedScopes = [NSSet setWithArray:scopes];
NSMutableSet<NSString *> *grantedScopes =
[NSMutableSet setWithArray:self.currentUser.grantedScopes];
Expand Down Expand Up @@ -739,20 +755,23 @@ - (void)signInWithOptions:(GIDSignInInternalOptions *)options {
}
}];
} else {
NSError *claimsError;

// If tokenClaims are invalid or JSON serialization fails, return with an error.
options.tokenClaimsAsJSON = [_tokenClaimsInternalOptions
validatedJSONStringForClaims:options.tokenClaims
error:&claimsError];
if (claimsError) {
if (options.completion) {
self->_currentOptions = nil;
dispatch_async(dispatch_get_main_queue(), ^{
options.completion(nil, claimsError);
});
// Only serialize tokenClaims if options.tokenClaimsAsJSON isn't already set.
if (!options.tokenClaimsAsJSON) {
NSError *claimsError;

// If tokenClaims are invalid or JSON serialization fails, return with an error.
options.tokenClaimsAsJSON = [_tokenClaimsInternalOptions
validatedJSONStringForClaims:options.tokenClaims
error:&claimsError];
if (claimsError) {
if (options.completion) {
_currentOptions = nil;
dispatch_async(dispatch_get_main_queue(), ^{
options.completion(nil, claimsError);
});
}
return;
}
return;
}
[self authenticateWithOptions:options];
}
Expand Down
Loading