Skip to content

Only do 1 token update a time #7236

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
bramkragten merged 2 commits into from
Oct 6, 2020
Merged

Only do 1 token update a time #7236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63a1ba3
Only do 1 token update a time
bramkragten Oct 5, 2020
bfb9cff
Update external_auth.ts
bramkragten Oct 6, 2020
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
17 changes: 13 additions & 4 deletions src/external_app/external_auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,33 +64,41 @@ export class ExternalAuth extends Auth {
});
}

private _tokenCallbackPromise?: Promise<RefreshTokenResponse>;

public async refreshAccessToken(force?: boolean) {
if (this._tokenCallbackPromise && !force) {
await this._tokenCallbackPromise;
return;
}
const payload: GetExternalAuthPayload = {
callback: CALLBACK_SET_TOKEN,
};
if (force) {
payload.force = true;
}

const callbackPromise = new Promise<RefreshTokenResponse>(
this._tokenCallbackPromise = new Promise<RefreshTokenResponse>(
(resolve, reject) => {
window[CALLBACK_SET_TOKEN] = (success, data) =>
success ? resolve(data) : reject(data);
}
);

await 0;
// we sleep 1 microtask to get the promise to actually set it on the window object.
await Promise.resolve();

if (window.externalApp) {
window.externalApp.getExternalAuth(JSON.stringify(payload));
} else {
window.webkit!.messageHandlers.getExternalAuth.postMessage(payload);
}

const tokens = await callbackPromise;
const tokens = await this._tokenCallbackPromise;

this.data.access_token = tokens.access_token;
this.data.expires = tokens.expires_in * 1000 + Date.now();
this._tokenCallbackPromise = undefined;
}

public async revoke() {
Expand All @@ -101,7 +109,8 @@ export class ExternalAuth extends Auth {
success ? resolve(data) : reject(data);
});

await 0;
// we sleep 1 microtask to get the promise to actually set it on the window object.
await Promise.resolve();

if (window.externalApp) {
window.externalApp.revokeExternalAuth(JSON.stringify(payload));
Expand Down