jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

normalize slog

Browse Source
This commit is contained in:
jay brown
2025-07-18 11:00:24 -07:00
parent b56c67f807
commit adf2358742
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cognitoauth/auth.go
+14 -11
View File
@@ -3,7 +3,6 @@ package cognitoauth
import (
"context"
"fmt"
"log"
"net/http"
"os"
"time"
@@ -164,8 +163,9 @@ func GetUserSubject(c echo.Context) (string, bool) {
// - config: Configuration provider for auth settings
func setTokenCookies(c echo.Context, tokens *TokenResponse, accessTokenExpiresAt time.Time, config auth.ConfigProvider) {
// Log key cookie setting information for debugging
log.Printf("DEBUG: setTokenCookies - Setting cookies: access_token_len=%d, refresh_token_len=%d",
len(tokens.AccessToken), len(tokens.RefreshToken))
config.GetAuthLogger().Debug("Setting token cookies",
"access_token_len", len(tokens.AccessToken),
"refresh_token_len", len(tokens.RefreshToken))
// Set access token cookie (shorter expiration)
// Ensure proper UTC time handling
@@ -195,7 +195,7 @@ func setTokenCookies(c echo.Context, tokens *TokenResponse, accessTokenExpiresAt
}
c.SetCookie(refreshTokenCookie)
log.Printf("DEBUG: setTokenCookies - Cookies set successfully")
config.GetAuthLogger().Debug("Token cookies set successfully")
config.GetAuthLogger().Debug("Token cookies set",
"access_token_expires", accessTokenExpiresAt,
@@ -212,7 +212,7 @@ func setTokenCookies(c echo.Context, tokens *TokenResponse, accessTokenExpiresAt
// - config: Configuration provider for auth settings
func clearTokenCookies(c echo.Context, config auth.ConfigProvider) {
// Log when clearTokenCookies is called for debugging
log.Printf("DEBUG: clearTokenCookies - Clearing auth cookies for path: %s", c.Request().URL.Path)
config.GetAuthLogger().Debug("Clearing auth cookies", "path", c.Request().URL.Path)
// Use UTC time for consistent cookie clearing
pastTime := time.Now().UTC().Add(-1 * time.Hour)
@@ -241,7 +241,7 @@ func clearTokenCookies(c echo.Context, config auth.ConfigProvider) {
}
c.SetCookie(refreshTokenCookie)
log.Printf("DEBUG: clearTokenCookies - Auth cookies cleared successfully")
config.GetAuthLogger().Debug("Auth cookies cleared successfully")
config.GetAuthLogger().Debug("Token cookies cleared")
}
@@ -249,25 +249,28 @@ func clearTokenCookies(c echo.Context, config auth.ConfigProvider) {
//
// Parameters:
// - c: The Echo context containing the HTTP request
// - config: Configuration provider for auth settings
//
// Returns:
// - string: The refresh token value, or empty string if not found
func getRefreshTokenFromCookie(c echo.Context) string {
func getRefreshTokenFromCookie(c echo.Context, config auth.ConfigProvider) string {
// Check if we have cookies
cookies := c.Cookies()
log.Printf("DEBUG: getRefreshTokenFromCookie - Found %d cookies for %s", len(cookies), c.Request().URL.Path)
config.GetAuthLogger().Debug("Checking for refresh token cookie",
"cookie_count", len(cookies),
"path", c.Request().URL.Path)
refreshCookie, err := c.Cookie("refresh_token")
if err != nil {
log.Printf("DEBUG: getRefreshTokenFromCookie - Failed to get refresh_token cookie: %v", err)
config.GetAuthLogger().Debug("Failed to get refresh_token cookie", "error", err)
return ""
}
if refreshCookie.Value == "" {
log.Printf("DEBUG: getRefreshTokenFromCookie - refresh_token cookie is empty")
config.GetAuthLogger().Debug("Refresh token cookie is empty")
return ""
}
log.Printf("DEBUG: getRefreshTokenFromCookie - Found refresh_token cookie, length: %d", len(refreshCookie.Value))
config.GetAuthLogger().Debug("Found refresh token cookie", "token_length", len(refreshCookie.Value))
return refreshCookie.Value
}
internal/cognitoauth/middleware.go
+2 -2
View File
@@ -168,7 +168,7 @@ func TokenValidationMiddleware(config auth.ConfigProvider) echo.MiddlewareFunc {
// Check if we have a refresh token
config.GetAuthLogger().Debug("About to call getRefreshTokenFromCookie")
refreshToken := getRefreshTokenFromCookie(c)
refreshToken := getRefreshTokenFromCookie(c, config)
config.GetAuthLogger().Debug("getRefreshTokenFromCookie returned", "token_length", len(refreshToken))
if refreshToken == "" {
@@ -215,7 +215,7 @@ func TokenValidationMiddleware(config auth.ConfigProvider) echo.MiddlewareFunc {
if isTokenExpired(tokenStr) {
config.GetAuthLogger().Debug("Access token expired, attempting refresh")
refreshToken := getRefreshTokenFromCookie(c)
refreshToken := getRefreshTokenFromCookie(c, config)
if refreshToken == "" {
config.GetAuthLogger().Debug("No refresh token found, redirecting to login")
clearTokenCookies(c, config)