Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor(oauth2): improve token handling and code reuse (#18497)

p0nydcd7e5b746c9
diff --git a/backend/api/oauth2/authorize.go b/backend/api/oauth2/authorize.go
index a7f5888cb0..99e22d08b3 100644
--- a/backend/api/oauth2/authorize.go
+++ b/backend/api/oauth2/authorize.go
@@ -5,6 +5,7 @@ import (
"log/slog"
"net/http"
"net/url"
+ "strconv"
"time"
"github.com/golang-jwt/jwt/v5"
@@ -102,7 +103,10 @@ func (s *Service) handleAuthorizePost(c echo.Context) error {
}
// Get current user from session
- accessToken := getTokenFromEchoRequest(c)
+ accessToken, err := auth.GetTokenFromHeaders(c.Request().Header)
+ if err != nil {
+ return oauth2ErrorRedirect(c, redirectURI, state, "access_denied", err.Error())
+ }
if accessToken == "" {
return oauth2ErrorRedirect(c, redirectURI, state, "access_denied", "user not authenticated")
}
@@ -130,10 +134,26 @@ func (s *Service) handleAuthorizePost(c echo.Context) error {
return oauth2ErrorRedirect(c, redirectURI, state, "access_denied", "invalid token audience")
}
- // Get user from claims (subject is email)
- user, err := s.store.GetUserByEmail(ctx, claims.Subject)
- if err != nil || user == nil {
- return oauth2ErrorRedirect(c, redirectURI, state, "access_denied", "user not found")
+ // Try to parse subject as integer ID (old tokens), otherwise treat as email (new tokens)
+ var user *store.UserMessage
+ if principalID, parseErr := strconv.Atoi(claims.Subject); parseErr == nil {
+ // Old token with numeric ID as subject
+ user, err = s.store.GetUserByID(ctx, principalID)
+ if err != nil {
+ return oauth2ErrorRedirect(c, redirectURI, state, "access_denied", "failed to find user")
+ }
+ if user == nil {
+ return oauth2ErrorRedirect(c, redirectURI, state, "access_denied", "user not found")
+ }
+ } else {
+ // New token with email as subject
+ user, err = s.store.GetUserByEmail(ctx, claims.Subject)
+ if err != nil {
+ return oauth2ErrorRedirect(c, redirectURI, state, "access_denied", "failed to find user")
+ }
+ if user == nil {
+ return oauth2ErrorRedirect(c, redirectURI, state, "access_denied", "user not found")
+ }
}
// Generate authorization code
@@ -181,25 +201,6 @@ func (s *Service) handleAuthorizePost(c echo.Context) error {
return c.HTML(http.StatusOK, buildRedirectHTML(redirectURL))
}
-// getTokenFromEchoRequest extracts the access token from an Echo request.
-func getTokenFromEchoRequest(c echo.Context) string {
- // Check Authorization header first
- authHeader := c.Request().Header.Get("Authorization")
- if authHeader != "" {
- if len(authHeader) > 7 && authHeader[:7] == "Bearer " {
- return authHeader[7:]
- }
- }
-
- // Check HTTP cookies
- cookie, err := c.Cookie(auth.AccessTokenCookieName)
- if err == nil && cookie != nil {
- return cookie.Value
- }
-
- return ""
-}
-
// audienceContains checks if the audience claim contains the given token.
func audienceContains(audience jwt.ClaimStrings, token string) bool {
for _, aud := range audience {