diff --git a/controllers/userController.go b/controllers/userController.go index 24947da..c9c2b1a 100644 --- a/controllers/userController.go +++ b/controllers/userController.go @@ -1,17 +1,14 @@ package controllers import( - "os" "fmt" - "time" "net/http" - "golang.org/x/crypto/bcrypt" - "github.com/golang-jwt/jwt/v5" "github.com/gin-gonic/gin" "example.com/gin/test/models" "example.com/gin/test/repositories" + "example.com/gin/test/services" ) @@ -40,20 +37,7 @@ func (uc *UserController) Register(c *gin.Context) { return } - //hash pw - hash, err := bcrypt.GenerateFromPassword([]byte(body.Password), 10) - - if err != nil { - c.JSON(http.StatusBadRequest, gin.H{ - "error": "Failed to hash password", - }) - - return - } - - //create user - user := models.User{Name: body.Name, Email: body.Email, Password: string(hash)} - _, err = repositories.Users.Create(user) + _, err = services.Users.Register(body.Name, body.Email, body.Password) if err != nil { fmt.Println("Error: ", err) @@ -81,46 +65,17 @@ func (uc *UserController) Login(c *gin.Context) { if err != nil { c.JSON(http.StatusBadRequest, gin.H{ - "error": "Failed to read body", + "error": "Login Failed", }) return } - //lookup requested user - user, err := repositories.Users.GetByEmail(body.Email) + tokenString, err := services.Users.Login(body.Email, body.Password) if err != nil { c.JSON(http.StatusBadRequest, gin.H{ - "error": "Invalid email or password", - }) - - return - } - - // compare sent with saved pass - err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(body.Password)) - - if err != nil { - c.JSON(http.StatusBadRequest, gin.H{ - "error": "Invalid email or password", - }) - - return - } - - //generate jwt token - token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ - "sub": user.ID, - "exp": time.Now().Add(time.Hour * 24).Unix(), - }) - - // Sign and get the complete encoded token as a string using the secret - tokenString, err := token.SignedString([]byte(os.Getenv("SECRET"))) - - if err != nil { - c.JSON(http.StatusBadRequest, gin.H{ - "error": "Failed to create token", + "error": "Login Failed", }) return @@ -129,7 +84,6 @@ func (uc *UserController) Login(c *gin.Context) { // send it back c.SetSameSite(http.SameSiteLaxMode) c.SetCookie("Authorization", tokenString, 3600 * 24, "", "", false, true) - c.JSON(http.StatusOK, gin.H{}) } diff --git a/services/userService.go b/services/userService.go new file mode 100644 index 0000000..4448d9a --- /dev/null +++ b/services/userService.go @@ -0,0 +1,68 @@ +package services + +import( + "os" + "time" + "golang.org/x/crypto/bcrypt" + + "github.com/golang-jwt/jwt/v5" + + "example.com/gin/test/models" + "example.com/gin/test/repositories" +) + +var( + Users UserService = UserService{} +) + +type UserService struct {} + +func (u *UserService) Register(name string, email string, password string) (models.User, error) { + //hash pw + hash, err := bcrypt.GenerateFromPassword([]byte(password), 10) + + if err != nil { + return models.User{}, err + } + + user := models.User{Name: name, Email: email, Password: string(hash)} + _, err = repositories.Users.Create(user) + + if err != nil { + return models.User{}, err + } + + return user, nil +} + +//return jwt tokenstring on success +func (u *UserService) Login(email string, password string) (string, error) { + //lookup requested user + user, err := repositories.Users.GetByEmail(email) + + if err != nil { + return "", err + } + + // compare sent with saved pass + err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)) + + if err != nil { + return "", err + } + + //generate jwt token + token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ + "sub": user.ID, + "exp": time.Now().Add(time.Hour * 24).Unix(), + }) + + // Sign and get the complete encoded token as a string using the secret + tokenString, err := token.SignedString([]byte(os.Getenv("SECRET"))) + + if err != nil { + return "", err + } + + return tokenString, nil +}