diff --git a/auth.ts b/auth.ts index b634a3c4b..5c75c9720 100644 --- a/auth.ts +++ b/auth.ts @@ -109,6 +109,14 @@ export const config = { return token } else { try { + console.log( + "token-debug Access token expired, trying to refresh it.", + { + expires_at: token.expires_at, + sub: token.sub, + token: token.access_token, + } + ) const response = await fetch( `${env.CURITY_ISSUER_USER}/oauth/v2/token`, { @@ -125,19 +133,37 @@ export const config = { } ) - const tokens = await response.json() + const new_tokens = await response.json() if (!response.ok) { - throw tokens + console.log("token-debug Token response was not ok", { + status: response.status, + statusText: response.statusText, + sub: token.sub, + }) + throw new_tokens } + console.log("token-debug Successfully got new token(s)", { + expires_at: new_tokens.expires_at, + got_new_refresh_token: + new_tokens.refresh_token !== token.refresh_token, + got_new_access_token: + new_tokens.access_token !== token.access_token, + sub: token.sub, + }) + return { ...token, - access_token: tokens.access_token, - expires_at: tokens.expires_at, - refresh_token: tokens.refresh_token ?? token.refresh_token, + access_token: new_tokens.access_token, + expires_at: new_tokens.expires_at, + refresh_token: new_tokens.refresh_token ?? token.refresh_token, } } catch (error) { + console.log("token-debug Error thrown when trying to refresh", { + error, + sub: token.sub, + }) return { ...token, error: "RefreshAccessTokenError" as const,