This repository has been archived by the owner on Dec 14, 2021. It is now read-only.
Lockwise keychain launch issues #1192
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ly instead of wiping entire keychain.
jhugman
approved these changes
Feb 10, 2020
| @@ -109,7 +109,7 @@ class BaseDataStore { | |||
| }() | |||
|
|
|||
| internal var loginsKey: String? { | |||
| let key = "sqlcipher.key.logins.db" | |||
| let key = KeychainKey.loginsKey.rawValue | |||
lockbox-ios/Common/AppDelegate.swift
Outdated
| @@ -25,7 +25,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { | |||
| func application(_ application: UIApplication, willFinishLaunchingWithOptions | |||
| launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { | |||
| if isFirstRun { | |||
| KeychainWrapper.wipeKeychain() | |||
| KeychainWrapper.sharedAppContainerKeychain.clearAllValues(for: .account) | |||
There was a problem hiding this comment.
IIUIC, we should be able to clear values for .database here as well.
| @@ -142,7 +142,7 @@ extension AccountStore { | |||
| } | |||
|
|
|||
| private func clear() { | |||
| KeychainWrapper.wipeKeychain() | |||
| keychainWrapper.clearAllValues(for: .account) | |||
There was a problem hiding this comment.
IIUC This is the point which fixes the bug.
lockbox-ios/Common/AppDelegate.swift
Outdated
| @@ -107,7 +107,8 @@ extension AppDelegate { | |||
| } else if previous > current { | |||
| //this would mean a user had an upgraded test version and has now downgraded to a previous version | |||
| //we should wipe keychain data to remove any possible abnormalities | |||
| KeychainWrapper.wipeKeychain() | |||
| KeychainWrapper.sharedAppContainerKeychain.clearAllValues(for: .account) | |||
| KeychainWrapper.sharedAppContainerKeychain.clearAllValues(for: .database) | |||
There was a problem hiding this comment.
In time, will we move back to wipeKeychain()?
There was a problem hiding this comment.
Yes. I like being explicit about the values for now, but I think in the future we could do this.
kaylagalway
changed the title
Agreed - I will add a |
…wise/lockwise-ios into lockwise-launch-issues-1190
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1190
To test: