From 58635f81fc08384ea93511ef85c4027af9cff8ea Mon Sep 17 00:00:00 2001 From: GotPPay Date: Tue, 15 May 2018 15:47:58 +0200 Subject: [PATCH 1/3] enforce password policy --- server/validation/user.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/validation/user.go b/server/validation/user.go index 1aa8a4c..131d2ea 100644 --- a/server/validation/user.go +++ b/server/validation/user.go @@ -1,10 +1,18 @@ package validation import ( +<<<<<<< HEAD +======= + +>>>>>>> enforce password policy "strings" "bitbucket.org/nemt/nemt-portal-api/application/viewmodel" "bitbucket.org/nemt/nemt-portal-api/infra/errors" +<<<<<<< HEAD +======= + +>>>>>>> enforce password policy ) func characterIsUpperCase(character rune) bool { -- 2.47.3 From e63dd2fa385b3cf99db2142eb3ddc9a70e37354c Mon Sep 17 00:00:00 2001 From: GotPPay Date: Tue, 15 May 2018 18:34:51 +0200 Subject: [PATCH 2/3] split erros for nice rendering on frontend --- server/validation/user.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/validation/user.go b/server/validation/user.go index 131d2ea..9cbac87 100644 --- a/server/validation/user.go +++ b/server/validation/user.go @@ -64,10 +64,10 @@ func ValidatePassword(user *viewmodel.User) []errors.ValidationError { } if !containsUpperCaseLetter || !containsLowerCaseLetter || !containsNumber { - result = append(result, errors.ValidationError{Field: "password", Message: "Password must contain one of EACH :"}) - result = append(result, errors.ValidationError{Field: "password-tab", Message: "an uppercase letter"}) - result = append(result, errors.ValidationError{Field: "password-tab", Message: "a lowercase letter"}) - result = append(result, errors.ValidationError{Field: "password-tab", Message: "a number"}) + result = append(result, errors.ValidationError{Field : "password", Message : "Password must contain one of EACH :"}) + result = append(result, errors.ValidationError{Field : "password-tab", Message : "an uppercase letter"}) + result = append(result, errors.ValidationError{Field : "password-tab", Message : "a lowercase letter"}) + result = append(result, errors.ValidationError{Field : "password-tab", Message : "a number"}) } return result -- 2.47.3 From 696a5b7c0a1b8c95ffa0cd3cef17915d229cde33 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Fri, 25 May 2018 12:26:10 +0200 Subject: [PATCH 3/3] remove rebase markings --- server/validation/user.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/server/validation/user.go b/server/validation/user.go index 9cbac87..1aa8a4c 100644 --- a/server/validation/user.go +++ b/server/validation/user.go @@ -1,18 +1,10 @@ package validation import ( -<<<<<<< HEAD -======= - ->>>>>>> enforce password policy "strings" "bitbucket.org/nemt/nemt-portal-api/application/viewmodel" "bitbucket.org/nemt/nemt-portal-api/infra/errors" -<<<<<<< HEAD -======= - ->>>>>>> enforce password policy ) func characterIsUpperCase(character rune) bool { @@ -64,10 +56,10 @@ func ValidatePassword(user *viewmodel.User) []errors.ValidationError { } if !containsUpperCaseLetter || !containsLowerCaseLetter || !containsNumber { - result = append(result, errors.ValidationError{Field : "password", Message : "Password must contain one of EACH :"}) - result = append(result, errors.ValidationError{Field : "password-tab", Message : "an uppercase letter"}) - result = append(result, errors.ValidationError{Field : "password-tab", Message : "a lowercase letter"}) - result = append(result, errors.ValidationError{Field : "password-tab", Message : "a number"}) + result = append(result, errors.ValidationError{Field: "password", Message: "Password must contain one of EACH :"}) + result = append(result, errors.ValidationError{Field: "password-tab", Message: "an uppercase letter"}) + result = append(result, errors.ValidationError{Field: "password-tab", Message: "a lowercase letter"}) + result = append(result, errors.ValidationError{Field: "password-tab", Message: "a number"}) } return result -- 2.47.3