diff --git a/handlers/authandlers/Register.go b/handlers/authandlers/Register.go index c20ebea..def53ba 100644 --- a/handlers/authandlers/Register.go +++ b/handlers/authandlers/Register.go @@ -24,7 +24,7 @@ func CreateUser(user models.User) error { } //validating email is the string is email or not - if !validation.ValidateEmail(user.Email) { + if !validation.ValidateUserOtherEmail(user.Email) { return errors.New("email is invalid") } diff --git a/libs/utils/validation/EmailValidation.go b/libs/utils/validation/EmailValidation.go index 61897dd..f2969d4 100644 --- a/libs/utils/validation/EmailValidation.go +++ b/libs/utils/validation/EmailValidation.go @@ -5,7 +5,7 @@ import ( "regexp" ) -func ValidateEmail(e string) bool { +func ValidateUserOtherEmail(e string) bool { if govalidator.IsNull(e) { return false @@ -24,3 +24,14 @@ func ValidateEmail(e string) bool { return true } + +func ValidateEmail(e string) bool { + if govalidator.IsNull(e) { + return false + } + if !govalidator.IsEmail(e) { + return false + } + + return true +} diff --git a/testing/utils_test.go b/testing/utils_test.go index 2f93cf6..bffcf05 100644 --- a/testing/utils_test.go +++ b/testing/utils_test.go @@ -6,25 +6,25 @@ import ( ) func TestEmailValidation(t *testing.T) { - result := validation.ValidateEmail("Fahrian.Afdholi@wallpaper.Collect.app") + result := validation.ValidateUserOtherEmail("Fahrian.Afdholi@wallpaper.Collect.app") expected := true if result != expected { t.Errorf("checking email isn't valid") } - result = validation.ValidateEmail("Fahrian.Afdholi@gmail.com") + result = validation.ValidateUserOtherEmail("Fahrian.Afdholi@gmail.com") expected = false if result != expected { t.Errorf("checking email that not contain @wallpaper.Collect.app isn't valid") } - result = validation.ValidateEmail("@wallpaper.Collect.app") + result = validation.ValidateUserOtherEmail("@wallpaper.Collect.app") expected = false if result != expected { t.Errorf("checking validation before @ isn't valid") } - result = validation.ValidateEmail("") + result = validation.ValidateUserOtherEmail("") expected = false if result != expected { t.Errorf("checking isNull isn't valid")