From 6971c3dca260c1a06d7d1a1093cb2e73e6c9fc96 Mon Sep 17 00:00:00 2001
From: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com>
Date: Wed, 8 Mar 2023 15:50:23 -0500
Subject: [PATCH] [SM-401] Adding the ability to edit service account name
 (#4845)

* Adding the ability to edit service account name

* Update bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html

Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>

* Suggested Updates

* removing unecessary messages

* Adding back messages.json entry, updating API Call

* fix

* Update bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts

Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>

* Update bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/models/requests/service-account-update.request.ts

Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>

* Update bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts

Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>

* Fixing endpoints after Server side change

* changes

* updates

* adding loading notification

* adding description to message

* Update bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Thomas's suggested changes

* reorder list

---------

Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
---
 apps/web/src/locales/en/messages.json         |  8 +++
 .../overview/overview.component.ts            |  1 +
 .../service-account-dialog.component.html     | 15 ++++--
 .../service-account-dialog.component.ts       | 51 ++++++++++++++++---
 .../service-account.service.ts                | 35 +++++++++++++
 .../service-accounts-list.component.html      |  4 ++
 .../service-accounts-list.component.ts        |  1 +
 .../service-accounts.component.html           |  1 +
 .../service-accounts.component.ts             | 12 +++++
 .../shared/new-menu.component.ts              |  1 +
 10 files changed, 118 insertions(+), 11 deletions(-)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 14077394f6..3910581d45 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -5876,6 +5876,10 @@
     "message": "Search service accounts",
     "description": "Placeholder text for searching service accounts."
   },
+  "editServiceAccount":{
+    "message":"Edit service account",
+    "description" : "Title for editing a service account."
+  },
   "addProject": {
     "message": "Add project",
     "description": "Title for creating a new project."
@@ -5933,6 +5937,10 @@
     "message": "Service account created",
     "description": "Notifies that a new service account has been created"
   },
+  "serviceAccountUpdated": {
+    "message": "Service account updated",
+    "description": "Notifies that a service account has been updated"
+  },
   "newSaSelectAccess": {
     "message": "Type or select projects or secrets",
     "description": "Instructions for selecting projects or secrets for a new service account"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
index a9e354202b..8df58782c9 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
@@ -225,6 +225,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
     this.dialogService.open<unknown, ServiceAccountOperation>(ServiceAccountDialogComponent, {
       data: {
         organizationId: this.organizationId,
+        operation: OperationType.Add,
       },
     });
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
index efc8a55f2e..473f901d55 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
@@ -1,11 +1,16 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog dialogSize="small">
-    <ng-container bitDialogTitle>{{ "newServiceAccount" | i18n }}</ng-container>
+    <ng-container bitDialogTitle>{{ title | i18n }}</ng-container>
     <div bitDialogContent>
-      <bit-form-field>
-        <bit-label>{{ "serviceAccountName" | i18n }}</bit-label>
-        <input formControlName="name" bitInput />
-      </bit-form-field>
+      <div *ngIf="loading" class="tw-text-center">
+        <i class="bwi bwi-spinner bwi-spin bwi-3x"></i>
+      </div>
+      <div *ngIf="!loading">
+        <bit-form-field>
+          <bit-label>{{ "serviceAccountName" | i18n }}</bit-label>
+          <input formControlName="name" maxlength="1000" bitInput />
+        </bit-form-field>
+      </div>
     </div>
     <div bitDialogFooter class="tw-flex tw-gap-2">
       <button type="submit" bitButton buttonType="primary" bitFormButton>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
index d998081946..f9ab68fa76 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
@@ -8,8 +8,15 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { ServiceAccountView } from "../../models/view/service-account.view";
 import { ServiceAccountService } from "../service-account.service";
 
+export enum OperationType {
+  Add,
+  Edit,
+}
+
 export interface ServiceAccountOperation {
   organizationId: string;
+  serviceAccountId?: string;
+  operation: OperationType;
 }
 
 @Component({
@@ -21,6 +28,8 @@ export class ServiceAccountDialogComponent {
     name: new FormControl("", [Validators.required]),
   });
 
+  protected loading = false;
+
   constructor(
     public dialogRef: DialogRef,
     @Inject(DIALOG_DATA) private data: ServiceAccountOperation,
@@ -29,6 +38,23 @@ export class ServiceAccountDialogComponent {
     private platformUtilsService: PlatformUtilsService
   ) {}
 
+  async ngOnInit() {
+    if (this.data.operation == OperationType.Edit) {
+      this.loadData();
+    }
+  }
+
+  async loadData() {
+    this.loading = true;
+    const serviceAccount: ServiceAccountView =
+      await this.serviceAccountService.getByServiceAccountId(
+        this.data.serviceAccountId,
+        this.data.organizationId
+      );
+    this.formGroup.patchValue({ name: serviceAccount.name });
+    this.loading = false;
+  }
+
   submit = async () => {
     this.formGroup.markAllAsTouched();
 
@@ -37,12 +63,21 @@ export class ServiceAccountDialogComponent {
     }
 
     const serviceAccountView = this.getServiceAccountView();
-    await this.serviceAccountService.create(this.data.organizationId, serviceAccountView);
-    this.platformUtilsService.showToast(
-      "success",
-      null,
-      this.i18nService.t("serviceAccountCreated")
-    );
+    let serviceAccountMessage: string;
+
+    if (this.data.operation == OperationType.Add) {
+      await this.serviceAccountService.create(this.data.organizationId, serviceAccountView);
+      serviceAccountMessage = this.i18nService.t("serviceAccountCreated");
+    } else {
+      await this.serviceAccountService.update(
+        this.data.serviceAccountId,
+        this.data.organizationId,
+        serviceAccountView
+      );
+      serviceAccountMessage = this.i18nService.t("serviceAccountUpdated");
+    }
+
+    this.platformUtilsService.showToast("success", null, serviceAccountMessage);
     this.dialogRef.close();
   };
 
@@ -52,4 +87,8 @@ export class ServiceAccountDialogComponent {
     serviceAccountView.name = this.formGroup.value.name;
     return serviceAccountView;
   }
+
+  get title() {
+    return this.data.operation === OperationType.Add ? "newServiceAccount" : "editServiceAccount";
+  }
 }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts
index d9abfbf6d2..ba6c71beb1 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts
@@ -40,6 +40,41 @@ export class ServiceAccountService {
     return await this.createServiceAccountViews(organizationId, results.data);
   }
 
+  async getByServiceAccountId(
+    serviceAccountId: string,
+    organizationId: string
+  ): Promise<ServiceAccountView> {
+    const orgKey = await this.getOrganizationKey(organizationId);
+    const r = await this.apiService.send(
+      "GET",
+      "/service-accounts/" + serviceAccountId,
+      null,
+      true,
+      true
+    );
+
+    return await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r));
+  }
+
+  async update(
+    serviceAccountId: string,
+    organizationId: string,
+    serviceAccountView: ServiceAccountView
+  ) {
+    const orgKey = await this.getOrganizationKey(organizationId);
+    const request = await this.getServiceAccountRequest(orgKey, serviceAccountView);
+    const r = await this.apiService.send(
+      "PUT",
+      "/service-accounts/" + serviceAccountId,
+      request,
+      true,
+      true
+    );
+    this._serviceAccount.next(
+      await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r))
+    );
+  }
+
   async create(organizationId: string, serviceAccountView: ServiceAccountView) {
     const orgKey = await this.getOrganizationKey(organizationId);
     const request = await this.getServiceAccountRequest(orgKey, serviceAccountView);
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
index f5ca68a934..ed4c771ada 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
@@ -83,6 +83,10 @@
           <i class="bwi bwi-fw bwi-eye" aria-hidden="true"></i>
           {{ "viewServiceAccount" | i18n }}
         </a>
+        <button type="button" bitMenuItem (click)="editServiceAccountEvent.emit(serviceAccount.id)">
+          <i class="bwi bwi-fw bwi-pencil" aria-hidden="true"></i>
+          {{ "editServiceAccount" | i18n }}
+        </button>
         <button type="button" bitMenuItem (click)="delete(serviceAccount)">
           <i class="bwi bwi-fw bwi-trash tw-text-danger" aria-hidden="true"></i>
           <span class="tw-text-danger">
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
index 7b83e92330..2cb02482f6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
@@ -32,6 +32,7 @@ export class ServiceAccountsListComponent implements OnDestroy {
   @Output() newServiceAccountEvent = new EventEmitter();
   @Output() deleteServiceAccountsEvent = new EventEmitter<ServiceAccountView[]>();
   @Output() onServiceAccountCheckedEvent = new EventEmitter<string[]>();
+  @Output() editServiceAccountEvent = new EventEmitter<string>();
 
   private destroy$: Subject<void> = new Subject<void>();
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.html
index 2c81b394ce..113812a9c8 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.html
@@ -5,6 +5,7 @@
 <sm-service-accounts-list
   [serviceAccounts]="serviceAccounts$ | async"
   (newServiceAccountEvent)="openNewServiceAccountDialog()"
+  (editServiceAccountEvent)="openEditServiceAccountDialog($event)"
   (deleteServiceAccountsEvent)="openDeleteDialog($event)"
   [search]="search"
 ></sm-service-accounts-list>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
index a94c4129b2..4d3f65c862 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
@@ -12,6 +12,7 @@ import {
   ServiceAccountDeleteOperation,
 } from "./dialog/service-account-delete-dialog.component";
 import {
+  OperationType,
   ServiceAccountDialogComponent,
   ServiceAccountOperation,
 } from "./dialog/service-account-dialog.component";
@@ -51,6 +52,17 @@ export class ServiceAccountsComponent implements OnInit {
     this.dialogService.open<unknown, ServiceAccountOperation>(ServiceAccountDialogComponent, {
       data: {
         organizationId: this.organizationId,
+        operation: OperationType.Add,
+      },
+    });
+  }
+
+  openEditServiceAccountDialog(serviceAccountId: string) {
+    this.dialogService.open<unknown, ServiceAccountOperation>(ServiceAccountDialogComponent, {
+      data: {
+        organizationId: this.organizationId,
+        serviceAccountId: serviceAccountId,
+        operation: OperationType.Edit,
       },
     });
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
index 44e206f9a0..7ecc2f917a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
@@ -61,6 +61,7 @@ export class NewMenuComponent implements OnInit, OnDestroy {
     this.dialogService.open<unknown, ServiceAccountOperation>(ServiceAccountDialogComponent, {
       data: {
         organizationId: this.organizationId,
+        operation: OperationType.Add,
       },
     });
   }