checkpoint

crlssn · Oct 17, 2024 · ee8032e · ee8032e
1 parent d484a60
commit ee8032e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/go/pkg/jwt/jwt.go b/go/pkg/jwt/jwt.go
@@ -138,9 +138,13 @@ func (m *Manager) ValidateAccessToken(token string) error {
 		return fmt.Errorf("parsing claims: %w", err)
 	}
 
-	if err = m.Validator.Validate(claims); err != nil {
+	if err = m.ValidateClaims(claims); err != nil {
 		return fmt.Errorf("validating claims: %w", err)
 	}
 
 	return nil
 }
+
+func (m *Manager) ValidateClaims(claims *Claims) error {
+	return m.Validator.Validate(claims)
+}
diff --git a/go/rpc/auth/auth.go b/go/rpc/auth/auth.go
@@ -91,6 +91,11 @@ func (h *handler) RefreshToken(ctx context.Context, req *connect.Request[v1.Refr
 		return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("invalid refresh token"))
 	}
 
+	if err = h.jwt.ValidateClaims(claims); err != nil {
+		log.Error("token validation failed", zap.Error(err))
+		return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("invalid refresh token"))
+	}
+
 	accessToken, err := h.jwt.CreateToken(claims.UserID, jwt.TokenTypeAccess)
 	if err != nil {
 		log.Error("token generation failed", zap.Error(err))