From f177e8cef7321c7da3cc0438be008c8ef7c6b9b8 Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Wed, 8 Jun 2022 13:47:08 -0700 Subject: [PATCH] solve issue #15 --- controllers/authController.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/controllers/authController.go b/controllers/authController.go index 53b595a..da42c47 100644 --- a/controllers/authController.go +++ b/controllers/authController.go @@ -50,17 +50,22 @@ func CreateDefaultAdmin() models.Admin { fmt.Print("Password: ") password, _ := gopass.GetPasswd() - // Clear values of new lines + // Clear values of new lines and enter characters firstname = strings.ReplaceAll(firstname, "\n", "") lastname = strings.ReplaceAll(lastname, "\n", "") email = strings.ReplaceAll(email, "\n", "") + firstname = strings.ReplaceAll(firstname, "\r", "") + lastname = strings.ReplaceAll(lastname, "\r", "") + email = strings.ReplaceAll(email, "\r", "") var admin models.Admin - admin.FirstName = strings.TrimSuffix(firstname, "\n") - admin.LastName = strings.TrimSuffix(lastname, "\n") - admin.Email = strings.TrimSuffix(email, "\n") + admin.FirstName = firstname + admin.LastName = lastname + admin.Email = email - admin.SchoolEmail = admin.GenerateSchoolEmail() + temp := admin.GenerateSchoolEmail() + fmt.Println(temp) + admin.SchoolEmail = temp pass := strings.TrimSuffix(string(password), "\n") admin.Password = admin.HashPassword(pass)