From 1f17739f594f447d92bde916abeff93e6e524aaa Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 10 Nov 2023 12:42:25 +0100 Subject: [PATCH] move isLoggedIn logic to auth context --- src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts | 6 ------ .../src/shared/auth/auth.context.ts | 9 ++++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts index 2112e85c0d..00538cade8 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts @@ -162,12 +162,6 @@ export class UmbAppElement extends UmbLitElement { OpenAPI.TOKEN = () => this.#authContext!.getLatestToken(); OpenAPI.WITH_CREDENTIALS = true; } - - if (this.#authContext?.isAuthorized()) { - this.#authContext?.setLoggedIn(true); - } else { - this.#authContext?.setLoggedIn(false); - } } #redirect() { diff --git a/src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts b/src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts index 01d4f8ea7e..3c9ffd70e6 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts @@ -32,7 +32,14 @@ export class UmbAuthContext extends UmbBaseController implements IUmbAuth { } isAuthorized() { - return this.isBypassed ? true : this.#authFlow.isAuthorized(); + if (this.isBypassed) { + this.#isLoggedIn.next(true); + return true; + } else { + const isAuthorized = this.#authFlow.isAuthorized(); + this.#isLoggedIn.next(isAuthorized); + return isAuthorized; + } } setInitialState(): Promise {