From b8f5918720dc48c3b017b3e808127525e7d6690d Mon Sep 17 00:00:00 2001 From: gme_2 Date: Tue, 30 Oct 2018 10:39:23 +0900 Subject: [PATCH] bug fix password reuire cappital leter now --- .../Application Logic/Interactor/RegisterInteractor.swift | 6 +++++- .../Profile/ProfileChangePasswordViewController.swift | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift b/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift index 92e93aaa..544f5131 100644 --- a/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift +++ b/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift @@ -47,6 +47,10 @@ class RegisterInteractor { return password.rangeOfCharacter(from: characterSet.inverted) != nil } + func hasUpperCase() -> Bool { + let characterSet = CharacterSet.uppercaseLetters + return password.rangeOfCharacter(from: characterSet) != nil + } if password.isEmpty { @@ -60,7 +64,7 @@ class RegisterInteractor { return (isValid, error) } - let validPassword = hasNumber() && hasLetter() && hasSpecialCharacter() + let validPassword = hasNumber() && hasLetter() && hasSpecialCharacter() && hasUpperCase() if !validPassword { isValid = false diff --git a/GMERemittance/Profile/ProfileChangePasswordViewController.swift b/GMERemittance/Profile/ProfileChangePasswordViewController.swift index 9ab570b5..26faff1f 100644 --- a/GMERemittance/Profile/ProfileChangePasswordViewController.swift +++ b/GMERemittance/Profile/ProfileChangePasswordViewController.swift @@ -102,6 +102,12 @@ extension ProfileChangePasswordViewController { } + func hasUpperCase() -> Bool { + let characterSet = CharacterSet.uppercaseLetters + return password.rangeOfCharacter(from: characterSet) != nil + } + + if password.isEmpty { error = error + "\n Password cannot be empty" @@ -114,7 +120,7 @@ extension ProfileChangePasswordViewController { return (isValid, error) } - let validPassword = hasNumber() && hasLetter() && hasSpecialCharacter() + let validPassword = hasNumber() && hasLetter() && hasSpecialCharacter() && hasUpperCase() if !validPassword { isValid = false