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

Author: AkshatG6

GoogleSignIn/Sources/GIDSignIn.m

@@ -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];
@@ -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];
@@ -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];
   }