From dc6988762890511b57593a0646f65e580adc07d8 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 27 Jul 2018 22:36:25 -0400
Subject: [PATCH] fixes for non-admin actions on org vault list

---
 .../organizations/vault/ciphers.component.ts  |  7 +++++++
 .../vault/collections.component.ts            |  8 ++++++--
 .../organizations/vault/vault.component.html  |  7 ++++++-
 src/app/vault/ciphers.component.ts            | 20 +++++++++++++++----
 src/app/vault/vault.component.html            |  7 ++++++-
 5 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/app/organizations/vault/ciphers.component.ts b/src/app/organizations/vault/ciphers.component.ts
index 8f3561518f..bae26e3ba3 100644
--- a/src/app/organizations/vault/ciphers.component.ts
+++ b/src/app/organizations/vault/ciphers.component.ts
@@ -76,4 +76,11 @@ export class CiphersComponent extends BaseCiphersComponent {
     events(c: CipherView) {
         this.onEventsClicked.emit(c);
     }
+
+    protected deleteCipher(id: string) {
+        if (!this.organization.isAdmin) {
+            return super.deleteCipher(id);
+        }
+        return this.apiService.deleteCipherAdmin(id);
+    }
 }
diff --git a/src/app/organizations/vault/collections.component.ts b/src/app/organizations/vault/collections.component.ts
index 671c45acfc..10abc41b20 100644
--- a/src/app/organizations/vault/collections.component.ts
+++ b/src/app/organizations/vault/collections.component.ts
@@ -51,7 +51,11 @@ export class CollectionsComponent extends BaseCollectionsComponent {
     }
 
     protected saveCollections() {
-        const request = new CipherCollectionsRequest(this.cipherDomain.collectionIds);
-        return this.apiService.putCipherCollectionsAdmin(this.cipherId, request);
+        if (this.organization.isAdmin) {
+            const request = new CipherCollectionsRequest(this.cipherDomain.collectionIds);
+            return this.apiService.putCipherCollectionsAdmin(this.cipherId, request);
+        } else {
+            return super.saveCollections();
+        }
     }
 }
diff --git a/src/app/organizations/vault/vault.component.html b/src/app/organizations/vault/vault.component.html
index 29c8cab587..ecc138fbf4 100644
--- a/src/app/organizations/vault/vault.component.html
+++ b/src/app/organizations/vault/vault.component.html
@@ -7,7 +7,12 @@
         </div>
         <div class="col-9">
             <div class="page-header d-flex">
-                <h1>{{'vault' | i18n}}</h1>
+                <h1>
+                    {{'vault' | i18n}}
+                    <small #actionSpinner [appApiAction]="ciphersComponent.actionPromise">
+                        <i *ngIf="actionSpinner.loading" class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
+                    </small>
+                </h1>
                 <button type="button" class="btn btn-outline-primary btn-sm ml-auto" (click)="addCipher()">
                     <i class="fa fa-plus fa-fw"></i>{{'addItem' | i18n}}
                 </button>
diff --git a/src/app/vault/ciphers.component.ts b/src/app/vault/ciphers.component.ts
index 2baf7a7e36..f987c9b9cd 100644
--- a/src/app/vault/ciphers.component.ts
+++ b/src/app/vault/ciphers.component.ts
@@ -34,6 +34,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnDestroy
     @Output() onCollectionsClicked = new EventEmitter<CipherView>();
 
     cipherType = CipherType;
+    actionPromise: Promise<any>;
 
     private searchPipe: SearchCiphersPipe;
 
@@ -91,6 +92,9 @@ export class CiphersComponent extends BaseCiphersComponent implements OnDestroy
     }
 
     async delete(c: CipherView): Promise<boolean> {
+        if (this.actionPromise != null) {
+            return;
+        }
         const confirmed = await this.platformUtilsService.showDialog(
             this.i18nService.t('deleteItemConfirmation'), this.i18nService.t('deleteItem'),
             this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
@@ -98,10 +102,14 @@ export class CiphersComponent extends BaseCiphersComponent implements OnDestroy
             return false;
         }
 
-        await this.cipherService.deleteWithServer(c.id);
-        this.analytics.eventTrack.next({ action: 'Deleted Cipher' });
-        this.toasterService.popAsync('success', null, this.i18nService.t('deletedItem'));
-        this.refresh();
+        try {
+            this.actionPromise = this.deleteCipher(c.id);
+            await this.actionPromise;
+            this.analytics.eventTrack.next({ action: 'Deleted Cipher' });
+            this.toasterService.popAsync('success', null, this.i18nService.t('deletedItem'));
+            this.refresh();
+        } catch { }
+        this.actionPromise = null;
     }
 
     copy(value: string, typeI18nKey: string, aType: string) {
@@ -114,4 +122,8 @@ export class CiphersComponent extends BaseCiphersComponent implements OnDestroy
         this.toasterService.popAsync('info', null,
             this.i18nService.t('valueCopied', this.i18nService.t(typeI18nKey)));
     }
+
+    protected deleteCipher(id: string) {
+        return this.cipherService.deleteWithServer(id);
+    }
 }
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index 7f1c9a2e15..669af1f687 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -8,7 +8,12 @@
         </div>
         <div class="col-6">
             <div class="page-header d-flex">
-                <h1>{{'myVault' | i18n}}</h1>
+                <h1>
+                    {{'myVault' | i18n}}
+                    <small #actionSpinner [appApiAction]="ciphersComponent.actionPromise">
+                        <i *ngIf="actionSpinner.loading" class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
+                    </small>
+                </h1>
                 <div class="ml-auto d-flex">
                     <div class="dropdown mr-2" appListDropdown>
                         <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="bulkActionsButton" data-toggle="dropdown"