From 14e75db65d38d8480d8d66761bff341b6c16171c Mon Sep 17 00:00:00 2001 From: SpeedReach <37238439+SpeedReach@users.noreply.github.com> Date: Tue, 25 Jun 2024 05:29:30 +0800 Subject: [PATCH] fix: early return when token expires --- lib/auth/auth_middleware.go | 3 +++ services/api/controllers/group/generate_invite_code.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/auth/auth_middleware.go b/lib/auth/auth_middleware.go index 1aac26a..a584c24 100644 --- a/lib/auth/auth_middleware.go +++ b/lib/auth/auth_middleware.go @@ -58,6 +58,9 @@ func validateBearerToken(token string, secret string) (uuid.UUID, error) { token, err := jwt.ParseWithClaims(tokenStr, &jwt.RegisteredClaims{}, func(token *jwt.Token) (interface{}, error) { return []byte(secret), nil }) + if err != nil { + return uuid.Nil, err + } if claims, ok := token.Claims.(*jwt.RegisteredClaims); ok { userId, err := uuid.Parse(claims.Subject) if err != nil { diff --git a/services/api/controllers/group/generate_invite_code.go b/services/api/controllers/group/generate_invite_code.go index 5a57d1a..6fe2b2e 100644 --- a/services/api/controllers/group/generate_invite_code.go +++ b/services/api/controllers/group/generate_invite_code.go @@ -16,7 +16,7 @@ import ( ) const ( - inviteCodeChars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + inviteCodeChars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" timeDeterLength = 4 randomLength = 2 inviteCodeLength = timeDeterLength + randomLength