Logout

ui/src/app/account/service/account.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { SessionStorageService } from 'ngx-webstorage'
 import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'
 import { BehaviorSubject, EMPTY, Observable, Subject, catchError, map, of, takeUntil, tap } from 'rxjs'
 
 import { SERVER_API_URL } from '../../../app/app.constants'
 import { IAccount } from '../model/account.model'
@@ -14,7 +14,7 @@
   private isFetchingAccountData = false
   private stopFetchingAccountData = new Subject()
   private authenticated = false
   private authenticationState = new BehaviorSubject<any>(null)
   private logoutAsResourceUrl = SERVER_API_URL + 'services/userservice/api'
 
   constructor(
@@ -175,7 +175,7 @@
   }
 
   isLoggedAs(): boolean {
-    return !!(this.isIdentityResolved() && this.accountData.value!.loggedAs)
+    return !!(this.isIdentityResolved() && this.accountData.value && this.accountData.value.loggedAs)
   }
 
   logoutAs(): Observable<any> {

ui/src/app/account/service/auth-jwt.service.ts

@@ -1,8 +1,6 @@
 import { Injectable } from '@angular/core'
 import { HttpClient, HttpResponse } from '@angular/common/http'
 import { Observable } from 'rxjs'
-
-import { SERVER_API_URL } from '../../../app/app.constants'
 import { ILoginCredentials, ILoginResult } from '../model/login.model'
 
 @Injectable({ providedIn: 'root' })
@@ -31,6 +29,6 @@ export class AuthServerProvider {
 */
 
   logout(): Observable<any> {
-    return this.http.post(SERVER_API_URL + '/auth/logout', null)
+    return this.http.post('/auth/logout', null)
   }
 }

ui/src/app/layout/navbar/navbar.component.html

@@ -221,7 +221,7 @@
           </li>
           <li>
             <a
-              *appappHasAnyAuthority="'ROLE_ADMIN'"
+              *appHasAnyAuthority="'ROLE_ADMIN'"
               class="dropdown-item"
               routerLink="member"
               routerLinkActive="active"

ui/src/app/layout/navbar/navbar.component.ts

@@ -127,7 +127,8 @@ export class NavbarComponent implements OnInit {
     } else {
       this.memberService.setManagedMember(null)
       this.loginService.logout()
-      this.router.navigate([''])
+      console.log('logged out now')
+      this.router.navigate(['/login'])
     }
   }