open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP: don't revoke google token, add TokenError

Browse Source
This commit is contained in:
eight04 2021-12-08 20:18:42 +08:00
parent e23077a7ea
commit 28a70605e5
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
background/token-manager.js
View File

@ -32,10 +32,11 @@ const tokenMan = (() => {
}, },
tokenURL: 'https://oauth2.googleapis.com/token', tokenURL: 'https://oauth2.googleapis.com/token',
scopes: ['https://www.googleapis.com/auth/drive.appdata'], scopes: ['https://www.googleapis.com/auth/drive.appdata'],
revoke: token => { // FIXME: https://github.com/openstyles/stylus/issues/1248
const params = {token}; // revoke: token => {
return postQuery(`https://accounts.google.com/o/oauth2/revoke?${new URLSearchParams(params)}`); // const params = {token};
}, // return postQuery(`https://accounts.google.com/o/oauth2/revoke?${new URLSearchParams(params)}`);
// },
}, },
onedrive: { onedrive: {
flow: 'code', flow: 'code',
@ -91,7 +92,7 @@ const tokenMan = (() => {
} }
} }
if (!interactive) { if (!interactive) {
throw new Error(`Invalid token: ${name}`); throw new TokenError(name, 'Token is missing');
} }
return authUser(k, name, interactive, hooks); return authUser(k, name, interactive, hooks);
}, },
@ -111,9 +112,20 @@ const tokenMan = (() => {
}, },
}; };
class TokenError extends Error {
constructor(provider, message) {
super(`[${provider}] ${message}`);
this.name = 'TokenError';
this.provider = provider;
if (Error.captureStackTrace) {
Error.captureStackTrace(this, TokenError);
}
}
}
async function refreshToken(name, k, obj) { async function refreshToken(name, k, obj) {
if (!obj[k.REFRESH]) { if (!obj[k.REFRESH]) {
throw new Error('No refresh token'); throw new TokenError(name, 'No refresh token');
} }
const provider = AUTH[name]; const provider = AUTH[name];
const body = { const body = {
@ -179,7 +191,7 @@ const tokenMan = (() => {
new URL(finalUrl).search.slice(1) new URL(finalUrl).search.slice(1)
); );
if (params.get('state') !== state) { if (params.get('state') !== state) {
throw new Error(`Unexpected state: ${params.get('state')}, expected: ${state}`); throw new TokenError(name, `Unexpected state: ${params.get('state')}, expected: ${state}`);
} }
let result; let result;
if (provider.flow === 'token') { if (provider.flow === 'token') {