From fc04d67b9e2e52f17d9417e418e23d46259996a5 Mon Sep 17 00:00:00 2001
From: undsoft <undsoft@gmail.com>
Date: Mon, 6 Jan 2025 18:33:18 -0500
Subject: [PATCH] NAS-132661: Move 2FA text

---
 .../signin-form/signin-form.component.html    |  4 ++++
 .../signin-form/signin-form.component.ts      | 20 +++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/signin/signin-form/signin-form.component.html b/src/app/pages/signin/signin-form/signin-form.component.html
index f3da2c2b7a1..09ae43720ef 100644
--- a/src/app/pages/signin/signin-form/signin-form.component.html
+++ b/src/app/pages/signin/signin-form/signin-form.component.html
@@ -39,6 +39,10 @@
     }
   }
   @if (hasTwoFactor) {
+    <p>
+      {{ '2FA has been configured for this account. Enter the OTP to continue.' | translate }}
+    </p>
+
     <ix-input
       formControlName="otp"
       autocomplete="one-time-code"
diff --git a/src/app/pages/signin/signin-form/signin-form.component.ts b/src/app/pages/signin/signin-form/signin-form.component.ts
index f8ab6585e58..c774a604343 100644
--- a/src/app/pages/signin/signin-form/signin-form.component.ts
+++ b/src/app/pages/signin/signin-form/signin-form.component.ts
@@ -138,17 +138,15 @@ export class SigninFormComponent implements OnInit {
   private handleFailedLogin(loginResult: LoginResult): void {
     this.isLastLoginAttemptFailed = true;
 
-    switch (loginResult) {
-      case LoginResult.NoAccess:
-        this.lastLoginError = this.translate.instant('User is lacking permissions to access WebUI.');
-        break;
-      case LoginResult.NoOtp:
-        this.hasTwoFactor = true;
-        this.lastLoginError = this.translate.instant('2FA has been configured for this account. Enter the OTP to continue.');
-        break;
-      default:
-        this.lastLoginError = this.translate.instant('Wrong username or password. Please try again.');
-        break;
+    if (loginResult === LoginResult.NoOtp) {
+      this.hasTwoFactor = true;
+      return;
+    }
+
+    if (loginResult === LoginResult.NoAccess) {
+      this.lastLoginError = this.translate.instant('User is lacking permissions to access WebUI.');
+    } else {
+      this.lastLoginError = this.translate.instant('Wrong username or password. Please try again.');
     }
 
     this.cdr.markForCheck();