From 1ecbc0c1b6c8b5b776402543f07260c51e9a2217 Mon Sep 17 00:00:00 2001
From: venbainfotech <bitbucket@venbainfotech.com>
Date: Sat, 12 Feb 2022 16:16:16 +0530
Subject: [PATCH] mail issue fix

---
 ng6-seed/src/app/session/login/login.component.ts | 15 ++++++++-------
 ng6-seed/src/app/session/otp/otp.component.html   |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts
index 903584c..a4fcf56 100755
--- a/ng6-seed/src/app/session/login/login.component.ts
+++ b/ng6-seed/src/app/session/login/login.component.ts
@@ -69,7 +69,8 @@ export class LoginComponent implements OnInit{
  */
   login() {
     const mailid = this.email.split(/\s/).join('');
-    let auth = { 'Username': mailid, 'Password': this.password };
+    const password = this.password.split(/\s/).join('');
+    let auth = { 'Username': mailid, 'Password': password };
     this.loaderService.showMatSpinnerDialog('');
     this.aws.dologin(auth).subscribe(res => {
       // console.log("do login",res)
@@ -96,10 +97,12 @@ export class LoginComponent implements OnInit{
    * @param email password,newpassword
    */
   newpassopen() {
+    const mailid = this.email.split(/\s/).join('');
+    const password = this.password.split(/\s/).join('');
     let dialogRef = this.dialog.open(NewPasswordDialog, this.config);
     dialogRef.afterClosed().subscribe(result => {
       if (result !== undefined) {
-        let auth = { 'Username': this.email, 'Password': this.password, 'newpassword': result };
+        let auth = { 'Username': mailid, 'Password': password, 'newpassword': result };
         this.aws.dologin(auth).subscribe(res => {
          this.getCommonSettings();
           this.router.navigate(['/']);
@@ -128,11 +131,9 @@ export class LoginComponent implements OnInit{
              disableClose: true
            });
           
-        }
-  //       else
-  //       {
-         
-  //       }
+        }else if(data.status == 204){
+          alert(data.msg)
+        } 
        
   });
 
diff --git a/ng6-seed/src/app/session/otp/otp.component.html b/ng6-seed/src/app/session/otp/otp.component.html
index dbe4e39..b341195 100644
--- a/ng6-seed/src/app/session/otp/otp.component.html
+++ b/ng6-seed/src/app/session/otp/otp.component.html
@@ -22,7 +22,7 @@
  
 <div fxFlex="100" align="right">
       <!--<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" mat-dialog-close matTooltip="Close" matTooltipPosition="below"><mat-icon>close</mat-icon></button>-->
-      <button mat-raised-button mat-icon-button (click)="updatepassword(otp.value)" class="mr-1 mb-1 hover-icon" type="button" matTooltip="Update Password" matTooltipPosition="below"><mat-icon>save</mat-icon></button>
+      <button mat-raised-button (click)="updatepassword(otp.value)" class="mr-1 mb-1 hover-icon" type="button" matTooltip="Update Password" matTooltipPosition="below" style="background-color: red;color:#fff;">verify</button>
 </div>               
   
 </mat-dialog-actions>