Include encrypt in formPromise (#368)

* Include encrypt in formPromise (cherry picked from commit e2cb9b6)
bitwarden · May 5, 2021 · ab333db · ab333db
1 parent 96e6dc8
commit ab333db
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/src/angular/components/send/add-edit.component.ts b/src/angular/components/send/add-edit.component.ts
@@ -298,27 +298,30 @@ export class AddEditComponent implements OnInit {
             this.password = null;
         }
 
-        const encSend = await this.encryptSend(file);
-        try {
-            this.formPromise = this.sendService.saveWithServer(encSend);
-            let inactive = false;
-            setTimeout(() => inactive = true, 4500);
-            await this.formPromise;
-            if (this.send.id == null) {
-                this.send.id = encSend[0].id;
-            }
-            if (this.send.accessId == null) {
-                this.send.accessId = encSend[0].accessId;
-            }
-            this.onSavedSend.emit(this.send);
-            await this.showSuccessMessage(inactive);
-            if (this.copyLink) {
-                this.copyLinkToClipboard(this.link);
-            }
-            return true;
-        } catch { }
-
-        return false;
+        this.formPromise = this.encryptSend(file)
+            .then(async encSend => {
+                try {
+                    const uploadPromise = this.sendService.saveWithServer(encSend);
+                    let inactive = false;
+                    setTimeout(() => inactive = true, 4500);
+                    await uploadPromise;
+                    if (this.send.id == null) {
+                        this.send.id = encSend[0].id;
+                    }
+                    if (this.send.accessId == null) {
+                        this.send.accessId = encSend[0].accessId;
+                    }
+                    this.onSavedSend.emit(this.send);
+                    await this.showSuccessMessage(inactive);
+                    if (this.copyLink) {
+                        this.copyLinkToClipboard(this.link);
+                    }
+                    return true;
+                } catch { }
+                return false;
+            });
+
+        return await this.formPromise;
     }
 
     async showSuccessMessage(inactive: boolean) {