From a9816553feb848341a8c3214861d5479c3688578 Mon Sep 17 00:00:00 2001 From: "SANDHYA.JS" Date: Tue, 12 Apr 2022 09:07:08 +0530 Subject: [PATCH] Feature 10914: Enforce Password change on First login * Added NG-UI support to Enforce Password change on First login * A popup will be opened on First login with current password, new password and confirm password fields * Once new password is entered, Click apply button * The popup is closed & redirected to Login page. * Sign in using the new password. Change-Id: I9ee6bf923e897b40d06a1781cdd7d044b171c825 Signed-off-by: SANDHYA.JS --- src/app/AppModule.ts | 13 +- src/app/approutes.module.ts | 6 + src/app/login/LoginComponent.ts | 42 ++++- src/app/users/UsersModule.ts | 9 +- .../users/add-user/AddEditUserComponent.html | 146 +++++++++++------- .../users/add-user/AddEditUserComponent.scss | 45 +++++- .../users/add-user/AddEditUserComponent.ts | 49 +++++- .../ChangePasswordComponent.html | 18 +++ .../ChangePasswordComponent.scss | 25 +++ .../ChangePasswordComponent.ts | 76 +++++++++ .../change-password/ChangePasswordModule.ts | 42 +++++ src/assets/i18n/de.json | 4 +- src/assets/i18n/en.json | 4 +- src/assets/i18n/es.json | 4 +- src/assets/i18n/pt.json | 4 +- src/models/CommonModel.ts | 1 + src/models/VNFDModel.ts | 2 + src/services/AuthGuardService.ts | 28 ++-- src/services/AuthenticationService.ts | 86 +++++++---- tsconfig.json | 4 +- 20 files changed, 483 insertions(+), 125 deletions(-) create mode 100644 src/app/utilities/change-password/ChangePasswordComponent.html create mode 100644 src/app/utilities/change-password/ChangePasswordComponent.scss create mode 100644 src/app/utilities/change-password/ChangePasswordComponent.ts create mode 100644 src/app/utilities/change-password/ChangePasswordModule.ts diff --git a/src/app/AppModule.ts b/src/app/AppModule.ts index f36b8bf..451e0f1 100644 --- a/src/app/AppModule.ts +++ b/src/app/AppModule.ts @@ -50,6 +50,8 @@ import { NgIdleKeepaliveModule } from '@ng-idle/keepalive'; import { AuthenticationService } from 'AuthenticationService'; import { AuthGuardService } from 'AuthGuardService'; import { BreadcrumbComponent } from 'BreadCrumb'; +import { ChangePasswordComponent } from 'ChangePasswordComponent'; +import { ChangePasswordModule } from 'ChangePasswordModule'; import { ComposePackages } from 'ComposePackages'; import { ConfirmationTopologyComponent } from 'ConfirmationTopology'; import { DeleteComponent } from 'DeleteComponent'; @@ -124,7 +126,8 @@ const customNotifierOptions: NotifierOptions = { SDNControllerActionComponent, SwitchProjectComponent, GoToTopDirective, - ScalingComponent + ScalingComponent, + ChangePasswordComponent ], imports: [ NotifierModule.withConfig(customNotifierOptions), @@ -149,7 +152,8 @@ const customNotifierOptions: NotifierOptions = { RouterModule.forRoot(appRoutes, { useHash: false, relativeLinkResolution: 'legacy' }), NgIdleKeepaliveModule.forRoot(), LoaderModule, - SharedModule + SharedModule, + ChangePasswordModule ], providers: [ { @@ -196,7 +200,8 @@ const customNotifierOptions: NotifierOptions = { PDUInstancesActionComponent, SDNControllerActionComponent, SwitchProjectComponent, - ScalingComponent + ScalingComponent, + ChangePasswordComponent ] }) @@ -225,7 +230,7 @@ export function appInitializerFactory(translate: TranslateService, injector: Inj translate.setDefaultLang('en'); const languageCode: string = localStorage.getItem('languageCode'); if (languageCode !== null && languageCode !== undefined && languageCode !== '') { - await translate.use(languageCode).toPromise().catch(() => { + await translate.use(languageCode).toPromise().catch((): void => { translate.setDefaultLang('en'); }); } else { diff --git a/src/app/approutes.module.ts b/src/app/approutes.module.ts index 6145aae..e75416e 100644 --- a/src/app/approutes.module.ts +++ b/src/app/approutes.module.ts @@ -20,6 +20,7 @@ */ import { Routes } from '@angular/router'; import { AuthGuardService } from 'AuthGuardService'; +import { ChangePasswordComponent } from 'ChangePasswordComponent'; import { LayoutComponent } from 'LayoutComponent'; import { LoginComponent } from 'LoginComponent'; import { PageNotFoundComponent } from 'PageNotFound'; @@ -114,6 +115,11 @@ export const appRoutes: Routes = [ } ] }, + { + path: 'changepassword', + component: ChangePasswordComponent, + canActivate: [AuthGuardService] + }, { path: '**', component: PageNotFoundComponent diff --git a/src/app/login/LoginComponent.ts b/src/app/login/LoginComponent.ts index 2f4f67e..8c6f5a3 100644 --- a/src/app/login/LoginComponent.ts +++ b/src/app/login/LoginComponent.ts @@ -55,6 +55,9 @@ export class LoginComponent implements OnInit { /** Observable Hold the value of subscription @public */ public isLoggedIn$: Observable; + /** Observable Hold the value of subscription @public */ + public isChangePassword$: Observable; + /** contains access token information @public */ public accessToken: string; @@ -70,6 +73,12 @@ export class LoginComponent implements OnInit { /** Contains all methods related to shared @public */ public sharedService: SharedService; + /** contains the loggedIn observable value @public */ + public loggedIn: boolean; + + /** contains the passwordIn observable value @public */ + public changePassword: boolean; + /** Utilizes auth service for any auth operations @private */ private authService: AuthenticationService; @@ -94,11 +103,24 @@ export class LoginComponent implements OnInit { */ public ngOnInit(): void { this.isLoggedIn$ = this.authService.isLoggedIn; - if (this.isLoggedIn$) { - this.router.navigate(['/']).catch(() => { + this.isLoggedIn$.subscribe((res: boolean): void => { + this.loggedIn = res; + }); + if (this.loggedIn === true) { + this.router.navigate(['/']).catch((): void => { // Catch Navigation Error }); } + this.isChangePassword$ = this.authService.isChangePassword; + this.isChangePassword$.subscribe((res: boolean): void => { + this.changePassword = res; + }); + if (this.changePassword === true) { + this.router.navigate(['changepassword']).catch((): void => { + // Catch Navigation Error + }); + } + this.loginForm = this.formBuilder.group({ userName: ['', [Validators.required]], password: ['', [Validators.required]] @@ -117,13 +139,19 @@ export class LoginComponent implements OnInit { this.isLoadingResults = true; this.sharedService.cleanForm(this.loginForm); this.authService.login(this.loginForm.value.userName, this.loginForm.value.password).subscribe( - (data: {}) => { + (data: {}): void => { this.isLoadingResults = false; - this.router.navigate([this.returnUrl]).catch(() => { - // Catch Navigation Error - }); + if (this.changePassword === true && this.loggedIn === false) { + this.router.navigate(['/changepassword']).catch((): void => { + // Catch Navigation Error + }); + } else { + this.router.navigate([this.returnUrl]).catch((): void => { + // Catch Navigation Error + }); + } localStorage.removeItem('returnUrl'); - }, (err: HttpErrorResponse) => { + }, (err: HttpErrorResponse): void => { this.isLoadingResults = false; this.restService.handleError(err, 'post'); }); diff --git a/src/app/users/UsersModule.ts b/src/app/users/UsersModule.ts index 2014c48..8b5f316 100644 --- a/src/app/users/UsersModule.ts +++ b/src/app/users/UsersModule.ts @@ -28,7 +28,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgSelectModule } from '@ng-select/ng-select'; import { TranslateModule } from '@ngx-translate/core'; -import { AddEditUserComponent } from 'AddEditUserComponent'; +import { ChangePasswordModule } from 'ChangePasswordModule'; import { DataService } from 'DataService'; import { LoaderModule } from 'LoaderModule'; import { Ng2SmartTableModule } from 'ng2-smart-table'; @@ -60,10 +60,11 @@ const routes: Routes = [ */ @NgModule({ imports: [ReactiveFormsModule, FormsModule, CommonModule, HttpClientModule, Ng2SmartTableModule, TranslateModule, - FlexLayoutModule, NgSelectModule, NgbModule, RouterModule.forChild(routes), PagePerRowModule, LoaderModule, PageReloadModule], - declarations: [UsersComponent, UserDetailsComponent, AddEditUserComponent, ProjectRoleComponent], + FlexLayoutModule, NgSelectModule, NgbModule, RouterModule.forChild(routes), PagePerRowModule, LoaderModule, + PageReloadModule, ChangePasswordModule], + declarations: [UsersComponent, UserDetailsComponent, ProjectRoleComponent], providers: [DataService], - entryComponents: [AddEditUserComponent, ProjectRoleComponent] + entryComponents: [ProjectRoleComponent] }) /** Exporting a class @exports UsersModule */ export class UsersModule { diff --git a/src/app/users/add-user/AddEditUserComponent.html b/src/app/users/add-user/AddEditUserComponent.html index 8c496cc..d3a0b08 100644 --- a/src/app/users/add-user/AddEditUserComponent.html +++ b/src/app/users/add-user/AddEditUserComponent.html @@ -15,75 +15,105 @@ limitations under the License. Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.in), BARATH KUMAR R (barath.r@tataelxsi.co.in) --> -
-
- - -
-
- -
-
- -
-
- -
-
-
- {{'PAGE.LOGIN.USERNAMEMINLENGTHVALIDMESSAGE' | translate}}
-
+
+ +
+ +
- -
+
+ +
- +
- +
-
-
- {{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}}
+
+
+ {{'PAGE.LOGIN.USERNAMEMINLENGTHVALIDMESSAGE' | translate}}
-
-
- + +
+
+ +
+
+ +
-
- -
- +
+ +
+
+ +
+
+
+ {{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}}
+
+
+
+
+ +
+
+ +
+
+
+ {{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}}
+
+
+
+
+ +
+
+ +
+ - {{'PAGE.USERS.PASSWORDMATCH' | translate}} + {{'PAGE.USERS.PASSWORDMATCH' | translate}} +
+ +
+ +
+ +
- -
- -
- -
-
-
- - - -
- +
+ + + +
+ +
\ No newline at end of file diff --git a/src/app/users/add-user/AddEditUserComponent.scss b/src/app/users/add-user/AddEditUserComponent.scss index 05f2819..3520b4e 100644 --- a/src/app/users/add-user/AddEditUserComponent.scss +++ b/src/app/users/add-user/AddEditUserComponent.scss @@ -15,11 +15,46 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.in), BARATH KUMAR R (barath.r@tataelxsi.co.in) */ -@import '../../../assets/scss/mixins/mixin'; -@import '../../../assets/scss/variable'; -.input-validation-msg{ - color:$red; - text-align:left; +@import "../../../assets/scss/mixins/mixin"; +@import "../../../assets/scss/variable"; +.input-validation-msg { + color: $red; + text-align: left; @include padding-value(0, 0, 0, 10); @include font(null, 11px, null); +} +.change-password { + @include background( + linear-gradient( + to left bottom, + #00c0ef, + #00b3f9, + #3ea3fd, + #7190f8, + #9c78e8, + #a86cdd, + #b25fd1, + #bb51c3, + #b151c4, + #a652c6, + #9b53c6, + #9053c7 + ), + null, + null, + null, + null + ); + color: $white; + overflow: visible; + @include box-shadow(0px, 3px, 10px, 0px, rgba($black, 0.5)); +} +.message { + @include roundedCorners(25); + @include background(null, $cerise-pink, null, null, null); + color: $white !important; + text-align: left; + @include padding-value(0, 0, 0, 10); + @include margin-value(0, 0, 10, 0); + @include font(null, 11px, null); } \ No newline at end of file diff --git a/src/app/users/add-user/AddEditUserComponent.ts b/src/app/users/add-user/AddEditUserComponent.ts index d988548..0e9456a 100644 --- a/src/app/users/add-user/AddEditUserComponent.ts +++ b/src/app/users/add-user/AddEditUserComponent.ts @@ -36,6 +36,7 @@ import { isNullOrUndefined } from 'util'; * @Component takes AddEditUserComponent.html as template url */ @Component({ + selector: 'app-add-edit-user', templateUrl: './AddEditUserComponent.html', styleUrls: ['./AddEditUserComponent.scss'] }) @@ -74,6 +75,12 @@ export class AddEditUserComponent implements OnInit { /** Holds list of domains @public */ public domains: TYPESECTION[] = []; + /** Variable contains type is changepassword or not @public */ + public isPassword: boolean; + + /** Variable holds value for first login user @public */ + public isFirstLogin: boolean = Boolean(localStorage.getItem('firstLogin') === 'true'); + /** Instance of the rest service @private */ private restService: RestService; @@ -113,6 +120,7 @@ export class AddEditUserComponent implements OnInit { userName: ['', Validators.required], password: [null, [Validators.required, Validators.pattern(this.sharedService.REGX_PASSWORD_PATTERN)]], password2: [null, Validators.required], + old_password: [null, Validators.required], domain_name: [null] }); } @@ -131,6 +139,8 @@ export class AddEditUserComponent implements OnInit { this.getDomainList(); } else if (this.userType === 'editUserName') { this.userForm.patchValue({ userName: this.userName }); + } else if (this.isFirstLogin) { + this.isPassword = true; } } @@ -139,11 +149,21 @@ export class AddEditUserComponent implements OnInit { if (userType === 'editPassword') { this.getFormControl('userName').setValidators([]); this.getFormControl('userName').updateValueAndValidity(); + this.getFormControl('old_password').setValidators([]); + this.getFormControl('old_password').updateValueAndValidity(); } else if (userType === 'editUserName') { this.getFormControl('password').setValidators([]); this.getFormControl('password').updateValueAndValidity(); this.getFormControl('password2').setValidators([]); this.getFormControl('password2').updateValueAndValidity(); + this.getFormControl('old_password').setValidators([]); + this.getFormControl('old_password').updateValueAndValidity(); + } else if (userType === 'changePassword') { + this.getFormControl('userName').setValidators([]); + this.getFormControl('userName').updateValueAndValidity(); + } else if (userType === 'add') { + this.getFormControl('old_password').setValidators([]); + this.getFormControl('old_password').updateValueAndValidity(); } this.submitted = true; this.modalData = { @@ -157,7 +177,7 @@ export class AddEditUserComponent implements OnInit { } if (userType === 'add') { this.addUser(); - } else if (userType === 'editUserName' || userType === 'editPassword') { + } else { this.editUser(); } } @@ -191,6 +211,9 @@ export class AddEditUserComponent implements OnInit { const payLoad: LOGINPARAMS = {}; if (this.userType === 'editPassword') { payLoad.password = (this.userForm.value.password); + } else if (this.userType === 'changePassword') { + payLoad.password = (this.userForm.value.password); + payLoad.old_password = (this.userForm.value.old_password); } else { payLoad.username = this.userForm.value.userName.toLowerCase(); } @@ -201,13 +224,33 @@ export class AddEditUserComponent implements OnInit { this.restService.patchResource(apiURLHeader, payLoad).subscribe((result: {}): void => { this.checkUsername(payLoad); this.activeModal.close(this.modalData); + if (this.isFirstLogin) { + this.notifierService.notify('success', this.translateService.instant('PAGE.USERS.CHANGEPASSWORD')); + this.authService.destoryToken(); + } else { + this.notifierService.notify('success', this.translateService.instant('PAGE.USERS.EDITEDSUCCESSFULLY')); + } this.isLoadingResults = false; - this.notifierService.notify('success', this.translateService.instant('PAGE.USERS.EDITEDSUCCESSFULLY')); }, (error: ERRORDATA): void => { - this.restService.handleError(error, 'put'); + if (this.isFirstLogin) { + this.notifierService.notify('error', error.error.detail); + this.activeModal.close(this.modalData); + this.authService.destoryToken(); + } else { + this.restService.handleError(error, 'put'); + } this.isLoadingResults = false; }); } + /** Close the modal and destroy subscribe @public */ + public close(): void { + if (this.isFirstLogin) { + this.activeModal.close(this.modalData); + this.authService.destoryToken(); + } else { + this.activeModal.close(this.modalData); + } + } /** Get domain name list @private */ private getDomainList(): void { this.isLoadingResults = true; diff --git a/src/app/utilities/change-password/ChangePasswordComponent.html b/src/app/utilities/change-password/ChangePasswordComponent.html new file mode 100644 index 0000000..8248b74 --- /dev/null +++ b/src/app/utilities/change-password/ChangePasswordComponent.html @@ -0,0 +1,18 @@ + +
\ No newline at end of file diff --git a/src/app/utilities/change-password/ChangePasswordComponent.scss b/src/app/utilities/change-password/ChangePasswordComponent.scss new file mode 100644 index 0000000..4b15236 --- /dev/null +++ b/src/app/utilities/change-password/ChangePasswordComponent.scss @@ -0,0 +1,25 @@ +/* + Copyright 2020 TATA ELXSI + + Licensed under the Apache License, Version 2.0 (the 'License'); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author: SANDHYA JS (sandhya.j@tataelxsi.co.in) +*/ +@import "../../../assets/scss/mixins/mixin"; +@import "../../../assets/scss/variable"; +.password-container { + @include wh-value(100%, 100vh); + @include flexbox(flex, center, null, null, center, null); + @include background(url("../../../assets/images/login_background.jpg"), null, cover, no-repeat, center); + background-attachment: fixed; +} \ No newline at end of file diff --git a/src/app/utilities/change-password/ChangePasswordComponent.ts b/src/app/utilities/change-password/ChangePasswordComponent.ts new file mode 100644 index 0000000..a2036ff --- /dev/null +++ b/src/app/utilities/change-password/ChangePasswordComponent.ts @@ -0,0 +1,76 @@ +/* + Copyright 2020 TATA ELXSI + + Licensed under the Apache License, Version 2.0 (the 'License'); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author: SANDHYA JS (sandhya.j@tataelxsi.co.in) +*/ +/** + * @file change password component + */ +import { Component, Injector, OnInit } from '@angular/core'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; +import { AddEditUserComponent } from 'AddEditUserComponent'; +import { MODALCLOSERESPONSEDATA } from 'CommonModel'; +import { SharedService } from 'SharedService'; + +/** + * Creating component + * @Component takes ChangePasswordComponent.html as template url + */ +@Component({ + templateUrl: './ChangePasswordComponent.html', + styleUrls: ['./ChangePasswordComponent.scss'] +}) +/** Exporting a class @exports ChangePasswordComponent */ +export class ChangePasswordComponent implements OnInit { + /** To inject services @public */ + public injector: Injector; + + /** handle translate @public */ + public translateService: TranslateService; + + /** Contains edit type data @public */ + public editType: string = 'changePassword'; + + /** Contains all methods related to shared @private */ + private sharedService: SharedService; + + /** Instance of the modal service @private */ + private modalService: NgbModal; + + constructor(injector: Injector) { + this.injector = injector; + this.translateService = this.injector.get(TranslateService); + this.sharedService = this.injector.get(SharedService); + this.modalService = this.injector.get(NgbModal); + } + + /** Lifecyle Hooks the trigger before component is instantiate @public */ + public ngOnInit(): void { + const modalRef: NgbModalRef = this.modalService.open(AddEditUserComponent, { backdrop: 'static', keyboard: false }); + modalRef.componentInstance.userID = localStorage.getItem('user_id'); + if (this.editType === 'changePassword') { + modalRef.componentInstance.userTitle = this.translateService.instant('PAGE.USERS.EDITCREDENTIALS'); + } + modalRef.componentInstance.userType = this.editType; + modalRef.result.then((result: MODALCLOSERESPONSEDATA): void => { + if (result) { + this.sharedService.callData(); + } + }).catch((err: Error): void => { // catch error + }); + } + +} diff --git a/src/app/utilities/change-password/ChangePasswordModule.ts b/src/app/utilities/change-password/ChangePasswordModule.ts new file mode 100644 index 0000000..bd64f9e --- /dev/null +++ b/src/app/utilities/change-password/ChangePasswordModule.ts @@ -0,0 +1,42 @@ +/* + Copyright 2020 TATA ELXSI + + Licensed under the Apache License, Version 2.0 (the 'License'); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author: SANDHYA JS (sandhya.j@tataelxsi.co.in) +*/ +/** + * @file ChangePassword Module. + */ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { ReactiveFormsModule } from '@angular/forms'; +import { NgSelectModule } from '@ng-select/ng-select'; +import { TranslateModule } from '@ngx-translate/core'; +import { AddEditUserComponent } from 'AddEditUserComponent'; +import { LoaderModule } from 'LoaderModule'; +/** + * Creating @NgModule component for Modules + */ +@NgModule({ + imports: [CommonModule, TranslateModule, FormsModule, ReactiveFormsModule, NgSelectModule, LoaderModule], + declarations: [AddEditUserComponent], + exports: [AddEditUserComponent], + entryComponents: [AddEditUserComponent] +}) +/** Exporting a class @exports ChangePasswordModule */ +export class ChangePasswordModule { + /** Variables declared to avoid state-less class */ + private changepwdModule: string; +} diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 54dfe73..2447cb9 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -282,6 +282,7 @@ "NEWUSER": "Neuer Benutzer", "USERNAME": "Nutzername", "PASSWORD": "Passwort", + "OLDPASSWORD": "Jetziges Passwort", "CONFPASSWORD": "Passwort bestätigen", "EDITUSER": "Benutzer bearbeiten", "NEWPASSWORD": "Neues Kennwort", @@ -295,7 +296,8 @@ "PROJECTSROLES": "Projekte Rollen", "EDITPROJECTROLEMAPPING": "Projektrollenzuordnung bearbeiten", "ADDMAPPINGS": "Mappings hinzufügen", - "EDITPROJECTROLEERROR": "Bitte geben Sie mindestens eine Projektrollenzuordnung an, um fortzufahren" + "EDITPROJECTROLEERROR": "Bitte geben Sie mindestens eine Projektrollenzuordnung an, um fortzufahren", + "CHANGEPASSWORD": "Passwort wurde geändert. Melden Sie sich an, um Ihre Sitzung zu starten" }, "TOPOLOGY": { "SELECTELEMENT": "Element auswählen", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 200e1b9..45313c1 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -282,6 +282,7 @@ "NEWUSER": "New User", "USERNAME": "User Name", "PASSWORD": "Password", + "OLDPASSWORD": "Current Password", "CONFPASSWORD": "Confirm Password", "EDITUSER": "Edit User", "NEWPASSWORD": "New Password", @@ -295,7 +296,8 @@ "PROJECTSROLES": "Projects Roles", "EDITPROJECTROLEMAPPING": "Edit Project Role Mapping", "ADDMAPPINGS": "Add Mappings", - "EDITPROJECTROLEERROR": "Please provide at least one project role mapping to continue" + "EDITPROJECTROLEERROR": "Please provide at least one project role mapping to continue", + "CHANGEPASSWORD": "Password is changed, Sign in to start your session" }, "TOPOLOGY": { "SELECTELEMENT": "Select Element", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 3f6092c..7e2df4d 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -282,6 +282,7 @@ "NEWUSER": "Nuevo usuario", "USERNAME": "Nombre de usuario", "PASSWORD": "Contraseña", + "OLDPASSWORD": "Contraseña actual", "CONFPASSWORD": "Confirmar contraseña", "EDITUSER": "Editar usuario", "NEWPASSWORD": "Nueva contraseña", @@ -295,7 +296,8 @@ "PROJECTSROLES": "Roles de proyectos", "EDITPROJECTROLEMAPPING": "Editar asignación de roles de proyecto", "ADDMAPPINGS": "Agregar asignaciones", - "EDITPROJECTROLEERROR": "Proporcione al menos un mapeo de roles del proyecto para continuar" + "EDITPROJECTROLEERROR": "Proporcione al menos un mapeo de roles del proyecto para continuar", + "CHANGEPASSWORD": "Se cambió la contraseña, inicie sesión para iniciar su sesión" }, "TOPOLOGY": { "SELECTELEMENT": "Seleccionar elemento", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 64a5c13..ee257f9 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -282,6 +282,7 @@ "NEWUSER": "Novo usuário", "USERNAME": "Nome de Usuário", "PASSWORD": "Senha", + "OLDPASSWORD": "Senha atual", "CONFPASSWORD": "Confirme a Senha", "EDITUSER": "Editar usuário", "NEWPASSWORD": "Nova senha", @@ -295,7 +296,8 @@ "PROJECTSROLES": "Funções dos Projetos", "EDITPROJECTROLEMAPPING": "Editar mapeamento de função do projeto", "ADDMAPPINGS": "Adicionar mapeamentos", - "EDITPROJECTROLEERROR": "Forneça pelo menos um mapeamento de função do projeto para continuar" + "EDITPROJECTROLEERROR": "Forneça pelo menos um mapeamento de função do projeto para continuar", + "CHANGEPASSWORD": "A senha foi alterada, faça login para iniciar sua sessão" }, "TOPOLOGY": { "SELECTELEMENT": "Selecionar elemento", diff --git a/src/models/CommonModel.ts b/src/models/CommonModel.ts index 96d926d..eb2bec3 100644 --- a/src/models/CommonModel.ts +++ b/src/models/CommonModel.ts @@ -333,6 +333,7 @@ export interface DOMAINS { export interface LOGINPARAMS { username?: string; password?: string; + old_password?: string; } /** Interface for the LABELVALUE */ export interface LABELVALUE { diff --git a/src/models/VNFDModel.ts b/src/models/VNFDModel.ts index 7029ace..5f2cc05 100644 --- a/src/models/VNFDModel.ts +++ b/src/models/VNFDModel.ts @@ -32,6 +32,8 @@ export interface ProjectModel { username: string; remote_host: string; admin: boolean; + message?: string; + user_id?: string; } /** Interface for ProjectDetails */ diff --git a/src/services/AuthGuardService.ts b/src/services/AuthGuardService.ts index 0c8d1e4..2effeca 100644 --- a/src/services/AuthGuardService.ts +++ b/src/services/AuthGuardService.ts @@ -22,8 +22,8 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; import { AuthenticationService } from 'AuthenticationService'; -import { Observable } from 'rxjs'; -import { map, take } from 'rxjs/operators'; +import { combineLatest, Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; /** * An Injectable is a class adorned with the @Injectable decorator function. @@ -45,17 +45,19 @@ export class AuthGuardService implements CanActivate { * Returns Observable if authorized @public */ public canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.authService.isLoggedIn - .pipe( - take(1), - map((isLoggedIn: boolean) => { - if (!isLoggedIn) { - this.router.navigate(['/login']).catch(() => { - //TODO: Handle error notification - }); - } + return combineLatest( + this.authService.isLoggedIn, + this.authService.isChangePassword + ).pipe( + map(([isLoggedIn, changePassword]: [boolean, boolean]): boolean => { + if (changePassword || isLoggedIn) { return true; - }) - ); + } else { + this.router.navigate(['/login']).catch(); + this.authService.destoryToken(); + return false; + } + }) + ); } } diff --git a/src/services/AuthenticationService.ts b/src/services/AuthenticationService.ts index 0621763..0399c59 100644 --- a/src/services/AuthenticationService.ts +++ b/src/services/AuthenticationService.ts @@ -37,24 +37,6 @@ import { RestService } from './RestService'; */ @Injectable() export class AuthenticationService { - /** - * Get method for Observable loggedIn - */ - get isLoggedIn(): Observable { - return this.loggedIn.asObservable(); - } - - /** - * Get method for Observable Username - */ - get username(): Observable { - return this.userName.asObservable(); - } - - /** Get method for project name */ - get ProjectName(): Observable { - return this.projectName$.asObservable(); - } /** To inject services @public */ public injector: Injector; @@ -79,6 +61,9 @@ export class AuthenticationService { /** Holds the logged in condition of type BehaviorSubject @private */ private loggedIn: BehaviorSubject = new BehaviorSubject(false); + /** Holds the change password in condition of type BehaviorSubject @private */ + private changePassword: BehaviorSubject = new BehaviorSubject(false); + /** Hold Rest Service Objects */ private restService: RestService; @@ -98,12 +83,43 @@ export class AuthenticationService { this.restService = this.injector.get(RestService); this.modalService = this.injector.get(NgbModal); this.idle = this.injector.get(Idle); - if (localStorage.getItem('id_token') !== null) { + if (localStorage.getItem('username') !== null) { this.loggedIn.next(true); + this.changePassword.next(false); + } else if (localStorage.getItem('firstLogin') !== null) { + this.changePassword.next(true); + this.loggedIn.next(false); } else { this.loggedIn.next(false); } this.userName.next(localStorage.getItem('username')); + this.redirectToPage(); + } + + /** + * Get method for Observable loggedIn + */ + get isLoggedIn(): Observable { + return this.loggedIn.asObservable(); + } + + /** + * Get method for Observable changepassword + */ + get isChangePassword(): Observable { + return this.changePassword.asObservable(); + } + + /** + * Get method for Observable Username + */ + get username(): Observable { + return this.userName.asObservable(); + } + + /** Get method for project name */ + get ProjectName(): Observable { + return this.projectName$.asObservable(); } /** @@ -118,8 +134,16 @@ export class AuthenticationService { httpOptions: { headers: this.httpOptions } }; return this.restService.postResource(apiURLHeader, this.payLoad) - .pipe(map((data: ProjectModel) => { - if (data) { + .pipe(map((data: ProjectModel): BehaviorSubject => { + if (data.message === 'change_password') { + localStorage.setItem('firstLogin', 'true'); + localStorage.setItem('id_token', data.id); + localStorage.setItem('user_id', data.user_id); + this.idle.watch(true); + this.changePassword.next(true); + this.loggedIn.next(false); + return this.changePassword; + } else { this.setLocalStorage(data); this.idle.watch(true); this.loggedIn.next(true); @@ -127,7 +151,7 @@ export class AuthenticationService { this.userName.next(data.username); return this.loggedIn; } - }, (error: ERRORDATA) => { this.restService.handleError(error, 'post'); } + }, (error: ERRORDATA): void => { this.restService.handleError(error, 'post'); } )); } @@ -162,6 +186,7 @@ export class AuthenticationService { /** Destory tokens API response handling @public */ public logoutResponse(): void { this.loggedIn.next(false); + this.changePassword.next(false); const langCode: string = localStorage.getItem('languageCode'); const redirecturl: string = isNullOrUndefined(localStorage.getItem('returnUrl')) ? '/' : localStorage.getItem('returnUrl'); const osmVersion: string = isNullOrUndefined(localStorage.getItem('osmVersion')) ? '' : localStorage.getItem('osmVersion'); @@ -182,16 +207,25 @@ export class AuthenticationService { this.modalService.dismissAll(); this.destoryToken(); } - /** Destory tokens on logout @private */ - private destoryToken(): void { + /** Destory tokens on logout @public */ + public destoryToken(): void { const tokenID: string = localStorage.getItem('id_token'); if (tokenID !== null) { const deletingURl: string = environment.GENERATETOKEN_URL + '/' + tokenID; - this.restService.deleteResource(deletingURl).subscribe((res: {}) => { + this.restService.deleteResource(deletingURl).subscribe((res: {}): void => { this.logoutResponse(); - }, (error: ERRORDATA) => { + }, (error: ERRORDATA): void => { this.restService.handleError(error, 'delete'); }); } } + + /** Return to previous page deny access to changepassword */ + public redirectToPage(): void { + if (window.location.pathname === '/changepassword' && localStorage.getItem('username') !== null) { + window.history.back(); + } else if (window.location.pathname === '/' && localStorage.getItem('firstLogin') === 'true') { + this.router.navigate(['/login']).catch(); + } + } } diff --git a/tsconfig.json b/tsconfig.json index d31012b..abeb17a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -149,7 +149,9 @@ "OperationalAppActionsComponent": ["src/app/operational-view/operational-view-app-actions/OperationalViewAppActionsComponent"], "OperationalAppExecutedActionsComponent" : ["src/app/operational-view/operational-view-app-executed-actions/OperationalViewAppExecutedActionsComponent"], "ResourcesOverviewComponent": ["src/app/vim-accounts/Resources-Overview/ResourcesOverviewComponent"], - "SharedModule": ["src/app/vim-accounts/Resources-Overview/SharedModule"] + "SharedModule": ["src/app/vim-accounts/Resources-Overview/SharedModule"], + "ChangePasswordComponent": ["src/app/utilities/change-password/ChangePasswordComponent"], + "ChangePasswordModule": ["src/app/utilities/change-password/ChangePasswordModule"] } } } \ No newline at end of file -- 2.25.1