From b1da8975f5c564b12a80cb10d59f81721277953b Mon Sep 17 00:00:00 2001
From: Max Peintner <max@caos.ch>
Date: Fri, 10 Jun 2022 14:59:52 +0200
Subject: [PATCH] fix(console): configWithPrompt cleanup (#3796)

* fix: configWithPrompt cleanup

* code dialog text

Co-authored-by: Livio Spring <livio.a@gmail.com>
---
 console/src/app/guards/auth.guard.ts              |  7 +++----
 .../accounts-card/accounts-card.component.ts      | 10 ++++------
 .../code-dialog/code-dialog.component.html        | 15 ++++++++-------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/console/src/app/guards/auth.guard.ts b/console/src/app/guards/auth.guard.ts
index 31a3600d8..084475bb9 100644
--- a/console/src/app/guards/auth.guard.ts
+++ b/console/src/app/guards/auth.guard.ts
@@ -21,11 +21,10 @@ export class AuthGuard implements CanActivate {
         const hint = route.queryParams['login_hint'];
         const configWithPrompt: Partial<AuthConfig> = {
           customQueryParams: {
-            // prompt: 'select_account',
-          } as any,
+            login_hint: hint,
+          },
         };
-        (configWithPrompt as any).customQueryParams['login_hint'] = hint;
-        console.log('auth', hint);
+        console.log(`authenticate with login_hint: ${hint}`);
         this.auth.authenticate(configWithPrompt);
       } else {
         return this.auth.authenticate();
diff --git a/console/src/app/modules/accounts-card/accounts-card.component.ts b/console/src/app/modules/accounts-card/accounts-card.component.ts
index 654e6d7aa..e8d5ee3b5 100644
--- a/console/src/app/modules/accounts-card/accounts-card.component.ts
+++ b/console/src/app/modules/accounts-card/accounts-card.component.ts
@@ -50,15 +50,13 @@ export class AccountsCardComponent implements OnInit {
     }
   }
 
-  public selectAccount(loginHint?: string): void {
+  public selectAccount(loginHint: string): void {
     const configWithPrompt: Partial<AuthConfig> = {
       customQueryParams: {
-        // prompt: 'select_account',
-      } as any,
+        login_hint: loginHint,
+      },
     };
-    if (loginHint) {
-      (configWithPrompt as any).customQueryParams['login_hint'] = loginHint;
-    }
+    (configWithPrompt as any).customQueryParams['login_hint'] = loginHint;
     this.authService.authenticate(configWithPrompt);
   }
 
diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/code-dialog/code-dialog.component.html b/console/src/app/pages/users/user-detail/auth-user-detail/code-dialog/code-dialog.component.html
index 82d0babca..f23582f39 100644
--- a/console/src/app/pages/users/user-detail/auth-user-detail/code-dialog/code-dialog.component.html
+++ b/console/src/app/pages/users/user-detail/auth-user-detail/code-dialog/code-dialog.component.html
@@ -1,7 +1,9 @@
 <h1 mat-dialog-title>
-  <span>{{'USER.CODEDIALOG.TITLE' | translate}} {{data?.number}}</span>
+  <span
+    >{{ 'USER.CODEDIALOG.TITLE' | translate }} <span *ngIf="data?.number.phone">{{ data.number.phone }}</span></span
+  >
 </h1>
-<p class="desc cnsl-secondary-text">{{'USER.CODEDIALOG.DESCRIPTION' | translate}}</p>
+<p class="desc cnsl-secondary-text">{{ 'USER.CODEDIALOG.DESCRIPTION' | translate }}</p>
 <div mat-dialog-content>
   <cnsl-form-field class="formfield">
     <cnsl-label>{{ 'USER.CODEDIALOG.CODE' | translate }}</cnsl-label>
@@ -10,11 +12,10 @@
 </div>
 <div mat-dialog-actions class="action">
   <button color="primary" mat-stroked-button class="ok-button" (click)="closeDialog()">
-    {{'ACTIONS.CLOSE' | translate}}
+    {{ 'ACTIONS.CLOSE' | translate }}
   </button>
 
-  <button [disabled]="!code" cdkFocusInitial color="primary" mat-raised-button class="ok-button"
-    (click)="closeDialog(code)">
-    {{'ACTIONS.OK' | translate}}
+  <button [disabled]="!code" cdkFocusInitial color="primary" mat-raised-button class="ok-button" (click)="closeDialog(code)">
+    {{ 'ACTIONS.OK' | translate }}
   </button>
-</div>
\ No newline at end of file
+</div>