Remove unification of requested and granted scopes in add scopes flow. (#478)

Author: brnnmrls

GoogleSignIn/Sources/GIDSignIn.m

@@ -283,11 +283,10 @@ - (void)addScopes:(NSArray<NSString *> *)scopes
     }
     return;
   }
-
-  // Use the union of granted and requested scopes.
-  [grantedScopes unionSet:requestedScopes];
-  options.scopes = [grantedScopes allObjects];
-
+  
+  // Previously granted scopes will still be included since we pass `include_granted_scopes=true`.
+  options.scopes = [requestedScopes allObjects];
+  
   [self signInWithOptions:options];
 }
 

GoogleSignIn/Tests/Unit/GIDSignInTest.m

@@ -764,8 +764,13 @@ - (void)testAddScopes {
     [parsedScopes removeObject:@""];
     grantedScopes = [parsedScopes copy];
   }
-  
+
+#if TARGET_OS_IOS || TARGET_OS_MACCATALYST
+  NSArray<NSString *> *expectedScopes = @[kNewScope];
+#elif TARGET_OS_OSX
   NSArray<NSString *> *expectedScopes = @[kNewScope, kGrantedScope];
+#endif // TARGET_OS_OSX
+
   XCTAssertEqualObjects(grantedScopes, expectedScopes);
 
   [_user verify];