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

tsk-6: Populate IssuedAt for LoginResult (#39)

Browse Source 
Closes #36

Reviewed-on: phoenix/textsender-auth#39
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
phoenix
2026-01-04 02:00:39 +00:00
committed by phoenix
parent 689762c72a
commit e06a54947f
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/utility/token.go
+7 -16
View File
@@ -38,7 +38,6 @@ func (t *TokenGenerator) GenerateToken(usr any) (*token.Login, error) {
if t.hourOffset == 0 { if t.hourOffset == 0 {
t.hourOffset = 4 t.hourOffset = 4
} }
expirationTime := time.Now().Add(t.hourOffset * time.Hour) expirationTime := time.Now().Add(t.hourOffset * time.Hour)
if claims, err := t.generateClaims(usr, TOKEN_TYPE, issuedAt, expirationTime); err != nil { if claims, err := t.generateClaims(usr, TOKEN_TYPE, issuedAt, expirationTime); err != nil {
@@ -48,7 +47,7 @@ func (t *TokenGenerator) GenerateToken(usr any) (*token.Login, error) {
if tokenString, err := myToken.SignedString(t.SecretKey); err != nil { if tokenString, err := myToken.SignedString(t.SecretKey); err != nil {
return nil, err return nil, err
} else { } else {
return &token.Login{UserId: claims.UserId, AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil return &token.Login{UserId: claims.UserId, AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix(), IssuedAt: issuedAt.Unix()}, nil
} }
} }
} }
@@ -60,14 +59,10 @@ func (t *TokenGenerator) VerifyToken(accessToken string) (bool, error) {
return false, nil return false, nil
} else { } else {
if tken.Valid { if tken.Valid {
if clms != nil { if clms.UserId != uuid.Nil {
if clms.UserId != uuid.Nil { return true, nil
return true, nil
} else {
return false, fmt.Errorf("User Id was not set")
}
} else { } else {
return false, fmt.Errorf("Claims not parsed") return false, fmt.Errorf("User Id was not set")
} }
} else { } else {
return false, fmt.Errorf("Invalid access token") return false, fmt.Errorf("Invalid access token")
@@ -82,14 +77,10 @@ func (t *TokenGenerator) ExtractIdFromToken(accessToken string) (uuid.UUID, erro
return uuid.Nil, nil return uuid.Nil, nil
} else { } else {
if tken.Valid { if tken.Valid {
if clms != nil { if clms.UserId != uuid.Nil {
if clms.UserId != uuid.Nil { return clms.UserId, nil
return clms.UserId, nil
} else {
return uuid.Nil, fmt.Errorf("User Id was not set")
}
} else { } else {
return uuid.Nil, fmt.Errorf("Claims not parsed") return uuid.Nil, fmt.Errorf("User Id was not set")
} }
} else { } else {
return uuid.Nil, fmt.Errorf("Invalid access token") return uuid.Nil, fmt.Errorf("Invalid access token")