Remove old legacyOauthToken code (from 2016) (#1946)

* Remove old legacyOauthToken code (from 2016) * Remove test for legacy OAuth token
kickstarter · Feb 21, 2024 · 2b36c16 · 2b36c16
1 parent 22727b1
commit 2b36c16
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/Library/AppEnvironment.swift b/Library/AppEnvironment.swift
@@ -298,11 +298,6 @@ public struct AppEnvironment: AppEnvironmentType {
     if let oauthToken = data["apiService.oauthToken.token"] as? String {
       // If there is an oauth token stored in the defaults, then we can authenticate our api service
       service = service.login(OauthToken(token: oauthToken))
-      removeLegacyOauthToken(fromUserDefaults: userDefaults)
-    } else if let oauthToken = legacyOauthToken(forUserDefaults: userDefaults) {
-      // Otherwise if there is a token in the legacy user defaults entry we can use that
-      service = service.login(OauthToken(token: oauthToken))
-      removeLegacyOauthToken(fromUserDefaults: userDefaults)
     }
 
     // Try restoring the client id for the api service
@@ -413,11 +408,3 @@ public struct AppEnvironment: AppEnvironmentType {
     userDefaults.set(data, forKey: self.environmentStorageKey)
   }
 }
-
-private func legacyOauthToken(forUserDefaults userDefaults: KeyValueStoreType) -> String? {
-  return userDefaults.object(forKey: "com.kickstarter.access_token") as? String
-}
-
-private func removeLegacyOauthToken(fromUserDefaults userDefaults: KeyValueStoreType) {
-  userDefaults.removeObject(forKey: "com.kickstarter.access_token")
-}
diff --git a/Library/AppEnvironmentTests.swift b/Library/AppEnvironmentTests.swift
@@ -126,16 +126,6 @@ final class AppEnvironmentTests: XCTestCase {
     XCTAssertNotNil(env.appTrackingTransparency)
   }
 
-  func testFromStorage_LegacyUserDefaults() {
-    let userDefaults = MockKeyValueStore()
-    userDefaults.set("deadbeef", forKey: "com.kickstarter.access_token")
-    let env = AppEnvironment.fromStorage(ubiquitousStore: MockKeyValueStore(), userDefaults: userDefaults)
-
-    XCTAssertEqual("deadbeef", env.apiService.oauthToken?.token)
-    XCTAssertTrue(env.apiService.isAuthenticated)
-    XCTAssertNil(userDefaults.object(forKey: "com.kickstarter.access_token"))
-  }
-
   func testSaveEnvironment() {
     let apiService = MockService(
       serverConfig: ServerConfig(