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 @@
- +