Skip to content

Rename isAnyKey to doesAnyKeyExist #367

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

Merged
tomholub merged 1 commit into from
Jun 22, 2021
Merged

Rename isAnyKey to doesAnyKeyExist #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions FlowCrypt/Functionality/DataManager/DataService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ extension DataService: DataServiceType {
}

var isSetupFinished: Bool {
isLoggedIn && isAnyKeysForCurrentUser
isLoggedIn && doesAnyKeyExistForCurrentUser
}

private var isAnyKeysForCurrentUser: Bool {
private var doesAnyKeyExistForCurrentUser: Bool {
guard let currentUser = currentUser else {
return false
}
return encryptedStorage.isAnyKey(for: currentUser.email)
return encryptedStorage.doesAnyKeyExist(for: currentUser.email)
}

var isLoggedIn: Bool {
Expand Down Expand Up @@ -115,7 +115,7 @@ extension DataService: DataServiceType {

func validAccounts() -> [User] {
encryptedStorage.getAllUsers()
.filter { encryptedStorage.isAnyKey(for: $0.email) }
.filter { encryptedStorage.doesAnyKeyExist(for: $0.email) }
.filter { $0.email != currentUser?.email }
.map(User.init)
}
Expand Down
4 changes: 2 additions & 2 deletions FlowCrypt/Functionality/DataManager/Encrypted Storage/EncryptedStorage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protocol EncryptedStorageType: KeyStorageType {
func getAllUsers() -> [UserObject]
func saveActiveUser(with user: UserObject)
var activeUser: UserObject? { get }
func isAnyKey(for email: String) -> Bool
func doesAnyKeyExist(for email: String) -> Bool

func cleanup()
}
Expand Down Expand Up @@ -181,7 +181,7 @@ extension EncryptedStorage {
.first
}

func isAnyKey(for email: String) -> Bool {
func doesAnyKeyExist(for email: String) -> Bool {
keysInfo()
.map(\.account)
.map { $0.contains(email) }
Expand Down
4 changes: 2 additions & 2 deletions FlowCrypt/Functionality/DataManager/UserAccountService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ extension UserAccountService: UserAccountServiceType {

func cleanupSessions() {
encryptedStorage.getAllUsers()
.filter { !encryptedStorage.isAnyKey(for: $0.email) }
.filter { !encryptedStorage.doesAnyKeyExist(for: $0.email) }
.map(\.email)
.forEach(logOut)

let users = encryptedStorage.getAllUsers()

if !users.contains(where: { $0.isActive }), let user = users.first(where: { encryptedStorage.isAnyKey(for: $0.email ) }) {
if !users.contains(where: { $0.isActive }), let user = users.first(where: { encryptedStorage.doesAnyKeyExist(for: $0.email ) }) {
switchActiveSession(for: user)
}
}
Expand Down