phoenix/schedtxt_auth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix

Browse Source
This commit is contained in:
phoenix
2025-11-01 15:24:25 -04:00
parent 2a244c986f
commit a635b91994
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
-1
View File
@@ -3,7 +3,6 @@ module git.kundeng.us/phoenix/textsender-auth
go 1.25.3 go 1.25.3
require ( require (
git.kundeng.us/phoenix/textsender-models v0.0.2
github.com/go-chi/chi/v5 v5.2.3 github.com/go-chi/chi/v5 v5.2.3
github.com/golang-jwt/jwt/v5 v5.3.0 github.com/golang-jwt/jwt/v5 v5.3.0
github.com/google/uuid v1.6.0 github.com/google/uuid v1.6.0
go.sum
-6
View File
@@ -1,9 +1,3 @@
git.kundeng.us/phoenix/textsender-models v0.0.1-main-a4317b4b22-556 h1:5OiaQV71ks1g6zlfN1BVoQhkAg9fKZM0I9joE+6CcfI=
git.kundeng.us/phoenix/textsender-models v0.0.1-main-a4317b4b22-556/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
git.kundeng.us/phoenix/textsender-models v0.0.1 h1:iv30k8Nlu/3wMENrnCpCx0bUl9mt8aMo7fnW22iBQGI=
git.kundeng.us/phoenix/textsender-models v0.0.1/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
git.kundeng.us/phoenix/textsender-models v0.0.2 h1:kyb5lqxK4TdBj+WlfevKcNveQtMiddYnI5r+90DJJWs=
git.kundeng.us/phoenix/textsender-models v0.0.2/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
internal/utility/token.go
+5 -5
View File
@@ -7,7 +7,7 @@ import (
"git.kundeng.us/phoenix/textsender-auth/internal/config" "git.kundeng.us/phoenix/textsender-auth/internal/config"
intmodels "git.kundeng.us/phoenix/textsender-auth/internal/model" intmodels "git.kundeng.us/phoenix/textsender-auth/internal/model"
"git.kundeng.us/phoenix/textsender-models" // "git.kundeng.us/phoenix/textsender-models"
) )
const ROLE_TYPE = "regular" const ROLE_TYPE = "regular"
@@ -21,7 +21,7 @@ func (t *TokenGenerator) SetSecretKey(secretKey string) {
t.SecretKey = []byte(secretKey) t.SecretKey = []byte(secretKey)
} }
func (t *TokenGenerator) GenerateToken(user intmodels.User) (*models.token.Login, error) { func (t *TokenGenerator) GenerateToken(user intmodels.User) (*intmodels.Login, error) {
issuedAt := time.Now() issuedAt := time.Now()
expirationTime := time.Now().Add(4 * time.Hour) expirationTime := time.Now().Add(4 * time.Hour)
claims := t.generateClaims(user, TOKEN_TYPE, issuedAt, expirationTime) claims := t.generateClaims(user, TOKEN_TYPE, issuedAt, expirationTime)
@@ -30,12 +30,12 @@ func (t *TokenGenerator) GenerateToken(user intmodels.User) (*models.token.Login
if tokenString, err := token.SignedString(t.SecretKey); err != nil { if tokenString, err := token.SignedString(t.SecretKey); err != nil {
return nil, err return nil, err
} else { } else {
return &models.token..Login{AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil return &intmodels.Login{AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil
} }
} }
func (t *TokenGenerator) generateClaims(user intmodels.User, role string, issuedAt time.Time, expiredAt time.Time) models.token.Claims { func (t *TokenGenerator) generateClaims(user intmodels.User, role string, issuedAt time.Time, expiredAt time.Time) intmodels.Claims {
return textmod.token.Claims{ return intmodels.Claims{
UserId: user.Id.String(), UserId: user.Id.String(),
Role: role, Role: role,
RegisteredClaims: jwt.RegisteredClaims{ RegisteredClaims: jwt.RegisteredClaims{