diff --git a/src/app/user-management/change-password/change-password.component.ts b/src/app/user-management/change-password/change-password.component.ts index a8d3ce3..d885159 100644 --- a/src/app/user-management/change-password/change-password.component.ts +++ b/src/app/user-management/change-password/change-password.component.ts @@ -174,24 +174,8 @@ constructor( next: (response) => { if (!(response instanceof HttpErrorResponse)) { this.i18nService.success(SuccessMessages.CHANGE_PASSWORD_SUCCESS, []); - - const userStr = this.storageService.getItem('user'); - if (userStr) { - const user = JSON.parse(userStr); - user.requiresPasswordChange = false; - if (user.user) { - user.user.firstLogin = false; - } - - if (payload.newPassword) { - this.storageService.setItem(FormConstants.PASSWORD, payload.newPassword); - } - this.storageService.setItem('user', JSON.stringify(user)); - this.authService.updateCredentialsAfterPasswordChange(payload.newPassword); - - } - - this.router.navigate(['/home/dashboard']); + this.authService.logout(); + this.router.navigate(['login']); } }, error: (error) => { diff --git a/src/app/user-management/reset-password-modal/reset-password-modal.component.html b/src/app/user-management/reset-password-modal/reset-password-modal.component.html index 6b90126..954b0b7 100644 --- a/src/app/user-management/reset-password-modal/reset-password-modal.component.html +++ b/src/app/user-management/reset-password-modal/reset-password-modal.component.html @@ -33,7 +33,7 @@ - {{ 'resettingPasswordForThisUser' | translate }} +
@@ -81,7 +81,6 @@
- {{ 'passwordRequirements' | translate }}
diff --git a/src/assets/i18n/English.json b/src/assets/i18n/English.json index 0b8638a..d346bff 100644 --- a/src/assets/i18n/English.json +++ b/src/assets/i18n/English.json @@ -257,7 +257,7 @@ "noThirdPartyRegFound":"No Third Party Registration Details Found", "ERR_SEC_0001": "Email already exists", "ERR_SEC_0007": "New password cannot be same as old password", - "ERR_SEC_0002": "Username already exists", + "ERR_SEC_0002": "User ID already exists", "ERR_SEC_0003": "Old Password is not correct", "ERR_SEC_0004":"Invalid credentials", "ERR_SEC_0005": "User not found",