From 13ca23f86ec9d9b760b7b467d0f579e434d9cf68 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 10 Nov 2023 10:41:11 +0100 Subject: [PATCH] use current user context --- .../current-user/utils/is-current-user.function.ts | 10 +++++----- .../src/shared/auth/auth.interface.ts | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/utils/is-current-user.function.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/utils/is-current-user.function.ts index 8b79ad283f..bfa34694e9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/utils/is-current-user.function.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/utils/is-current-user.function.ts @@ -1,13 +1,13 @@ -import { IUmbAuth, UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth'; +import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.js'; import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export const isCurrentUser = async (host: UmbControllerHost, userId: string) => { - let authContext: IUmbAuth | undefined = undefined; + let currentUserContext: typeof UMB_CURRENT_USER_CONTEXT.TYPE | undefined; - await new UmbContextConsumerController(host, UMB_AUTH_CONTEXT, (context) => { - authContext = context; + await new UmbContextConsumerController(host, UMB_CURRENT_USER_CONTEXT, (context) => { + currentUserContext = context; }).asPromise(); - return await authContext!.isUserCurrentUser(userId); + return await currentUserContext!.isUserCurrentUser(userId); }; diff --git a/src/Umbraco.Web.UI.Client/src/shared/auth/auth.interface.ts b/src/Umbraco.Web.UI.Client/src/shared/auth/auth.interface.ts index 98a4c662d0..ce86e3c51d 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/auth/auth.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/auth/auth.interface.ts @@ -1,4 +1,8 @@ +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; + export interface IUmbAuth { + isLoggedIn: Observable; + /** * Initiates the login flow. */