diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 591ddd9b..a816bef3 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -38,7 +38,7 @@ import * as CryptoJS from 'crypto-js'; export class loginContentClass implements OnInit { model: any = {}; userID: any; - password: any; + code: any; serviceProviderID: any; status: any; dynamictype: any = 'password'; @@ -139,8 +139,8 @@ export class loginContentClass implements OnInit { return salt + iv + ciphertext; } - login(userId: any, password: any, doLogout) { - this.encryptPassword = this.encrypt(this.Key_IV, password) + login(userId: any, tempCode: any, doLogout) { + this.encryptPassword = this.encrypt(this.Key_IV, tempCode) if (userId.toLowerCase() === 'SUPERADMIN'.toLowerCase()) { // this.loginservice.superAdminAuthenticate(userId, password, doLogout) diff --git a/src/app/login/login.html b/src/app/login/login.html index d25ad15a..170dc6e2 100644 --- a/src/app/login/login.html +++ b/src/app/login/login.html @@ -61,7 +61,7 @@
Logo
-
@@ -80,7 +80,7 @@
- + diff --git a/src/app/reset-user-password/reset-user-password.component.html b/src/app/reset-user-password/reset-user-password.component.html index 49a40fe6..34f27a59 100644 --- a/src/app/reset-user-password/reset-user-password.component.html +++ b/src/app/reset-user-password/reset-user-password.component.html @@ -40,7 +40,7 @@

Reset User Password

- Password is required @@ -49,6 +49,6 @@

Reset User Password

- +
\ No newline at end of file diff --git a/src/app/reset-user-password/reset-user-password.component.ts b/src/app/reset-user-password/reset-user-password.component.ts index 70b44509..68cb029b 100644 --- a/src/app/reset-user-password/reset-user-password.component.ts +++ b/src/app/reset-user-password/reset-user-password.component.ts @@ -36,7 +36,7 @@ export class ResetUserPasswordComponent implements OnInit { /*NgModel*/ serviceProviderID: any; user: any; - password: any; + code: any; /*Arrays*/ userNamesList: any = []; @@ -141,13 +141,13 @@ export class ResetUserPasswordComponent implements OnInit { /*Reset Password*/ - resetPassword(userName, password) { + resetPassword(userName, code) { let resetObj = { "userName": userName, - "password": this.encrypt(this.Key_IV, password), + "password": this.encrypt(this.Key_IV, code), // "password": password, // this.encryptPassword = this.encrypt(this.Key_IV, password) - //"statusID": 1 + //"statusID": 1 } console.log("resetObj", resetObj); this.resetUserPasswordService.resetUserPassword(resetObj) @@ -155,7 +155,7 @@ export class ResetUserPasswordComponent implements OnInit { this.alertService.alert(response.response); this.tableMode = false; this.user = null; - this.password = null; + this.code = null; this.userDetails = null; }, err => { console.log('Error', err);