Skip to content

fix: validate password only when password is not empty #258

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

Open
cythb wants to merge 1 commit into
base: release/2.9.0
Choose a base branch
from
Open

fix: validate password only when password is not empty #258

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
6 changes: 4 additions & 2 deletions Maskbook/Scene/Setting/ChangeBackupPassword/ChangeBackupPasswordStep2ViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Maskbook/Scene/Setting/ChangePassword/ChangePasswordViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 4 additions & 2 deletions Maskbook/Scene/Setting/SetBackupPassword/SetBackupPasswordViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Maskbook/Scene/Setting/SetPassword/SetPasswordViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down