Merge branch 'dev'

dataswift · Apr 19, 2018 · d811e03 · d811e03
2 parents 8bbaa2d + 8633c15
commit d811e03
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/app/user/login-native/login-native.component.html b/src/app/user/login-native/login-native.component.html
@@ -31,7 +31,11 @@ <h3 class="title-hat-domain">{{ hatDomain }}</h3>
     <label for="hatPass" hidden></label>
     <input id="hatPass" type="password" class="hat-pass-input" name="hat-pass-input"
            placeholder="Enter HAT password" #hatPass
+           (focus)="hideErrorMessage()"
            (keyup.enter)="login(hatPass)"/>
+    <div *ngIf="passwordError" class="error alert alert-danger">
+      Incorrect password. Please try again.
+    </div>
   </div>
 
   <div>

diff --git a/src/app/user/login-native/login-native.component.ts b/src/app/user/login-native/login-native.component.ts
@@ -22,6 +22,7 @@ export class LoginNativeComponent implements OnInit {
   public hatName: string;
   public hatDomain: string;
   public rememberMe: boolean;
+  public passwordError = false;
   public error: string;
   private redirectPath: string;
 
@@ -63,6 +64,10 @@ export class LoginNativeComponent implements OnInit {
     this.location.back();
   }
 
+  hideErrorMessage(): void {
+    this.passwordError = false;
+  }
+
   login(hatPass) {
     this.storageSvc.rememberMe = this.rememberMe;
     this.authSvc.login(this.hatName, hatPass.value).subscribe(
@@ -71,7 +76,7 @@ export class LoginNativeComponent implements OnInit {
       },
       err => {
         console.log('Login failed! Reason: ', err);
-        this.error = 'Incorrect password. Please try again.';
+        this.passwordError = true;
       });
   }