Updated SignInFlow with improved tokenClaims processing

Author: AkshatG6

GoogleSignIn/Sources/GIDSignIn.m

@@ -742,7 +742,10 @@ - (void)signInWithOptions:(GIDSignInInternalOptions *)options {
     NSError *claimsError;
 
     // If tokenClaims are invalid or JSON serialization fails, return with an error.
-    if (![self processTokenClaimsForOptions:options error:&claimsError]) {
+    options.tokenClaimsAsJSON = [_tokenClaimsInternalOptions
+                                    validatedJSONStringForClaims:options.tokenClaims
+                                                           error:&claimsError];
+    if (claimsError) {
       if (options.completion) {
         self->_currentOptions = nil;
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -1267,24 +1270,6 @@ - (void)assertValidPresentingViewController {
   }
 }
 
-- (BOOL)processTokenClaimsForOptions:(GIDSignInInternalOptions *)options
-                               error:(NSError **)error {
-  if (!options.tokenClaims) {
-    return YES; // Success
-  }
-
-  NSString *tokenClaimsAsJSON =
-      [_tokenClaimsInternalOptions validatedJSONStringForClaims:options.tokenClaims
-                                                          error:error];
-
-  if (!tokenClaimsAsJSON) {
-    return NO; // Failure
-  }
-
-  options.tokenClaimsAsJSON = tokenClaimsAsJSON;
-  return YES; // Success
-}
-
 // Checks whether or not this is the first time the app runs.
 - (BOOL)isFreshInstall {
   NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];

GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h

@@ -233,8 +233,7 @@ NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions.")
 /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the
 /// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in.
 ///
-/// @param presentingViewController The view controller used to present `SFSafariViewController` on
-///     iOS 9 and 10.
+/// @param presentingViewController The view controller used to present the authorization flow.
 /// @param tokenClaims An optional `NSSet` of tokenClaims to request.
 /// @param completion The optional block that is called on completion.  This block will
 ///     be called asynchronously on the main queue.
@@ -245,15 +244,14 @@ NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions.")
                        NSError *_Nullable error))completion
     NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions.");
 
-/// Starts an interactive sign-in flow on iOS using the provided hint, and tokenClaims.
+/// Starts an interactive sign-in flow on iOS using the provided hint and tokenClaims.
 ///
 /// The completion will be called at the end of this process.  Any saved sign-in state will be
 /// replaced by the result of this flow.  Note that this method should not be called when the app is
 /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the
 /// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in.
 ///
-/// @param presentingViewController The view controller used to present `SFSafariViewController` on
-///     iOS 9 and 10.
+/// @param presentingViewController The view controller used to present the authorization flow.
 /// @param hint An optional hint for the authorization server, for example the user's ID or email
 ///     address, to be prefilled if possible.
 /// @param tokenClaims An optional `NSSet` of tokenClaims to request.
@@ -275,8 +273,7 @@ NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions.")
 /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the
 /// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in.
 ///
-/// @param presentingViewController The view controller used to present `SFSafariViewController` on
-///     iOS 9 and 10.
+/// @param presentingViewController The view controller used to present the authorization flow.
 /// @param hint An optional hint for the authorization server, for example the user's ID or email
 ///     address, to be prefilled if possible.
 /// @param additionalScopes An optional array of scopes to request in addition to the basic profile scopes.
@@ -292,16 +289,15 @@ NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions.")
                        NSError *_Nullable error))completion
     NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions.");
 
-/// Starts an interactive sign-in flow on iOS using the provided hint, additional scopes, nonce
+/// Starts an interactive sign-in flow on iOS using the provided hint, additional scopes, nonce,
 /// and tokenClaims.
 ///
 /// The completion will be called at the end of this process.  Any saved sign-in state will be
 /// replaced by the result of this flow.  Note that this method should not be called when the app is
 /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the
 /// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in.
 ///
-/// @param presentingViewController The view controller used to present `SFSafariViewController` on
-///     iOS 9 and 10.
+/// @param presentingViewController The view controller used to present the authorization flow.
 /// @param hint An optional hint for the authorization server, for example the user's ID or email
 ///     address, to be prefilled if possible.
 /// @param additionalScopes An optional array of scopes to request in addition to the basic profile scopes.

GoogleSignIn/Tests/Unit/GIDSignInInternalOptionsTest.m

@@ -75,8 +75,6 @@ - (void)testDefaultOptions_withAllParameters_initializesPropertiesCorrectly {
   NSArray<NSString *> *scopes = @[@"scope1", @"scope2"];
   NSString *nonce = @"test_nonce";
   NSSet<GIDTokenClaim *> *tokenClaims = [NSSet setWithObject:[GIDTokenClaim authTimeClaim]];
-
-  // The expected scopes array will contain the provided scopes plus the default profile scopes.
   NSArray<NSString *> *expectedScopes = @[@"scope1", @"scope2", @"email", @"profile"];
 
   GIDSignInCompletion completion = ^(GIDSignInResult *_Nullable signInResult,

GoogleSignIn/Tests/Unit/GIDSignInTest.m

@@ -8,7 +8,6 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR COhttp://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -1638,9 +1637,6 @@ - (void)OAuthLoginWithAddScopesFlow:(BOOL)addScopesFlow
     }
 
     if (tokenClaimsError) {
-      XCTestExpectation *tokenClaimsErrorExpectation =
-          [self expectationWithDescription:@"Callback called"];
-      [tokenClaimsErrorExpectation fulfill];
       return;
     }