codinux
/
BankingClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unnecessary steps from setPasswords()

This commit is contained in:
dankito 2020-10-16 15:49:24 +02:00
parent 3da594b846
commit 08b7eb28a7
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ui/BankingiOSApp/BankingiOSApp/Security/AuthenticationService.swift
View File

@ -17,6 +17,7 @@ class AuthenticationService {
static private let Key = ">p(Z5&RRA,@_+W0#" // length = 16 // TODO: find a better way to store key
static private let IV = "drowssapdrowssap" // length = 16
private let biometricAuthenticationService = BiometricAuthenticationService()
@ -134,7 +135,7 @@ class AuthenticationService {
if let loginPassword = userLoginPassword {
databasePassword = concatPasswords(loginPassword, databasePassword)
}
return persistence.decryptData(password: map(databasePassword))
}
@ -210,39 +211,24 @@ class AuthenticationService {
@discardableResult
private func setPasswords(_ useBiometricAuthentication: Bool, _ newLoginPassword: String?) -> Bool {
do {
let passwordItem = createDefaultPasswordKeychainItem(useBiometricAuthentication)
let currentPassword = try? passwordItem.readPassword()
try? passwordItem.deleteItem()
var databasePassword = currentPassword ?? ""
if let currentPassword = currentPassword, let encryped = encrypt(currentPassword) {
try passwordItem.savePassword(encryped)
}
else {
if let newDefaultPassword = createNewDefaultPassword(useBiometricAuthentication) {
databasePassword = newDefaultPassword
}
}
if let newLoginPassword = newLoginPassword {
setLoginPassword(newLoginPassword)
databasePassword = concatPasswords(newLoginPassword, databasePassword)
}
return persistence.changePassword(newPassword: map(databasePassword))
} catch {
NSLog("Could not save default password: \(error)")
deleteDefaultPassword(useBiometricAuthentication) // TODO: needed?
var databasePassword = ""
if let newDefaultPassword = createAndSetDefaultPassword(useBiometricAuthentication) {
databasePassword = newDefaultPassword
}
return false
if let newLoginPassword = newLoginPassword {
setLoginPassword(newLoginPassword)
databasePassword = concatPasswords(newLoginPassword, databasePassword)
}
return persistence.changePassword(newPassword: map(databasePassword))
}
@discardableResult
private func createNewDefaultPassword(_ useBiometricAuthentication: Bool) -> String? {
private func createAndSetDefaultPassword(_ useBiometricAuthentication: Bool) -> String? {
do {
let newDefaultPassword = generateRandomPassword(30)