From 0a826be17e5710f42c7475ea1ac8c348c576f02e Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 15 Jul 2023 21:47:04 +0200
Subject: [PATCH] Refactoring

---
 .../login-with-access-token-dialog.component.ts | 14 +++++++-------
 .../login-with-access-token-dialog.html         | 17 ++++++++++++-----
 .../login-with-access-token-dialog.scss         | 11 -----------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.component.ts b/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.component.ts
index 9799aa940..b3236b2be 100644
--- a/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.component.ts
+++ b/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.component.ts
@@ -16,7 +16,7 @@ import { TokenStorageService } from '@ghostfolio/client/services/token-storage.s
   templateUrl: 'login-with-access-token-dialog.html'
 })
 export class LoginWithAccessTokenDialog {
-  public hide = true;
+  public isAccessTokenHidden = true;
 
   public constructor(
     @Inject(MAT_DIALOG_DATA) public data: any,
@@ -40,6 +40,12 @@ export class LoginWithAccessTokenDialog {
     this.dialogRef.close();
   }
 
+  public onLoginWithAccessToken() {
+    if (this.data.accessToken) {
+      this.dialogRef.close(this.data);
+    }
+  }
+
   public async onLoginWithInternetIdentity() {
     try {
       const { authToken } = await this.internetIdentityService.login();
@@ -49,10 +55,4 @@ export class LoginWithAccessTokenDialog {
       this.router.navigate(['/']);
     } catch {}
   }
-
-  public onSubmit() {
-    if (this.data.accessToken) {
-      this.dialogRef.close(this.data);
-    }
-  }
 }
diff --git a/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html b/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html
index d4237afe1..080ad4428 100644
--- a/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html
+++ b/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html
@@ -6,18 +6,25 @@
 
 <div class="py-3" mat-dialog-content>
   <div class="align-items-center d-flex flex-column">
-    <form id="login" class="display-contents" (ngSubmit)="onSubmit()">
+    <form class="w-100" (ngSubmit)="onLoginWithAccessToken()">
       <mat-form-field appearance="outline" class="without-hint w-100">
         <mat-label i18n>Security Token</mat-label>
         <input
           matInput
-          [type]="hide ? 'password' : 'text'"
           name="password"
+          [type]="isAccessTokenHidden ? 'password' : 'text'"
           [(ngModel)]="data.accessToken"
         />
-        <div id="hide-password" matSuffix (click)="hide = !hide">
-          <ion-icon name="{{hide ? 'eye-outline' : 'eye-off-outline'}}"></ion-icon>
-        </div>
+        <button
+          mat-button
+          matSuffix
+          type="button"
+          (click)="isAccessTokenHidden = !isAccessTokenHidden"
+        >
+          <ion-icon
+            [name]="isAccessTokenHidden ? 'eye-outline' : 'eye-off-outline'"
+          ></ion-icon>
+        </button>
       </mat-form-field>
     </form>
     <ng-container *ngIf="data.hasPermissionToUseSocialLogin">
diff --git a/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.scss b/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.scss
index abbe726c5..5d4e87f30 100644
--- a/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.scss
+++ b/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.scss
@@ -1,14 +1,3 @@
 :host {
   display: block;
-
-  .display-contents {
-    display: contents;
-  }
-
-  #hide-password {
-    padding: 10px;
-    min-height: 44px;
-    display: flex;
-    align-items: center;
-  }
 }