Refactor key store #68
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
… and keyStore Add init(with verification) and remove verify and login functions - should be done when creating AccountManager
…eated after app launch and from the LoginVC and LandingVC
Consolidate init functions into two - one that handles the init from appLaunch with the stored credentials and the other that handles the init from the verify call
Remove shared instance Remove login call - move to be called directly on GuardianAPI from ViewController
…ased on what properties are nil
Add file for new Account class Move the following functionality from AccountManager to Account: -addCurrentDevice -setUser -removeDevice -storing of credentials, token, currentDevice and user
…Account Update DependencyProviding AccountManaging with these changes
Update everywhere in the app to refer to accountManager.account for the refactored properties and functions Change user to have only one boolean to indicate if user hasReachedMaxDevices
Remove function that loops through countries to match the city to determine country code
# Conflicts: # FirefoxPrivateNetworkVPN.xcodeproj/project.pbxproj
| @@ -13,7 +13,7 @@ import Foundation | |||
|
|
|||
| struct Device: Codable, UserDefaulting { | |||
|
|
|||
| static let userDefaultsKey = "currentDevice" | |||
| static let userDefaultsKey = "device" | |||
There was a problem hiding this comment.
We'll have to let people know that they'll need to log in again if we change this.
| @@ -32,7 +32,8 @@ struct VPNCountry: Codable { | |||
| code: originalCity.code, | |||
| latitude: originalCity.latitude, | |||
| longitude: originalCity.longitude, | |||
| servers: [server] | |||
| servers: [server], | |||
| flagCode: self.code | |||
There was a problem hiding this comment.
Resolved: 9bce0f6
| @@ -55,6 +56,7 @@ struct VPNCity: UserDefaulting { | |||
| let latitude: Float | |||
| let longitude: Float | |||
| let servers: [VPNServer] | |||
| let flagCode: String | |||
There was a problem hiding this comment.
I wonder if this needs to be optional, since we won't have a flagCode value in the VPNCity JSON and it only gets set via VPNCountry
There was a problem hiding this comment.
Resolved: 9bce0f6
| var user: User? { get } | ||
| var token: String? { get } | ||
| var currentDevice: Device? { get } | ||
| var account: Account? { get} |
There was a problem hiding this comment.
Resolved: 9bce0f6
| var accountManager: AccountManaging { | ||
| return AccountManager.sharedManager | ||
| } | ||
|
|
There was a problem hiding this comment.
Probably can discard this file's changes.
| @@ -39,14 +40,14 @@ class DeviceManagementDataSource: NSObject, UITableViewDataSource { | |||
| .subscribe { [weak tableView] event in | |||
| guard let deviceKey = event.element else { return } | |||
|
|
|||
| let accountManager = DependencyFactory.sharedFactory.accountManager | |||
| accountManager.removeDevice(with: deviceKey) { result in | |||
| guard let account = DependencyFactory.sharedFactory.accountManager.account else { return } | |||
There was a problem hiding this comment.
This feels weird since we have "private let account = DependencyFactory.sharedFactory.accountManager.account" on the class right above.
There was a problem hiding this comment.
Resolved: 9bce0f6
| F4E8FA602374E00700D840D8 /* HyperlinkItem.swift */, | ||
| F4E8B2342368C39C001CEC8A /* TunnelAction.swift */, | ||
| F4B21E422366514700136316 /* VPNState.swift */, | ||
| F49090BD2379D43200C8430A /* SettingsItem.swift */, | ||
| F4A7FA23237C5C960034AF6C /* Account.swift */, | ||
| F4A7FA25237C5CE00034AF6C /* Credentials.swift */, |
There was a problem hiding this comment.
Resolved: 9bce0f6
… it from DependencyFactory again in removeDeviceEvent Sort files alphabetically (for Corby) Make flagCode on VPNCity optional since it doesn't come from JSON Fix spacing
… user defaults when current device is removed
…ms to String and instead has a description var
Merged
-Fixed conflicts in pbcproj file
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.