hv2/hv2-all-in-one
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

expiry display not working

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2021-09-06 14:03:08 +02:00
parent 657d85538e
commit bbe698fc12
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/hv2-ui/src/app/navigation/navigation.component.html
View File

@ -28,7 +28,6 @@
</button> </button>
<span>Nober Grundbesitz GbR Hausverwaltung</span> <span>Nober Grundbesitz GbR Hausverwaltung</span>
<span class="spacer"></span> <span class="spacer"></span>
<span class="gittagversion">Expires in: {{expiresIn}} seconds</span>
<span class="gittagversion">GITTAGVERSION</span> <span class="gittagversion">GITTAGVERSION</span>
<a *ngIf="!authenticated" mat-button routerLink="/login">Login</a> <a *ngIf="!authenticated" mat-button routerLink="/login">Login</a>
<a *ngIf="authenticated" mat-button routerLink="/logout">Logout</a> <a *ngIf="authenticated" mat-button routerLink="/logout">Logout</a>

2
ui/hv2-ui/src/app/navigation/navigation.component.ts
View File

@ -15,7 +15,6 @@ import { NavigationEnd, Router } from '@angular/router';
export class NavigationComponent { export class NavigationComponent {
public authenticated: boolean public authenticated: boolean
expiresIn: number
isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset) isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset)
.pipe( .pipe(
@ -36,7 +35,6 @@ export class NavigationComponent {
ngOnInit() { ngOnInit() {
this.authenticated = this.tokenService.checkAuthenticated() this.authenticated = this.tokenService.checkAuthenticated()
this.expiresIn = 600
} }
} }

22
ui/hv2-ui/src/app/token.service.ts
View File

@ -3,8 +3,6 @@ import { MessageService } from './message.service';
import { HttpClient, HttpHeaders } from '@angular/common/http'; import { HttpClient, HttpHeaders } from '@angular/common/http';
import { UserCreds } from './userCreds' import { UserCreds } from './userCreds'
import jwt_decode from 'jwt-decode' import jwt_decode from 'jwt-decode'
import { Observable } from 'rxjs';
import { ComplexOuterSubscriber } from 'rxjs/internal/innerSubscribe';
@ -21,6 +19,7 @@ export class TokenService {
public static Id_AuthToken_Key : string = "id_authtoken"; public static Id_AuthToken_Key : string = "id_authtoken";
public static Id_RefreshToken_Key : string = "id_refreshtoken"; public static Id_RefreshToken_Key : string = "id_refreshtoken";
constructor(private http: HttpClient, private messageService: MessageService) { constructor(private http: HttpClient, private messageService: MessageService) {
} }
@ -81,23 +80,4 @@ export class TokenService {
} }
} }
expiryUpdate() : Observable<number> {
const exUp = new Observable<number>((observer) => {
let i = 600
while (i != 0) {
observer.next(i)
i -= 1
await new Promise(f => setTimeout(f, 1000))
}
observer.complete()
return {
unsubscribe() {
}
}
})
return exUp
}
} }