Skip to content

Force refresh tokens if external app #4461

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
balloob merged 1 commit into from
Jan 13, 2020
Merged

Force refresh tokens if external app #4461

Show file tree
Hide file tree
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: 6 additions & 2 deletions src/entrypoints/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ const connProm = async (auth) => {
throw err;
}
// We can get invalid auth if auth tokens were stored that are no longer valid
// Clear stored tokens.
if (!isExternal) {
if (isExternal) {
// Tell the external app to force refresh the access tokens.
// This should trigger their unauthorized handling.
await auth.refreshAccessToken(true);
} else {
// Clear stored tokens.
saveTokens(null);
}
auth = await authProm();
Expand Down
29 changes: 17 additions & 12 deletions src/external_app/external_auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ interface BasePayload {
callback: string;
}

interface GetExternalAuthPayload extends BasePayload {
force?: boolean;
}

interface RefreshTokenResponse {
access_token: string;
expires_in: number;
Expand All @@ -26,7 +30,7 @@ declare global {
webkit?: {
messageHandlers: {
getExternalAuth: {
postMessage(payload: BasePayload);
postMessage(payload: GetExternalAuthPayload);
};
revokeExternalAuth: {
postMessage(payload: BasePayload);
Expand Down Expand Up @@ -60,8 +64,13 @@ class ExternalAuth extends Auth {
});
}

public async refreshAccessToken() {
const callbackPayload = { callback: CALLBACK_SET_TOKEN };
public async refreshAccessToken(force?: boolean) {
const payload: GetExternalAuthPayload = {
callback: CALLBACK_SET_TOKEN,
};
if (force) {
payload.force = true;
}

const callbackPromise = new Promise<RefreshTokenResponse>(
(resolve, reject) => {
Expand All @@ -73,11 +82,9 @@ class ExternalAuth extends Auth {
await 0;

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

const tokens = await callbackPromise;
Expand All @@ -87,7 +94,7 @@ class ExternalAuth extends Auth {
}

public async revoke() {
const callbackPayload = { callback: CALLBACK_REVOKE_TOKEN };
const payload: BasePayload = { callback: CALLBACK_REVOKE_TOKEN };

const callbackPromise = new Promise((resolve, reject) => {
window[CALLBACK_REVOKE_TOKEN] = (success, data) =>
Expand All @@ -97,11 +104,9 @@ class ExternalAuth extends Auth {
await 0;

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

await callbackPromise;
Expand Down