Skip to content

Reuse login redirect_uri in token request #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
melvincarvalho merged 1 commit into from
Oct 4, 2026
Merged

Reuse login redirect_uri in token request #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion solid-oidc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,10 @@ export class Session extends EventTarget {
const csrfToken = crypto.randomUUID()
sessionStorage.setItem('solid_oidc_csrf', csrfToken)

// The token request must repeat the exact redirect_uri used here
// (RFC 6749 §4.1.3), query string included
sessionStorage.setItem('solid_oidc_redirect_uri', sanitizedRedirect)

// Build authorization URL
const authUrl = new URL(config.authorization_endpoint)
authUrl.searchParams.set('response_type', 'code')
Expand Down Expand Up @@ -542,6 +546,7 @@ export class Session extends EventTarget {
const tokenEndpoint = sessionStorage.getItem('solid_oidc_token_endpoint')
const jwksUri = sessionStorage.getItem('solid_oidc_jwks_uri')
const clientId = this.clientId || sessionStorage.getItem('solid_oidc_client_id')
const redirectUri = sessionStorage.getItem('solid_oidc_redirect_uri') || url.origin + url.pathname + url.search

if (!pkceVerifier || !tokenEndpoint || !clientId) {
throw new Error('Missing session data')
Expand All @@ -559,7 +564,7 @@ export class Session extends EventTarget {
grant_type: 'authorization_code',
code,
code_verifier: pkceVerifier,
redirect_uri: url.origin + url.pathname,
redirect_uri: redirectUri,
client_id: clientId
}, keyPair)

Expand Down Expand Up @@ -588,6 +593,7 @@ export class Session extends EventTarget {
sessionStorage.removeItem('solid_oidc_client_id')
sessionStorage.removeItem('solid_oidc_pkce_verifier')
sessionStorage.removeItem('solid_oidc_csrf')
sessionStorage.removeItem('solid_oidc_redirect_uri')

// Update session state
await this._setTokens({ ...tokens, dpop_key_pair: keyPair })
Expand Down
Loading