diff --git a/go.mod b/go.mod index aab26b0..8226db9 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.21rc1 require ( github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang-jwt/jwt/v5 v5.0.0 // indirect + github.com/google/uuid v1.3.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/joho/godotenv v1.5.1 // indirect diff --git a/go.sum b/go.sum index 12c5561..a84120c 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= diff --git a/model/user.go b/model/user.go index 68c8623..9d58f35 100644 --- a/model/user.go +++ b/model/user.go @@ -1,10 +1,14 @@ package model -import "gorm.io/gorm" +import ( + "github.com/google/uuid" + "gorm.io/gorm" +) type ( User struct { gorm.Model + ID uuid.UUID UserName string `json:"user_name" gorm:"unique;index"` Password string `json:"password,omitempty"` FirstName string `json:"first_name"` diff --git a/services/users/users.go b/services/users/users.go index d60d1fc..09ca8df 100644 --- a/services/users/users.go +++ b/services/users/users.go @@ -30,7 +30,7 @@ func Login(c echo.Context) (err error) { token := jwt.New(jwt.SigningMethodHS256) claims := token.Claims.(jwt.MapClaims) - claims["id"] = strconv.Itoa(int(u.ID)) + claims["id"] = u.ID claims["exp"] = time.Now().Add(time.Hour * 72).Unix() claims["role"] = u.Role claims["position_name"] = u.Position.Name