From f319e89473bac2605445ea2eed3a578a2df92654 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Sun, 16 Oct 2022 16:01:37 +0200
Subject: [PATCH] Fixed login state problems #70

---
 kdb-web/src/app/app.component.html            |  2 +-
 kdb-web/src/app/app.component.ts              |  7 ++-
 kdb-web/src/app/services/auth/auth.service.ts | 48 +++++++++++--------
 .../src/app/services/socket/socket.service.ts |  2 +-
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/kdb-web/src/app/app.component.html b/kdb-web/src/app/app.component.html
index 94cdd058a1..a2dc5b5036 100644
--- a/kdb-web/src/app/app.component.html
+++ b/kdb-web/src/app/app.component.html
@@ -1,5 +1,5 @@
 <main [class]="themeName">
-  <ng-container *ngIf="authService.isLoggedIn; else login">
+  <ng-container *ngIf="isLoggedIn; else login">
     <app-header></app-header>
 
     <section class="app">
diff --git a/kdb-web/src/app/app.component.ts b/kdb-web/src/app/app.component.ts
index 22a6a7cd34..72139e6689 100644
--- a/kdb-web/src/app/app.component.ts
+++ b/kdb-web/src/app/app.component.ts
@@ -16,7 +16,7 @@ export class AppComponent implements OnInit {
   isLoggedIn: boolean = false;
 
   constructor(
-    public authService: AuthService,
+    private authService: AuthService,
     private themeService: ThemeService,
     private socket: SocketService
   ) { }
@@ -28,9 +28,12 @@ export class AppComponent implements OnInit {
     this.themeService.themeName$.subscribe(value => {
       this.themeName = value;
     });
+    this.authService.isLoggedIn$.subscribe(value => {
+      this.isLoggedIn = value;
+    });
 
-    this.socket.startSocket();
     this.themeService.loadTheme();
+    this.socket.startSocket();
   }
 
 
diff --git a/kdb-web/src/app/services/auth/auth.service.ts b/kdb-web/src/app/services/auth/auth.service.ts
index 5c007891a7..83a9bf22e6 100644
--- a/kdb-web/src/app/services/auth/auth.service.ts
+++ b/kdb-web/src/app/services/auth/auth.service.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { JwtHelperService } from '@auth0/angular-jwt';
-import { firstValueFrom, Observable, Subscription } from 'rxjs';
+import { firstValueFrom, Observable, Subject, Subscription } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { AdminUpdateUserDTO } from 'src/app/models/auth/admin-update-user.dto';
 import { AuthRoles } from 'src/app/models/auth/auth-roles.enum';
@@ -21,8 +21,8 @@ import { SpinnerService } from '../spinner/spinner.service';
 })
 export class AuthService {
 
-  invalidLogin!: boolean;
-  isLoggedIn!: boolean;
+  private isLoggedIn!: boolean;
+  isLoggedIn$ = new Subject<boolean>();
 
   constructor(
     private appsettings: SettingsService,
@@ -31,7 +31,9 @@ export class AuthService {
     private jwtHelper: JwtHelperService,
     private spinnerService: SpinnerService
   ) {
-    this.isUserLoggedInAsync();
+    this.isLoggedIn$.subscribe(value => {
+      this.isLoggedIn = value;
+    });
   }
 
   /* data requests */
@@ -187,14 +189,20 @@ export class AuthService {
         })
       }).pipe(catchError((error: any) => {
         error.error = null;
+        this.isLoggedIn$.next(false);
+        localStorage.removeItem('rjwt');
+        this.router.navigate(['/auth/login']);
         throw error;
       })).subscribe(() => {
-        this.isLoggedIn = false;
+        this.isLoggedIn$.next(false);
         localStorage.removeItem('jwt');
         localStorage.removeItem('rjwt');
         this.router.navigate(['/auth/login']);
       });
     }
+    this.isLoggedIn$.next(false);
+    localStorage.removeItem('rjwt');
+    this.router.navigate(['/auth/login']);
 
     return null
   }
@@ -203,15 +211,19 @@ export class AuthService {
     const token = this.getToken();
 
     if (!token || !token.refreshToken) {
-      this.isLoggedIn = false;
+      this.isLoggedIn$.next(false);
       return false;
     }
 
-    const verifiedLogin = await firstValueFrom(await this.verifyLogin());
-
-    if (verifiedLogin) {
-      this.isLoggedIn = true;
-      return true;
+    try {
+      const verifiedLogin = await firstValueFrom(this.verifyLogin());
+      if (verifiedLogin) {
+        this.isLoggedIn$.next(true);
+        return true;
+      }
+    } catch (error: unknown) {
+      this.isLoggedIn$.next(false);
+      return false;
     }
 
     if (this.isLoggedIn) {
@@ -229,14 +241,12 @@ export class AuthService {
     return false;
   }
 
-  hasUserPermission(role: AuthRoles): Promise<boolean> {
-    return this.isUserLoggedInAsync().then(isLoggedIn => {
-      if (!role || !isLoggedIn) {
-        return false;
-      }
-      const token = this.getDecodedToken();
-      return AuthRoles[token['role']] === AuthRoles[role];
-    });
+  async hasUserPermission(role: AuthRoles): Promise<boolean> {
+    if (!role || !await this.isUserLoggedInAsync()) {
+      return false;
+    }
+    const token = this.getDecodedToken();
+    return AuthRoles[token['role']] === AuthRoles[role];
   }
 
   getEMailFromDecodedToken(token: { [key: string]: any }): string | null {
diff --git a/kdb-web/src/app/services/socket/socket.service.ts b/kdb-web/src/app/services/socket/socket.service.ts
index 4493587408..a29bba2c65 100644
--- a/kdb-web/src/app/services/socket/socket.service.ts
+++ b/kdb-web/src/app/services/socket/socket.service.ts
@@ -20,10 +20,10 @@ export class SocketService {
     private spinnerService: SpinnerService,
     private messageService: MessageService,
   ) {
-    this.socket = io(`${settingsService.getApiURL()}`)
   }
 
   startSocket() {
+    this.socket = io(`${this.settingsService.getApiURL()}`)
     this.socket.on('connect', () => {
       if (this.disconnected) {
         if (this.spinnerService.showSpinnerState) {