Merge branch 'camden-king/create-GIDAuthStateMigrationFake' into camden-king/remove-keychain-name-param

Author: camden-king

GoogleSignIn/Sources/GIDAuthStateMigration/Fake/GIDFakeAuthStateMigration.m

@@ -27,10 +27,6 @@ - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore {
   return self;
 }
 
-- (instancetype)init {
-  return self;
-}
-
 - (void)migrateIfNeededWithTokenURL:(NSURL *)tokenURL
                        callbackPath:(NSString *)callbackPath
                      isFreshInstall:(BOOL)isFreshInstall {

GoogleSignIn/Sources/GIDAuthStateMigration/Implementation/GIDAuthStateMigration.m

@@ -105,10 +105,6 @@ - (void)performDataProtectedMigrationIfNeeded {
   if (authSession) {
     NSError *err;
     [self.keychainStore saveAuthSession:authSession error:&err];
-    // If we're unable to save to the keychain, return without marking migration performed.
-    if (err) {
-      return;
-    };
     [keychainStoreLegacy removeAuthSessionWithError:nil];
   }
 
@@ -135,10 +131,6 @@ - (void)performGIDMigrationIfNeededWithTokenURL:(NSURL *)tokenURL
   if (authSession) {
     NSError *err;
     [self.keychainStore saveAuthSession:authSession error:&err];
-    // If we're unable to save to the keychain, return without marking migration performed.
-    if (err) {
-      return;
-    };
   }
 
   // Mark the migration check as having been performed.

GoogleSignIn/Sources/GIDSignIn.m

@@ -491,7 +491,7 @@ + (GIDSignIn *)sharedInstance {
     GTMKeychainStore *keychainStore =
         [[GTMKeychainStore alloc] initWithItemName:kGTMAppAuthKeychainName];
     GIDAuthStateMigration *authStateMigrationService =
-          [[GIDAuthStateMigration alloc] initWithKeychainStore:keychainStore];
+        [[GIDAuthStateMigration alloc] initWithKeychainStore:keychainStore];
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
     if (@available(iOS 14.0, *)) {
       GIDAppCheck *appCheck = [GIDAppCheck appCheckUsingAppAttestProvider];
@@ -501,7 +501,8 @@ + (GIDSignIn *)sharedInstance {
     }
 #endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
     if (!sharedInstance) {
-      sharedInstance = [[self alloc] initWithKeychainStore:keychainStore                                        authStateMigrationService:authStateMigrationService];
+      sharedInstance = [[self alloc] initWithKeychainStore:keychainStore
+                                 authStateMigrationService:authStateMigrationService];
     }
   });
   return sharedInstance;
@@ -566,8 +567,8 @@ - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore
     _keychainStore = keychainStore;
     // Perform migration of auth state from old versions of the SDK if needed.
     [authStateMigrationService migrateIfNeededWithTokenURL:_appAuthConfiguration.tokenEndpoint
-                              callbackPath:kBrowserCallbackPath
-                            isFreshInstall:isFreshInstall];
+                                              callbackPath:kBrowserCallbackPath
+                                            isFreshInstall:isFreshInstall];
   }
   return self;
 }
@@ -576,7 +577,8 @@ - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore
 - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore
             authStateMigrationService:(GIDAuthStateMigration *) authStateMigrationService
                              appCheck:(GIDAppCheck *)appCheck {
-  self = [self initWithKeychainStore:keychainStore authStateMigrationService:authStateMigrationService];
+  self = [self initWithKeychainStore:keychainStore
+           authStateMigrationService:authStateMigrationService];
   if (self) {
     _appCheck = appCheck;
     _configureAppCheckCalled = NO;

GoogleSignIn/Tests/Unit/GIDAuthStateMigrationTest.m

@@ -179,7 +179,7 @@ - (void)testMigrateIfNeeded_KeychainFailure_DataProtectedMigration {
   [migration migrateIfNeededWithTokenURL:[NSURL URLWithString:kTokenURL]
                             callbackPath:kCallbackPath
                           isFreshInstall:NO];
-  XCTAssertNotNil([_realLegacyGTMKeychainStore retrieveAuthSessionWithError:nil]);
+  XCTAssertNil([_realLegacyGTMKeychainStore retrieveAuthSessionWithError:nil]);
 }
 
 #else

GoogleSignIn/Tests/Unit/GIDSignInTest.m

@@ -222,7 +222,7 @@ @interface GIDSignInTest : XCTestCase {
   // Whether callback block has been called.
   BOOL _completionCalled;
 
-  // Fake for GIDAuthStateMigration
+  // Fake for |GIDAuthStateMigration|.
   GIDFakeAuthStateMigration *_authStateMigrationService;
 
   // Fake fetcher service to emulate network requests.
@@ -500,16 +500,14 @@ - (void)testInitWithKeychainStore_invalidConfig {
 - (void)testInitWithKeychainStore_attemptsMigration {
   XCTestExpectation *expectation = [self expectationWithDescription:@"Callback should be called."];
   _authStateMigrationService.migrationInvokedCallback =
-  ^(NSURL *tokenURL, NSString *callbackPath, BOOL isFreshInstall) {
-    XCTAssertFalse(isFreshInstall);
-    [expectation fulfill];
-  };
+    ^(NSURL *tokenURL, NSString *callbackPath, BOOL isFreshInstall) {
+      XCTAssertFalse(isFreshInstall);
+      [expectation fulfill];
+    };
 
   GTMKeychainStore *store = [[GTMKeychainStore alloc] initWithItemName:kKeychainName];
-  GIDSignIn *signIn;
-  signIn = [[GIDSignIn alloc] initWithKeychainStore:store
-                          authStateMigrationService:_authStateMigrationService];
-
+  GIDSignIn *signIn = [[GIDSignIn alloc] initWithKeychainStore:store
+                                     authStateMigrationService:_authStateMigrationService];
   [self waitForExpectationsWithTimeout:1 handler:nil];
 }