Skip to content

Ensure additionalTokenRefreshParametersForAuthSession returns a string dictionary #559

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

Closed
brnnmrls wants to merge 2 commits into from
Closed

Ensure additionalTokenRefreshParametersForAuthSession returns a string dictionary #559

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8864072
Ensure additionalTokenRefreshParametersForAuthSession returns a dicti…
brnnmrls Oct 1, 2025
fd72fb7
Update conversion logic to consider other types.
brnnmrls Oct 3, 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
17 changes: 15 additions & 2 deletions GoogleSignIn/Sources/GIDEMMSupport.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,21 @@ + (NSDictionary *)parametersWithParameters:(NSDictionary *)parameters

- (nullable NSDictionary<NSString *,NSString *> *)
additionalTokenRefreshParametersForAuthSession:(GTMAuthSession *)authSession {
return [GIDEMMSupport updatedEMMParametersWithParameters:
authSession.authState.lastTokenResponse.additionalParameters];
NSDictionary *originalParameters =
[GIDEMMSupport updatedEMMParametersWithParameters:authSession.authState.lastTokenResponse
.additionalParameters];

// Ensure returned dictionary has values of only type String.
NSMutableDictionary<NSString *, NSString *> *convertedParameters =
[NSMutableDictionary dictionary];
[originalParameters enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
if ([value isKindOfClass:[NSNumber class]]) {
Copy link
Collaborator

@mdmathias mdmathias Oct 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want to be a bit more complete than checking for an NSNumber. We can leverage NSJSONSerialization to help us out.

  1. Turn the originalParameters dictionary into data via +[NSJSONSerialization dataWithJSONObject:options:error:]
  2. Take that NSData and make an NSString from it: -[NSString initWithData:encoding:]
  3. Now that you have a string dictionary, make that NSData via [-[NSString dataUsingEncoding:]
  4. Pass that NSData to +[NSJSONSerialization JSONObjectWithData:options:error:]

The resulting JSON object should be a NSDictionary<NSString *, NSString *> *. The idea behind step 2 is that it should make everything in the NSData an NSString.

I recommend writing some unit tests with various flavors of types in the values of originalParameters.

convertedParameters[key] = [value stringValue];
} else if ([value isKindOfClass:[NSString class]]) {
convertedParameters[key] = value;
}
}];
return convertedParameters;
}

- (void)updateErrorForAuthSession:(GTMAuthSession *)authSession
Expand Down