Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove old legacyOauthToken code (from 2016) #1946

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Remove old legacyOauthToken code (from 2016) #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c8ca6
Remove old legacyOauthToken code (from 2016)
amy-at-kickstarter Feb 14, 2024
62ac189
Remove test for legacy OAuth token
amy-at-kickstarter Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 0 additions & 13 deletions Library/AppEnvironment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
}
10 changes: 0 additions & 10 deletions Library/AppEnvironmentTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down