From 873c35fbd439a43b600ea1712de42b8f1e615e79 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Thu, 30 Mar 2023 16:51:31 +0200
Subject: [PATCH] [SM-574] Hide edit/delete when user only has read access
 (#4941)

* Hide edit/delete when user only has read access

* Wire up read/write for secret response

* Remove variable

* Resolve changes after merge

* SM-671: Fix small bug in sm/SM-574 branch to pass secret instead of secret id on deletion (#5096)

---------

Co-authored-by: Colton Hurst <colton@coltonhurst.com>
---
 .../models/view/secret-list.view.ts                |  2 ++
 .../app/secrets-manager/models/view/secret.view.ts |  3 +++
 .../secrets/dialog/secret-dialog.component.html    |  9 ++++++++-
 .../secrets/dialog/secret-dialog.component.ts      |  7 ++++++-
 .../secrets/responses/secret-list-item.response.ts |  4 ++++
 .../secrets/responses/secret.response.ts           |  7 +++++++
 .../app/secrets-manager/secrets/secret.service.ts  |  6 ++++++
 .../shared/secrets-list.component.html             | 14 ++++++++++++--
 .../src/async-actions/form-button.directive.ts     |  5 ++++-
 9 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/models/view/secret-list.view.ts b/bitwarden_license/bit-web/src/app/secrets-manager/models/view/secret-list.view.ts
index d4471364fb4..a8c4ea51c38 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/models/view/secret-list.view.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/models/view/secret-list.view.ts
@@ -7,4 +7,6 @@ export class SecretListView {
   creationDate: string;
   revisionDate: string;
   projects: SecretProjectView[];
+  read: boolean;
+  write: boolean;
 }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/models/view/secret.view.ts b/bitwarden_license/bit-web/src/app/secrets-manager/models/view/secret.view.ts
index 1604bdfe761..f08a639a590 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/models/view/secret.view.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/models/view/secret.view.ts
@@ -9,4 +9,7 @@ export class SecretView {
   creationDate: string;
   revisionDate: string;
   projects: SecretProjectView[];
+
+  read: boolean;
+  write: boolean;
 }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
index ee46922ac9d..f511123f6f2 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
@@ -39,7 +39,14 @@
       <button type="submit" bitButton buttonType="primary" bitFormButton>
         {{ "save" | i18n }}
       </button>
-      <button type="button" bitButton buttonType="secondary" bitFormButton bitDialogClose>
+      <button
+        type="button"
+        bitButton
+        buttonType="secondary"
+        bitFormButton
+        bitDialogClose
+        [disabled]="false"
+      >
         {{ "cancel" | i18n }}
       </button>
       <button
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
index f834be25aaa..f05a45b2d0f 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
@@ -44,6 +44,7 @@ export class SecretDialogComponent implements OnInit {
   projects: ProjectListView[];
 
   private destroy$ = new Subject<void>();
+
   constructor(
     public dialogRef: DialogRef,
     @Inject(DIALOG_DATA) private data: SecretOperation,
@@ -80,8 +81,12 @@ export class SecretDialogComponent implements OnInit {
       notes: secret.note,
       project: secret.projects[0]?.id ?? "",
     });
+
     this.loading = false;
-    this.formGroup.enable();
+
+    if (secret.write) {
+      this.formGroup.enable();
+    }
   }
 
   ngOnDestroy(): void {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/responses/secret-list-item.response.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/responses/secret-list-item.response.ts
index bfac1dfe75d..bc2bab98150 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/responses/secret-list-item.response.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/responses/secret-list-item.response.ts
@@ -9,6 +9,8 @@ export class SecretListItemResponse extends BaseResponse {
   creationDate: string;
   revisionDate: string;
   projects: SecretProjectResponse[];
+  read: boolean;
+  write: boolean;
 
   constructor(response: any) {
     super(response);
@@ -17,6 +19,8 @@ export class SecretListItemResponse extends BaseResponse {
     this.name = this.getResponseProperty("Key");
     this.creationDate = this.getResponseProperty("CreationDate");
     this.revisionDate = this.getResponseProperty("RevisionDate");
+    this.read = this.getResponseProperty("Read");
+    this.write = this.getResponseProperty("Write");
 
     const project = this.getResponseProperty("projects");
     this.projects = project == null ? null : project.map((k: any) => new SecretProjectResponse(k));
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/responses/secret.response.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/responses/secret.response.ts
index 9296c3d8697..c9965ec8c52 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/responses/secret.response.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/responses/secret.response.ts
@@ -10,6 +10,10 @@ export class SecretResponse extends BaseResponse {
   note: string;
   creationDate: string;
   revisionDate: string;
+
+  read: boolean;
+  write: boolean;
+
   projects: SecretProjectResponse[];
 
   constructor(response: any) {
@@ -22,6 +26,9 @@ export class SecretResponse extends BaseResponse {
     this.creationDate = this.getResponseProperty("CreationDate");
     this.revisionDate = this.getResponseProperty("RevisionDate");
 
+    this.read = this.getResponseProperty("Read");
+    this.write = this.getResponseProperty("Write");
+
     const projects = this.getResponseProperty("Projects");
     this.projects =
       projects == null ? null : projects.map((k: any) => new SecretProjectResponse(k));
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts
index 107bd9a736e..3d63368bae5 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts
@@ -176,6 +176,9 @@ export class SecretService {
     secretView.value = value;
     secretView.note = note;
 
+    secretView.read = secretResponse.read;
+    secretView.write = secretResponse.write;
+
     if (secretResponse.projects != null) {
       secretView.projects = await this.decryptProjectsMappedToSecrets(
         orgKey,
@@ -214,6 +217,9 @@ export class SecretService {
           projectIds.includes(p.id)
         );
 
+        secretListView.read = s.read;
+        secretListView.write = s.write;
+
         return secretListView;
       })
     );
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
index 10691b2120c..572f1a8049a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
@@ -98,7 +98,12 @@
       </td>
 
       <bit-menu #secretMenu>
-        <button type="button" bitMenuItem (click)="editSecretEvent.emit(secret.id)" *ngIf="!trash">
+        <button
+          type="button"
+          bitMenuItem
+          (click)="editSecretEvent.emit(secret.id)"
+          *ngIf="secret.write && !trash"
+        >
           <i class="bwi bwi-fw bwi-pencil" aria-hidden="true"></i>
           {{ "editSecret" | i18n }}
         </button>
@@ -129,7 +134,12 @@
           <i class="bwi bwi-fw bwi-refresh" aria-hidden="true"></i>
           {{ "restoreSecret" | i18n }}
         </button>
-        <button type="button" bitMenuItem (click)="deleteSecretsEvent.emit([secret])">
+        <button
+          type="button"
+          bitMenuItem
+          (click)="deleteSecretsEvent.emit([secret])"
+          *ngIf="secret.write"
+        >
           <i class="bwi bwi-fw bwi-trash tw-text-danger" aria-hidden="true"></i>
           <span class="tw-text-danger">{{
             (trash ? "permanentlyDelete" : "deleteSecret") | i18n
diff --git a/libs/components/src/async-actions/form-button.directive.ts b/libs/components/src/async-actions/form-button.directive.ts
index a21dea00f78..9a390eff303 100644
--- a/libs/components/src/async-actions/form-button.directive.ts
+++ b/libs/components/src/async-actions/form-button.directive.ts
@@ -28,6 +28,7 @@ export class BitFormButtonDirective implements OnDestroy {
   private destroy$ = new Subject<void>();
 
   @Input() type: string;
+  @Input() disabled?: boolean;
 
   constructor(
     buttonComponent: ButtonLikeAbstraction,
@@ -44,7 +45,9 @@ export class BitFormButtonDirective implements OnDestroy {
       });
 
       submitDirective.disabled$.pipe(takeUntil(this.destroy$)).subscribe((disabled) => {
-        buttonComponent.disabled = disabled;
+        if (this.disabled !== false) {
+          buttonComponent.disabled = disabled;
+        }
       });
     }