Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects Releases Wiki Activity

Reject form promises for proper error handling (#371)

Browse Source
This commit is contained in:
Matt Gibson 2021-05-10 09:43:57 -05:00 committed by GitHub
parent 1b8f6aace2
commit 2750ca7586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/angular/components/send/add-edit.component.ts
View File

@ -301,28 +301,28 @@ export class AddEditComponent implements OnInit {
this.formPromise = this.encryptSend(file) this.formPromise = this.encryptSend(file)
.then(async encSend => { .then(async encSend => {
try { const uploadPromise = this.sendService.saveWithServer(encSend);
const uploadPromise = this.sendService.saveWithServer(encSend); let inactive = false;
let inactive = false; setTimeout(() => inactive = true, 4500);
setTimeout(() => inactive = true, 4500); await uploadPromise;
await uploadPromise; if (this.send.id == null) {
if (this.send.id == null) { this.send.id = encSend[0].id;
this.send.id = encSend[0].id; }
} if (this.send.accessId == null) {
if (this.send.accessId == null) { this.send.accessId = encSend[0].accessId;
this.send.accessId = encSend[0].accessId; }
} this.onSavedSend.emit(this.send);
this.onSavedSend.emit(this.send); await this.showSuccessMessage(inactive);
await this.showSuccessMessage(inactive); if (this.copyLink) {
if (this.copyLink) { this.copyLinkToClipboard(this.link);
this.copyLinkToClipboard(this.link); }
}
return true;
} catch { }
return false;
}); });
return await this.formPromise; try {
await this.formPromise;
return true;
} catch { }
return false;
} }
async showSuccessMessage(inactive: boolean) { async showSuccessMessage(inactive: boolean) {