X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fapp%2Flogin%2FLoginComponent.ts;h=1ffa8c3b4a336bf783a77053141c167d9f67cb57;hb=refs%2Ftags%2Fv14.0.0rc1;hp=db842d869d77e0b91aaa166564cb76e71c2c2cfe;hpb=1b17c432991a95035a1732426f0c11db57e511c9;p=osm%2FNG-UI.git diff --git a/src/app/login/LoginComponent.ts b/src/app/login/LoginComponent.ts index db842d8..1ffa8c3 100644 --- a/src/app/login/LoginComponent.ts +++ b/src/app/login/LoginComponent.ts @@ -195,7 +195,7 @@ export class LoginComponent implements OnInit { userName: ['', [Validators.required]], password: ['', [Validators.required]] }); - this.returnUrl = isNullOrUndefined(localStorage.getItem('returnUrl')) ? '/' : localStorage.getItem('returnUrl'); + this.returnUrl = isNullOrUndefined(sessionStorage.getItem('returnUrl')) ? '/' : sessionStorage.getItem('returnUrl'); } /** @@ -227,15 +227,15 @@ export class LoginComponent implements OnInit { this.router.navigate([this.returnUrl]).catch((): void => { // Catch Navigation Error }); - this.isAdminShow = localStorage.getItem('admin_show') === 'true' ? true : false; - this.isUserShow = localStorage.getItem('user_show') === 'true' ? true : false; + this.isAdminShow = sessionStorage.getItem('admin_show') === 'true' ? true : false; + this.isUserShow = sessionStorage.getItem('user_show') === 'true' ? true : false; setTimeout((): void => { if (this.isAdminShow === true || this.isUserShow === true) { this.generateData(); } }, this.epochTime1000); } - localStorage.removeItem('returnUrl'); + sessionStorage.removeItem('returnUrl'); }, (err: HttpErrorResponse): void => { this.isLoadingResults = false; this.restService.handleError(err, 'post'); @@ -244,7 +244,7 @@ export class LoginComponent implements OnInit { /** Fetching the data from server to load it in toaster @public */ public generateData(): void { - const userID: string = localStorage.getItem('user_id'); + const userID: string = sessionStorage.getItem('user_id'); if (userID !== '') { this.isLoadingResults = true; this.restService.getResource(environment.USERS_URL + '/' + userID).subscribe((userDetails: UserDetail): void => { @@ -267,8 +267,8 @@ export class LoginComponent implements OnInit { this.accountExpireMessage = this.translateService.instant('PAGE.LOGIN.ACCOUNTEXPIRE'); this.passwordExpireMessage = this.translateService.instant('PAGE.LOGIN.PASSWORDEXPIRE'); this.daysMessage = this.translateService.instant('PAGE.LOGIN.DAYS'); - this.lastLogin = localStorage.getItem('last_login'); - this.failedAttempts = localStorage.getItem('failed_count'); + this.lastLogin = sessionStorage.getItem('last_login'); + this.failedAttempts = sessionStorage.getItem('failed_count'); if (this.accountNoOfDays !== '0' && this.passwordNoOfDays !== '0' && this.accountNoOfDays !== '1' && this.passwordNoOfDays !== '1') { this.showToaster();