From 9681ded4d0094bd8196093d18fd2a1a7ad3e4d85 Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Thu, 13 Jan 2022 09:27:41 -0800 Subject: [PATCH] update/fix-password-strength-check --- models/adminModel.go | 10 +++++----- models/studentModel.go | 12 ++++++------ models/teacherModel.go | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/models/adminModel.go b/models/adminModel.go index 23d45be..135712e 100644 --- a/models/adminModel.go +++ b/models/adminModel.go @@ -38,17 +38,17 @@ func (s *Admin) ComparePasswords(password string) bool { func (s *Admin) CheckPasswordStrength(password string) bool { - var hasUpper bool = true + var hasUpper bool = false for _, r := range password { - if !unicode.IsUpper(r) && unicode.IsLetter(r) { - hasUpper = false + if unicode.IsUpper(r) && unicode.IsLetter(r) { + hasUpper = true } } - var hasLower bool = true + var hasLower bool = false for _, r := range password { if !unicode.IsLower(r) && unicode.IsLetter(r) { - hasLower = false + hasLower = true } } diff --git a/models/studentModel.go b/models/studentModel.go index 4bed5cf..89e4ff5 100644 --- a/models/studentModel.go +++ b/models/studentModel.go @@ -59,17 +59,17 @@ func (s *Student) ComparePasswords(password string) bool { func (s *Student) CheckPasswordStrength(password string) bool { - var hasUpper bool = true + var hasUpper bool = false for _, r := range password { - if !unicode.IsUpper(r) && unicode.IsLetter(r) { - hasUpper = false + if unicode.IsUpper(r) && unicode.IsLetter(r) { + hasUpper = true } } - var hasLower bool = true + var hasLower bool = false for _, r := range password { - if !unicode.IsLower(r) && unicode.IsLetter(r) { - hasLower = false + if unicode.IsLower(r) && unicode.IsLetter(r) { + hasLower = true } } diff --git a/models/teacherModel.go b/models/teacherModel.go index 0110685..c948285 100644 --- a/models/teacherModel.go +++ b/models/teacherModel.go @@ -60,17 +60,17 @@ func (t *Teacher) ComparePasswords(password string) bool { func (t *Teacher) CheckPasswordStrength(password string) bool { - var hasUpper bool = true + var hasUpper bool = false for _, r := range password { - if !unicode.IsUpper(r) && unicode.IsLetter(r) { - hasUpper = false + if unicode.IsUpper(r) && unicode.IsLetter(r) { + hasUpper = true } } - var hasLower bool = true + var hasLower bool = false for _, r := range password { - if !unicode.IsLower(r) && unicode.IsLetter(r) { - hasLower = false + if unicode.IsLower(r) && unicode.IsLetter(r) { + hasLower = true } }