From d6c4d28ac1dabf2a4011ac31e317743de6db4203 Mon Sep 17 00:00:00 2001
From: William Newman <3382274+newmanw@users.noreply.github.com>
Date: Thu, 12 Sep 2024 08:35:19 -0600
Subject: [PATCH] Home should hide content when token expires

---
 web-app/projects/core-lib/user/user.model.ts |  2 +-
 web-app/src/app/home/home.component.html     |  2 +-
 web-app/src/app/home/home.component.ts       | 15 +++++++++++----
 web-app/src/app/http/token.interceptor.ts    |  3 +++
 web-app/src/app/user/user.service.ts         |  9 ++++++---
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/web-app/projects/core-lib/user/user.model.ts b/web-app/projects/core-lib/user/user.model.ts
index d9233ad36..4c161b1b0 100644
--- a/web-app/projects/core-lib/user/user.model.ts
+++ b/web-app/projects/core-lib/user/user.model.ts
@@ -41,7 +41,7 @@ export interface User {
    * The authorization role of this user account that defines the actions this
    * user account has permission to perform
    */
-  roleId: string
+  role: string
   email?: string
   /**
    * URL of the image that identifies this user account in the user feed, etc.;
diff --git a/web-app/src/app/home/home.component.html b/web-app/src/app/home/home.component.html
index 633c9097a..23590f193 100644
--- a/web-app/src/app/home/home.component.html
+++ b/web-app/src/app/home/home.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="user" class="home">
+<div *ngIf="myself" class="home">
   <banner [banner]="banners?.header">Hello</banner>
 
   <navigation (onFeedToggle)="feed.toggle()" (onPreferencesToggle)="preferences.toggle()"></navigation>
diff --git a/web-app/src/app/home/home.component.ts b/web-app/src/app/home/home.component.ts
index e18fcb491..4b1ea3901 100644
--- a/web-app/src/app/home/home.component.ts
+++ b/web-app/src/app/home/home.component.ts
@@ -7,6 +7,8 @@ import { ActivatedRoute } from '@angular/router';
 import { User } from 'core-lib-src/user';
 import { Banners, SettingsService } from '../setttings/settings.service';
 import * as _ from 'underscore';
+import { UserService } from '../user/user.service';
+import { MageEvent } from '@ngageoint/mage.web-core-lib/event';
 
 @Component({
   selector: 'home',
@@ -16,9 +18,9 @@ import * as _ from 'underscore';
 export class HomeComponent implements OnInit, OnDestroy {
 
   banners: Banners
-  user: User
   map: any
-  event: any
+  myself: User
+  event: MageEvent
   hideFeed: boolean = false
   newObservation: any
 
@@ -26,18 +28,23 @@ export class HomeComponent implements OnInit, OnDestroy {
 
   constructor(
     private mapService: MapService,
+    private userService: UserService,
     private filterService: FilterService,
     private locationService: LocationService,
     private settingsService: SettingsService,
     private activatedRoute: ActivatedRoute
-  ) { }
+  ) {
+    this.userService.myself$.subscribe((myself: User) => {
+      this.myself = myself
+    })
+  }
 
   ngOnInit(): void {
     this.filterService.addListener(this)
     this.mapService.addListener(this)
 
     this.activatedRoute.data.subscribe(({ user }) => {
-      this.user = user
+      this.myself = user
     })
 
     this.settingsService.getBanner().subscribe((banners: Banners) => {
diff --git a/web-app/src/app/http/token.interceptor.ts b/web-app/src/app/http/token.interceptor.ts
index bf0b7792f..d48782e8d 100644
--- a/web-app/src/app/http/token.interceptor.ts
+++ b/web-app/src/app/http/token.interceptor.ts
@@ -4,6 +4,7 @@ import { catchError, Observable, Subject, switchMap, throwError } from 'rxjs';
 import { LocalStorageService } from './local-storage.service';
 import { AuthenticationDialogComponent } from '../ingress/authentication/authentication-dialog.component';
 import { MatDialog } from '@angular/material/dialog';
+import { UserService } from '../user/user.service';
 
 export const BYPASS_TOKEN = new HttpContextToken(() => false);
 
@@ -16,6 +17,7 @@ export class TokenInterceptorService implements HttpInterceptor {
 
   constructor(
     public dialog: MatDialog,
+    private userService: UserService,
     private localStorageService: LocalStorageService
   ) { }
 
@@ -30,6 +32,7 @@ export class TokenInterceptorService implements HttpInterceptor {
         catchError((error) => {
           if (error instanceof HttpErrorResponse) {
             if (error.status === HttpStatusCode.Unauthorized) {
+              this.userService.setUser(null)
               if (!this.isRefreshingToken) {
                 this.isRefreshingToken = true
                 this.dialog.open(AuthenticationDialogComponent, {
diff --git a/web-app/src/app/user/user.service.ts b/web-app/src/app/user/user.service.ts
index 5ee18dd36..f46feb57d 100644
--- a/web-app/src/app/user/user.service.ts
+++ b/web-app/src/app/user/user.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpContext, HttpEvent } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { Observable, Subject, tap } from 'rxjs'
+import { BehaviorSubject, Observable, Subject, tap } from 'rxjs'
 import { LocalStorageService } from '../http/local-storage.service'
 import { BYPASS_TOKEN } from '../http/token.interceptor'
 import { User } from 'core-lib-src/user'
@@ -9,9 +9,11 @@ import { User } from 'core-lib-src/user'
   providedIn: 'root'
 })
 export class UserService {
+  amAdmin: boolean
 
+  private _myself = new BehaviorSubject<any>(null)
   myself: any
-  amAdmin: boolean
+  myself$ = this._myself.asObservable()
 
   constructor(
     private httpClient: HttpClient,
@@ -102,7 +104,8 @@ export class UserService {
   }
 
   setUser(user: any) {
-    this.myself = user;
+    this._myself.next(user)
+    this.myself = user
     // TODO don't just check for role name
     this.amAdmin = this.myself && this.myself.role && (this.myself.role.name === "ADMIN_ROLE" || this.myself.role.name === 'EVENT_MANAGER_ROLE');
   }