From 27fcfbae39b25bc241dce3890f2bf93f3493bc58 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 31 Oct 2025 15:48:59 -0400 Subject: [PATCH] Saving changes Having issues with add textsender-models --- go.mod | 1 - internal/utility/token.go | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index dcf7390..0987e2c 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/joho/godotenv v1.5.1 github.com/stretchr/testify v1.11.1 golang.org/x/crypto v0.42.0 - git.kundeng.us/phoenix/textsender-models v0.0.1-main-a4317b4b22-556 ) require ( diff --git a/internal/utility/token.go b/internal/utility/token.go index 898571d..a0484d0 100644 --- a/internal/utility/token.go +++ b/internal/utility/token.go @@ -7,6 +7,7 @@ import ( "git.kundeng.us/phoenix/textsender-auth/internal/config" "git.kundeng.us/phoenix/textsender-auth/internal/model" + textmod "git.kundeng.us/phoenix/textsender-models" ) const ROLE_TYPE = "regular" @@ -20,7 +21,7 @@ func (t *TokenGenerator) SetSecretKey(secretKey string) { t.SecretKey = []byte(secretKey) } -func (t *TokenGenerator) GenerateToken(user model.User) (*model.Login, error) { +func (t *TokenGenerator) GenerateToken(user model.User) (*textmod.token.Login, error) { issuedAt := time.Now() expirationTime := time.Now().Add(4 * time.Hour) claims := t.generateClaims(user, TOKEN_TYPE, issuedAt, expirationTime) @@ -29,12 +30,12 @@ func (t *TokenGenerator) GenerateToken(user model.User) (*model.Login, error) { if tokenString, err := token.SignedString(t.SecretKey); err != nil { return nil, err } else { - return &model.Login{AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil + return &token.Login{AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil } } -func (t *TokenGenerator) generateClaims(user model.User, role string, issuedAt time.Time, expiredAt time.Time) model.Claims { - return model.Claims{ +func (t *TokenGenerator) generateClaims(user model.User, role string, issuedAt time.Time, expiredAt time.Time) textmod.token.Claims { + return textmod.token.Claims{ UserId: user.Id.String(), Role: role, RegisteredClaims: jwt.RegisteredClaims{