From 1e0bff4dda07eba39d84480879d6be7e040c6959 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:08:59 +0200
Subject: [PATCH] Refactoring

---
 .../user-account-settings.component.ts        | 24 ++---
 .../user-account-settings.html                | 96 +++++++++----------
 .../user-account-settings.scss                |  9 --
 libs/common/src/lib/permissions.ts            |  4 +-
 4 files changed, 58 insertions(+), 75 deletions(-)

diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
index 2b5ac46a2..906bbf0c4 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
@@ -141,7 +141,7 @@ export class UserAccountSettingsComponent implements OnDestroy, OnInit {
 
   public onCloseAccount() {
     const confirmation = confirm(
-      $localize`Do you really want to close your account?`
+      $localize`Do you really want to close your Ghostfolio account?`
     );
 
     const accessToken = this.deleteOwnUserForm.get('accessToken').value;
@@ -149,17 +149,19 @@ export class UserAccountSettingsComponent implements OnDestroy, OnInit {
     if (confirmation) {
       this.dataService
         .deleteOwnUser({ accessToken })
-        .pipe(takeUntil(this.unsubscribeSubject))
-        .subscribe({
-          next: () => {
-            this.tokenStorageService.signOut();
-            this.userService.remove();
-
-            document.location.href = `/${document.documentElement.lang}`;
-          },
-          error: () => {
+        .pipe(
+          catchError(() => {
             alert($localize`Oops! Incorrect Security Token.`);
-          }
+
+            return EMPTY;
+          }),
+          takeUntil(this.unsubscribeSubject)
+        )
+        .subscribe(() => {
+          this.tokenStorageService.signOut();
+          this.userService.remove();
+
+          document.location.href = `/${document.documentElement.lang}`;
         });
     }
   }
diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.html b/apps/client/src/app/components/user-account-settings/user-account-settings.html
index 17b13cf94..fff38a588 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.html
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.html
@@ -233,63 +233,53 @@
         </div>
       </div>
       @if (hasPermissionToDeleteOwnUser) {
-        <hr class="danger-zone-hr" />
-        @if (hasPermissionToDeleteOwnUser) {
-          <form
-            class="w-100"
-            [formGroup]="deleteOwnUserForm"
-            (ngSubmit)="onCloseAccount()"
-          >
-            <div class="align-items-center d-flex mt-4 py-1">
-              <div class="pr-1 w-50 danger-zone-text" i18n>Danger Zone</div>
-              <div class="pl-1 w-50">
-                <mat-form-field
-                  appearance="outline"
-                  class="without-hint w-100"
-                  color="warn"
-                  [hideRequiredMarker]="true"
-                >
-                  <mat-label class="danger-zone-text" i18n
-                    >Security Token</mat-label
-                  >
-                  <input
-                    formControlName="accessToken"
-                    matInput
-                    [type]="isAccessTokenHidden ? 'password' : 'text'"
-                  />
-                  <button
-                    mat-button
-                    matSuffix
-                    type="button"
-                    (click)="isAccessTokenHidden = !isAccessTokenHidden"
-                  >
-                    <ion-icon
-                      [name]="
-                        isAccessTokenHidden ? 'eye-outline' : 'eye-off-outline'
-                      "
-                    />
-                  </button>
-                </mat-form-field>
-              </div>
-            </div>
-
-            <div class="align-items-center d-flex py-1">
-              <div class="pr-1 w-50"></div>
-              <div class="pl-1 w-50">
+        <hr class="mt-5" />
+        <form
+          class="w-100"
+          [formGroup]="deleteOwnUserForm"
+          (ngSubmit)="onCloseAccount()"
+        >
+          <div class="d-flex py-1">
+            <div class="pr-1 text-danger w-50" i18n>Danger Zone</div>
+            <div class="pl-1 w-50">
+              <mat-form-field
+                appearance="outline"
+                class="without-hint w-100"
+                [hideRequiredMarker]="true"
+              >
+                <mat-label i18n>Security Token</mat-label>
+                <input
+                  formControlName="accessToken"
+                  matInput
+                  [type]="isAccessTokenHidden ? 'password' : 'text'"
+                />
                 <button
-                  color="warn"
-                  mat-flat-button
-                  type="submit"
-                  [disabled]="
-                    !(deleteOwnUserForm.dirty && deleteOwnUserForm.valid)
-                  "
+                  mat-button
+                  matSuffix
+                  type="button"
+                  (click)="isAccessTokenHidden = !isAccessTokenHidden"
                 >
-                  <span i18n>Close Account</span>
+                  <ion-icon
+                    [name]="
+                      isAccessTokenHidden ? 'eye-outline' : 'eye-off-outline'
+                    "
+                  />
                 </button>
-              </div>
+              </mat-form-field>
+              <button
+                class="mt-2"
+                color="warn"
+                mat-flat-button
+                type="submit"
+                [disabled]="
+                  !(deleteOwnUserForm.dirty && deleteOwnUserForm.valid)
+                "
+              >
+                <span i18n>Close Account</span>
+              </button>
             </div>
-          </form>
-        }
+          </div>
+        </form>
       }
     </div>
   </div>
diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.scss b/apps/client/src/app/components/user-account-settings/user-account-settings.scss
index 684f26ec7..22555407a 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.scss
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.scss
@@ -15,15 +15,6 @@
     font-size: 90%;
     line-height: 1.2;
   }
-
-  .danger-zone {
-    &-text {
-      color: rgba(var(--palette-warn-500), 1);
-    }
-    &-hr {
-      background-color: rgba(var(--palette-warn-500), 1);
-    }
-  }
 }
 
 :host-context(.is-dark-theme) {
diff --git a/libs/common/src/lib/permissions.ts b/libs/common/src/lib/permissions.ts
index ba4ceab3c..304c8ba24 100644
--- a/libs/common/src/lib/permissions.ts
+++ b/libs/common/src/lib/permissions.ts
@@ -17,10 +17,10 @@ export const permissions = {
   deleteAccountBalance: 'deleteAcccountBalance',
   deleteAuthDevice: 'deleteAuthDevice',
   deleteOrder: 'deleteOrder',
+  deleteOwnUser: 'deleteOwnUser',
   deletePlatform: 'deletePlatform',
   deleteTag: 'deleteTag',
   deleteUser: 'deleteUser',
-  deleteOwnUser: 'deleteOwnUser',
   enableFearAndGreedIndex: 'enableFearAndGreedIndex',
   enableImport: 'enableImport',
   enableBlog: 'enableBlog',
@@ -58,10 +58,10 @@ export function getPermissions(aRole: Role): string[] {
         permissions.deleteAccount,
         permissions.deleteAuthDevice,
         permissions.deleteOrder,
+        permissions.deleteOwnUser,
         permissions.deletePlatform,
         permissions.deleteTag,
         permissions.deleteUser,
-        permissions.deleteOwnUser,
         permissions.updateAccount,
         permissions.updateAuthDevice,
         permissions.updateOrder,