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

fixed password ui

Browse source
This commit is contained in:
Danny Coates 2017-12-05 19:41:37 -08:00
parent 7cc94f6829
commit 459499d5f5
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/fileReceiver.js
View file

@ -127,7 +127,9 @@ export default class FileReceiver extends Nanobus {
if (xhr.status === 200) {
return resolve(xhr.response);
}
reject(new Error(xhr.status));
const err = new Error(xhr.status);
err.nonce = nonce;
reject(err);
}
};
xhr.onerror = () => reject(new Error(0));
@ -146,9 +148,11 @@ export default class FileReceiver extends Nanobus {
try {
data = await this.fetchMetadata(nonce);
} catch (e) {
if (e.message === '401') {
if (e.message === '401' && nonce !== e.nonce) {
// allow one retry for changed nonce
data = await this.fetchMetadata(e.nonce);
} else {
throw e;
}
}
const metaKey = await this.metaKeyPromise;
@ -235,8 +239,10 @@ export default class FileReceiver extends Nanobus {
try {
ciphertext = await this.downloadFile(nonce);
} catch (e) {
if (e.message === '401') {
if (e.message === '401' && nonce !== e.nonce) {
ciphertext = await this.downloadFile(e.nonce);
} else {
throw e;
}
}
this.msg = 'decryptingFile';