IOT-43: Update logout button

Author: VirtualSatai

src/app/auth/auth.component.ts

@@ -17,6 +17,7 @@ export class AuthComponent implements OnInit {
   public formFailedSubmit = false;
   isLoginMode = true;
   isLoading = false;
+  isKombit = false;
   error: string = null;
 
   constructor(

src/app/auth/auth.service.ts

@@ -26,6 +26,8 @@ export class AuthService {
   private baseUrl = environment.baseUrl;
   private URL = 'auth/login';
 
+  private readonly LOCAL_STORAGE_JWT_LOCATION = 'id_token';
+
   constructor(private http: HttpClient, private restService: RestService) {}
 
   // [email protected]
@@ -50,11 +52,22 @@ export class AuthService {
   }
 
   setSession(jwt: string) {
-    localStorage.setItem('id_token', jwt);
+    localStorage.setItem(this.LOCAL_STORAGE_JWT_LOCATION, jwt);
+  }
+
+  getJwt() {
+    return localStorage.getItem(this.LOCAL_STORAGE_JWT_LOCATION);
+  }
+
+  isLoggedInWithKombit() {
+    const jwt = localStorage.getItem(this.LOCAL_STORAGE_JWT_LOCATION);
+
+    const token = this.getDecodedAccessToken(jwt);
+    return token?.isKombit == true;
   }
 
   logout() {
-    localStorage.removeItem('id_token');
+    localStorage.removeItem(this.LOCAL_STORAGE_JWT_LOCATION);
   }
 
   public isLoggedIn() {
@@ -64,7 +77,7 @@ export class AuthService {
   }
 
   getExpiration() {
-    const jwt = localStorage.getItem('id_token');
+    const jwt = localStorage.getItem(this.LOCAL_STORAGE_JWT_LOCATION);
 
     if (!jwt) {
       return moment(0);

src/app/navbar/navbar.component.html

@@ -56,7 +56,9 @@
           </ul>
         </li>
         <li class="nav-item py-2 ">
-          <a style="cursor: pointer;" class="nav-link pl-5 position-relative rounded" (click)="onLogout()">Logout</a>
+          <a style="cursor: pointer;" class="nav-link pl-5 position-relative rounded" (click)="onLogout()"
+            [attr.href]="getKombitLogoutUrl() ? getKombitLogoutUrl() : null"
+            target="{{(isLoggedInWithKombit()) ? '_blank' : undefined}}">Logout</a>
           <fa-icon [icon]="faSignOutAlt" class="navbar-icon"></fa-icon>
         </li>
       </ul>

src/app/navbar/navbar.component.ts

@@ -1,10 +1,15 @@
 import { Component, OnInit } from '@angular/core';
-
 import { TranslateService } from '@ngx-translate/core';
-import { faBroadcastTower, faSlidersH, faNetworkWired, faSignOutAlt, faSignInAlt } from '@fortawesome/free-solid-svg-icons';
+import {
+  faBroadcastTower,
+  faSlidersH,
+  faNetworkWired,
+  faSignOutAlt,
+  faSignInAlt,
+} from '@fortawesome/free-solid-svg-icons';
 import { AuthService } from '@app/auth/auth.service';
 import { Router } from '@angular/router';
-
+import { environment } from '@environments/environment';
 
 @Component({
   selector: 'app-navbar',
@@ -22,14 +27,12 @@ export class NavbarComponent implements OnInit {
   constructor(
     private authService: AuthService,
     public translate: TranslateService,
-    private router: Router,
+    private router: Router
   ) {
     translate.use('da');
   }
 
-  ngOnInit(): void {
-
-  }
+  ngOnInit(): void {}
 
   onLogout() {
     this.authService.logout();
@@ -39,4 +42,17 @@ export class NavbarComponent implements OnInit {
   isLoggedIn() {
     return this.authService.isLoggedIn();
   }
+
+  isLoggedInWithKombit() {
+    return this.authService.isLoggedInWithKombit();
+  }
+
+  getKombitLogoutUrl() {
+    const jwt = this.authService.getJwt();
+    if (this.authService.isLoggedInWithKombit()) {
+      return `${environment.baseUrl}auth/kombit/logout?secret_token=${jwt}`;
+    } else {
+      return '';
+    }
+  }
 }