Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-30 22:41:33 +01:00
Code Issues Projects Releases Wiki Activity

Prevent parallel refreshToken calls (#10799)

Browse Source 
Co-authored-by: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Co-authored-by: Patrick-Pimentel-Bitwarden <ppimentel@bitwarden.com>
This commit is contained in:
Timshel 2025-01-24 20:23:22 +01:00 committed by GitHub
parent 40606ee8af
commit 9a5ebf94a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/common/src/services/api.service.ts
View File

@ -158,6 +158,7 @@ export class ApiService implements ApiServiceAbstraction {
private deviceType: string; private deviceType: string;
private isWebClient = false; private isWebClient = false;
private isDesktopClient = false; private isDesktopClient = false;
private refreshTokenPromise: Promise<string> | undefined;
/** /**
* The message (responseJson.ErrorModel.Message) that comes back from the server when a new device verification is required. * The message (responseJson.ErrorModel.Message) that comes back from the server when a new device verification is required.
@ -1733,7 +1734,18 @@ export class ApiService implements ApiServiceAbstraction {
); );
} }
protected async refreshToken(): Promise<string> { // Keep the running refreshTokenPromise to prevent parallel calls.
protected refreshToken(): Promise<string> {
if (this.refreshTokenPromise === undefined) {
this.refreshTokenPromise = this.internalRefreshToken();
void this.refreshTokenPromise.finally(() => {
this.refreshTokenPromise = undefined;
});
}
return this.refreshTokenPromise;
}
private async internalRefreshToken(): Promise<string> {
const refreshToken = await this.tokenService.getRefreshToken(); const refreshToken = await this.tokenService.getRefreshToken();
if (refreshToken != null && refreshToken !== "") { if (refreshToken != null && refreshToken !== "") {
return this.refreshAccessToken(); return this.refreshAccessToken();