Skip to content

[WIP] Fix race condition in refresh token issuance #478

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

Draft
pavinduLakshan wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[WIP] Fix race condition in refresh token issuance #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5aead49
Fix race condition in refresh token issuance
pavinduLakshan Apr 27, 2026
1915b4c
Address review comments
pavinduLakshan Apr 28, 2026
ae24f3f
Print debug logs in test workflow
pavinduLakshan Apr 28, 2026
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
16 changes: 15 additions & 1 deletion .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,22 @@ jobs:
- name: 🎭 Install Playwright browsers
run: pnpm e2e:install

# - name: 🐳 Start Thunder
# run: pnpm e2e:docker:up:thunder

- name: 🐳 Start Thunder
run: pnpm e2e:docker:up:thunder
run: |
set -euxo pipefail
pnpm e2e:docker:up:thunder || {
echo "Thunder compose failed. Dumping docker state + logs..."
docker ps -a || true
docker compose -f e2e/docker-compose.yml ps || true
docker compose -f e2e/docker-compose.yml logs --no-color --timestamps || true
# If thunder-setup is a container name, also dump it directly:
docker logs --timestamps asgardeo-e2e-thunder || true
docker inspect asgardeo-e2e-thunder || true
exit 1
}

- name: 🧪 Run E2E redirect tests against Thunder
run: pnpm e2e -- --idp thunder --mode redirect
Expand Down
46 changes: 29 additions & 17 deletions packages/browser/src/__legacy__/helpers/authentication-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ export class AuthenticationHelper<T extends MainThreadClientConfig | WebWorkerCl
protected _spaHelper: SPAHelper<T>;
protected _instanceId: number;
protected _isTokenRefreshing: boolean;
protected _refreshAccessTokenPromise?: Promise<User>;

public constructor(authClient: AsgardeoAuthClient<T>, spaHelper: SPAHelper<T>) {
this._authenticationClient = authClient;
this._storageManager = this._authenticationClient.getStorageManager();
this._spaHelper = spaHelper;
this._instanceId = this._authenticationClient.getInstanceId();
this._isTokenRefreshing = false;
this._refreshAccessTokenPromise = undefined;
}

public enableHttpHandler(httpClient: HttpClient): void {
Expand Down Expand Up @@ -174,23 +176,33 @@ export class AuthenticationHelper<T extends MainThreadClientConfig | WebWorkerCl
public async refreshAccessToken(
enableRetrievingSignOutURLFromSession?: (config: SPACustomGrantConfig) => void,
): Promise<User> {
try {
await this._authenticationClient.refreshAccessToken();
const customGrantConfig = await this.getCustomGrantConfigData();
if (customGrantConfig) {
await this.exchangeToken(customGrantConfig, enableRetrievingSignOutURLFromSession);
}
this._spaHelper.refreshAccessTokenAutomatically(this);
if (this._refreshAccessTokenPromise) {
return this._refreshAccessTokenPromise;
}

return this._authenticationClient.getUser();
} catch (error) {
const refreshTokenError: Message<string> = {
type: REFRESH_ACCESS_TOKEN_ERR0R,
};
this._refreshAccessTokenPromise = (async (): Promise<User> => {
try {
await this._authenticationClient.refreshAccessToken();
const customGrantConfig = await this.getCustomGrantConfigData();
if (customGrantConfig) {
await this.exchangeToken(customGrantConfig, enableRetrievingSignOutURLFromSession);
}
this._spaHelper.refreshAccessTokenAutomatically(this);

window.postMessage(refreshTokenError);
return Promise.reject(error);
}
return this._authenticationClient.getUser();
} catch (error) {
const refreshTokenError: Message<string> = {
type: REFRESH_ACCESS_TOKEN_ERR0R,
};

window.postMessage(refreshTokenError);
throw error;
} finally {
this._refreshAccessTokenPromise = undefined;
}
})();

return this._refreshAccessTokenPromise;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

protected async retryFailedRequests(failedRequest: HttpRequestInterface): Promise<HttpResponse> {
Expand Down Expand Up @@ -385,9 +397,9 @@ export class AuthenticationHelper<T extends MainThreadClientConfig | WebWorkerCl
})
.catch(async (error: HttpError) => {
if (error?.response?.status === 401 || !error?.response) {
let refreshTokenResponse: TokenResponse | User;
let refreshTokenResponse: User;
try {
refreshTokenResponse = await this._authenticationClient.refreshAccessToken();
refreshTokenResponse = await this.refreshAccessToken();
} catch (refreshError: any) {
if (isHttpHandlerEnabled) {
if (typeof httpErrorCallback === 'function') {
Expand Down
Loading