dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor style tweaks and refresh token fixes

Browse source 
Co-authored-by: timvisee <tim@visee.me>
This commit is contained in:
Danny Coates 2020-07-24 22:04:42 -07:00 • committed by timvisee
parent 4f273eca03
commit abc58518ea
No known key found for this signature in database
GPG key ID: B8DB720BC383E172
3 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/user.js
View file

@ -219,12 +219,17 @@ export default class User {
refresh_token: this.refreshToken
})
});
const auth = await tokenResponse.json();
this.info.access_token = auth.access_token;
return true;
if (tokenResponse.ok) {
const auth = await tokenResponse.json();
const info = { ...this.info, access_token: auth.access_token };
this.info = info;
return true;
}
} catch (e) {
return false;
console.error(e);
}
await this.logout();
return false;
}
async logout() {
@ -268,29 +273,24 @@ export default class User {
const key = b64ToArray(this.info.fileListKey);
const sha = await crypto.subtle.digest('SHA-256', key);
const kid = arrayToB64(new Uint8Array(sha)).substring(0, 16);
async function retry(e) {
if (e.message === '401') {
const refreshed = await this.refresh();
if (refreshed) {
return await this.syncFileList();
} else {
await this.logout();
return { incoming: true };
}
const retry = async () => {
const refreshed = await this.refresh();
if (refreshed) {
return await this.syncFileList();
} else {
return { incoming: true };
}
}
};
try {
const encrypted = await getFileList(
this.bearerToken,
this.refreshToken,
kid
);
const encrypted = await getFileList(this.bearerToken, kid);
const decrypted = await streamToArrayBuffer(
decryptStream(blobStream(encrypted), key)
);
list = JSON.parse(textDecoder.decode(decrypted));
} catch (e) {
return retry(e);
if (e.message === '401') {
return retry(e);
}
}
changes = await this.storage.merge(list);
if (!changes.outgoing) {
@ -303,9 +303,11 @@ export default class User {
const encrypted = await streamToArrayBuffer(
encryptStream(blobStream(blob), key)
);
await setFileList(this.bearerToken, this.refreshToken, kid, encrypted);
await setFileList(this.bearerToken, kid, encrypted);
} catch (e) {
return retry(e);
if (e.message === '401') {
return retry(e);
}
}
return changes;
}