Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backend/controller/userController.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func UserRegister(c *gin.Context) {
return
}

if err := models.HashPassword(&user); err != nil {
if err := user.EncryptPassword(); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to hash password"})
return // 这里需要返回
}
Expand Down
24 changes: 12 additions & 12 deletions src/backend/models/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"fmt"
"time"

"errors"

"github.com/dgrijalva/jwt-go"
"golang.org/x/crypto/bcrypt"
"gorm.io/gorm"
Expand Down Expand Up @@ -69,33 +67,35 @@ func CreateUser(db *gorm.DB, user *User) error {
}

// hash
func HashPassword(user *User) error {

func (u *User) EncryptPassword() error {
// Check if the passwd is empty
if user.Password == "" {
return errors.New("password cannot be empty")
if u.Password == "" {
return fmt.Errorf("module EncryptPassword: password cannot be empty")
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
encryptedPassword, err := bcrypt.GenerateFromPassword([]byte(u.Password), bcrypt.DefaultCost)
if err != nil {
return err
return fmt.Errorf("module EncryptPassword: %v", err)
}

user.Password = string(hashedPassword)

u.Password = string(encryptedPassword)
return nil
}

func ComparePassword(user *User, providedPassword string) (bool, error) {
// Check if hashed passwd is empty
if user.Password == "" {
return false, errors.New("hashed password cannot be empty")
return false, fmt.Errorf("module ComparePassword: hashed password cannot be empty")
}
if providedPassword == "" {
return false, fmt.Errorf("module ComparePassword: input password cannot be empty")
}
err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(providedPassword))
if err != nil {
// if not match
if err == bcrypt.ErrMismatchedHashAndPassword {
return false, nil
}
return false, err
return false, fmt.Errorf("module ComparePassword: %v", err)
}

return true, nil
Expand Down