Skip to content

Auth: Fix re-entrant /token call after OAuth code exchange #22097

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
leekelleher merged 1 commit into from
Mar 11, 2026
Merged

Auth: Fix re-entrant /token call after OAuth code exchange #22097

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
20 changes: 12 additions & 8 deletions src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,7 @@ export class UmbAuthContext extends UmbContextBase {

const response = await this.#client.refreshToken();
if (response) {
this.#inSessionUpdateCallback = true;
try {
this.#updateSession(response.expiresIn, response.issuedAt);
} finally {
this.#inSessionUpdateCallback = false;
}
this.#updateSession(response.expiresIn, response.issuedAt);
return true;
}
return false;
Expand Down Expand Up @@ -755,14 +750,23 @@ export class UmbAuthContext extends UmbContextBase {
/**
* Sets the in-memory session state without broadcasting.
* Use when the caller handles broadcasting separately (e.g. completeAuthorizationRequest).
*
* Sets #inSessionUpdateCallback around the setValue calls to prevent re-entrant /token
* requests triggered by session$ observers firing synchronously (e.g. keepUserLoggedIn=true
* with a short expiresIn causes #onSessionExpiring to fire immediately).
*/
#setSessionLocally(expiresIn: number, issuedAt: number) {
const accessTokenExpiresAt = issuedAt + expiresIn;
// The access_token lives for 1/4 of the refresh_token lifetime.
// Multiply to get the full session expiry.
const expiresAt = issuedAt + expiresIn * TOKEN_EXPIRY_MULTIPLIER;
this.#session.setValue({ accessTokenExpiresAt, expiresAt });
this.#isAuthorized.setValue(true);
this.#inSessionUpdateCallback = true;
try {
this.#session.setValue({ accessTokenExpiresAt, expiresAt });
this.#isAuthorized.setValue(true);
} finally {
this.#inSessionUpdateCallback = false;
}
}

/**
Expand Down
Loading