From e838c0ea1b721f0f4d22aac760f6942e9a0166cb Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Fri, 5 Apr 2024 14:23:42 +0200
Subject: [PATCH] let the auth context know if a 401 is encountered, which most
 likely means the user is timed out

---
 .../src/packages/core/auth/auth.context.ts    | 10 ++++++
 .../core/resources/resource.controller.ts     | 35 +++++++++++--------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts
index a46deed70d..cf99b23c35 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts
@@ -95,6 +95,16 @@ export class UmbAuthContext extends UmbContextBase<UmbAuthContext> {
 		return this.#authFlow.clearTokenStorage();
 	}
 
+	/**
+	 * Handles the case where the user has timed out, i.e. the token has expired.
+	 * This will clear the token storage and set the user as unauthorized.
+	 * @memberof UmbAuthContext
+	 */
+	timeOut() {
+		this.clearTokenStorage();
+		this.#isAuthorized.setValue(false);
+	}
+
 	/**
 	 * Signs the user out by removing any tokens from the browser.
 	 * @memberof UmbAuthContext
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/resources/resource.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/resources/resource.controller.ts
index b7dc4e9992..edbefc578b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/resources/resource.controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/resources/resource.controller.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { UMB_AUTH_CONTEXT } from '../auth/index.js';
 import { isApiError, isCancelError, isCancelablePromise } from './apiTypeValidators.function.js';
 import { UMB_NOTIFICATION_CONTEXT, type UmbNotificationOptions } from '@umbraco-cms/backoffice/notification';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -11,6 +12,8 @@ export class UmbResourceController extends UmbControllerBase {
 
 	#notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE;
 
+	#authContext?: typeof UMB_AUTH_CONTEXT.TYPE;
+
 	constructor(host: UmbControllerHost, promise: Promise<any>, alias?: string) {
 		super(host, alias);
 
@@ -19,6 +22,10 @@ export class UmbResourceController extends UmbControllerBase {
 		new UmbContextConsumerController(host, UMB_NOTIFICATION_CONTEXT, (_instance) => {
 			this.#notificationContext = _instance;
 		});
+
+		new UmbContextConsumerController(host, UMB_AUTH_CONTEXT, (_instance) => {
+			this.#authContext = _instance;
+		});
 	}
 
 	hostConnected(): void {
@@ -78,21 +85,21 @@ export class UmbResourceController extends UmbControllerBase {
 
 				// Go through the error status codes and act accordingly
 				switch (error.status ?? 0) {
-					case 401:
-						// Unauthorized
-						console.log('Unauthorized');
-
-						// TODO: Do not remove the token here but instead let whatever is listening to the event decide what to do
-						localStorage.removeItem('umb:userAuthTokenResponse');
-
-						// TODO: Show a modal dialog to login either by bubbling an event to UmbAppElement or by showing a modal directly
-						this.#notificationContext?.peek('warning', {
-							data: {
-								headline: 'Session Expired',
-								message: 'Your session has expired. Please refresh the page.',
-							},
-						});
+					case 401: {
+						// See if we can get the UmbAuthContext and let it know the user is timed out
+						if (this.#authContext) {
+							this.#authContext.timeOut();
+						} else {
+							// If we can't get the auth context, show a notification
+							this.#notificationContext?.peek('warning', {
+								data: {
+									headline: 'Session Expired',
+									message: 'Your session has expired. Please refresh the page.',
+								},
+							});
+						}
 						break;
+					}
 					case 500:
 						// Server Error