From 031363f81d9ad7b85022d160903f0c1e4eb01674 Mon Sep 17 00:00:00 2001 From: hugo Date: Tue, 16 Aug 2022 00:21:10 +0800 Subject: [PATCH] fix: validate password only when password is not empty --- .../ChangeBackupPasswordStep2ViewModel.swift | 6 ++++-- .../Setting/ChangePassword/ChangePasswordViewModel.swift | 6 ++++-- .../SetBackupPassword/SetBackupPasswordViewModel.swift | 6 ++++-- .../Scene/Setting/SetPassword/SetPasswordViewModel.swift | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Maskbook/Scene/Setting/ChangeBackupPassword/ChangeBackupPasswordStep2ViewModel.swift b/Maskbook/Scene/Setting/ChangeBackupPassword/ChangeBackupPasswordStep2ViewModel.swift index b01d68d4..246f016c 100644 --- a/Maskbook/Scene/Setting/ChangeBackupPassword/ChangeBackupPasswordStep2ViewModel.swift +++ b/Maskbook/Scene/Setting/ChangeBackupPassword/ChangeBackupPasswordStep2ViewModel.swift @@ -39,10 +39,12 @@ class ChangeBackupPasswordStep2ViewModel { let valid = password.isValidBackupPasswordFormat - if !valid { + if password.isNotEmpty, !valid { changePasswordError.value = L10n.Scene.SetBackupPassword.tips return false - } else if !isConfirmPasswordsinConsistent() { + } else if newPassword.value?.isNotEmpty == true, + confirmPassword.value?.isNotEmpty == true, + !isConfirmPasswordsinConsistent() { changePasswordError.value = L10n.Scene.SetBackupPassword.errorInconsistentPassword } else { changePasswordError.value = nil diff --git a/Maskbook/Scene/Setting/ChangePassword/ChangePasswordViewModel.swift b/Maskbook/Scene/Setting/ChangePassword/ChangePasswordViewModel.swift index cfb132d9..ad34ec6c 100644 --- a/Maskbook/Scene/Setting/ChangePassword/ChangePasswordViewModel.swift +++ b/Maskbook/Scene/Setting/ChangePassword/ChangePasswordViewModel.swift @@ -36,9 +36,11 @@ class ChangePasswordViewModel { } let valid = password.isValidPasswordFormat - if !valid { + if password.isNotEmpty, !valid { changePasswordError.value = L10n.Scene.ChangePassword.passwordDemand - } else if !isConfirmPasswordCorrect() { + } else if newPassword.value?.isNotEmpty == true, + confirmPassword.value?.isNotEmpty == true, + !isConfirmPasswordCorrect() { changePasswordError.value = L10n.Scene.ChangePassword.passwordNotMatch return false } else { diff --git a/Maskbook/Scene/Setting/SetBackupPassword/SetBackupPasswordViewModel.swift b/Maskbook/Scene/Setting/SetBackupPassword/SetBackupPasswordViewModel.swift index fd09a28f..ac5ee0d9 100644 --- a/Maskbook/Scene/Setting/SetBackupPassword/SetBackupPasswordViewModel.swift +++ b/Maskbook/Scene/Setting/SetBackupPassword/SetBackupPasswordViewModel.swift @@ -39,10 +39,12 @@ class SetBackupPasswordViewModel { let valid = password.isValidBackupPasswordFormat - if !valid { + if password.isNotEmpty, !valid { changePasswordError.value = L10n.Scene.SetBackupPassword.tips return false - } else if !isConfirmPasswordsinConsistent() { + } else if newPassword.value?.isNotEmpty == true, + confirmPassword.value?.isNotEmpty == true, + !isConfirmPasswordsinConsistent() { changePasswordError.value = L10n.Scene.SetBackupPassword.errorInconsistentPassword } else { changePasswordError.value = nil diff --git a/Maskbook/Scene/Setting/SetPassword/SetPasswordViewModel.swift b/Maskbook/Scene/Setting/SetPassword/SetPasswordViewModel.swift index 2b71a57a..fcc76439 100644 --- a/Maskbook/Scene/Setting/SetPassword/SetPasswordViewModel.swift +++ b/Maskbook/Scene/Setting/SetPassword/SetPasswordViewModel.swift @@ -35,10 +35,12 @@ class SetPasswordViewModel { let valid = password.isValidPasswordFormat - if !valid { + if password.isNotEmpty, !valid { changePasswordError.value = L10n.Scene.SetPassword.passwordInvalid return false - } else if !isConfirmPasswordsinConsistent() { + } else if newPassword.value?.isNotEmpty == true, + confirmPassword.value?.isNotEmpty == true, + !isConfirmPasswordsinConsistent() { changePasswordError.value = L10n.Scene.ChangePassword.passwordNotMatch } else { changePasswordError.value = nil