From e1a407f97391f016c1b13ff124634fc88c72b6b3 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Fri, 10 Nov 2023 10:09:28 +0100
Subject: [PATCH] consume current user context instead of auth context

---
 .../current-user/current-user-modal.element.ts   | 16 +++++++++++-----
 .../user-workspace-profile-settings.element.ts   | 12 ++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts
index 6ed0221a2b..dce4c18e4d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts
@@ -1,9 +1,11 @@
+import { UMB_CURRENT_USER_CONTEXT } from '../../current-user.context.js';
+import { UmbCurrentUser } from '../../types.js';
 import { UMB_APP } from '@umbraco-cms/backoffice/app';
-import { UMB_AUTH_CONTEXT, type UmbCurrentUser } from '@umbraco-cms/backoffice/auth';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, CSSResultGroup, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbModalContext } from '@umbraco-cms/backoffice/modal';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
+import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
 
 @customElement('umb-current-user-modal')
 export class UmbCurrentUserModalElement extends UmbLitElement {
@@ -14,15 +16,19 @@ export class UmbCurrentUserModalElement extends UmbLitElement {
 	private _currentUser?: UmbCurrentUser;
 
 	#authContext?: typeof UMB_AUTH_CONTEXT.TYPE;
-
+	#currentUserContext?: typeof UMB_CURRENT_USER_CONTEXT.TYPE;
 	#appContext?: typeof UMB_APP.TYPE;
 
 	constructor() {
 		super();
 
+		this.consumeContext(UMB_CURRENT_USER_CONTEXT, (instance) => {
+			this.#currentUserContext = instance;
+			this._observeCurrentUser();
+		});
+
 		this.consumeContext(UMB_AUTH_CONTEXT, (instance) => {
 			this.#authContext = instance;
-			this._observeCurrentUser();
 		});
 
 		this.consumeContext(UMB_APP, (instance) => {
@@ -31,10 +37,10 @@ export class UmbCurrentUserModalElement extends UmbLitElement {
 	}
 
 	private async _observeCurrentUser() {
-		if (!this.#authContext) return;
+		if (!this.#currentUserContext) return;
 
 		this.observe(
-			this.#authContext.currentUser,
+			this.#currentUserContext.currentUser,
 			(currentUser) => {
 				this._currentUser = currentUser;
 			},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts
index 9e55f1243c..75ec003003 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts
@@ -4,7 +4,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UUISelectElement } from '@umbraco-cms/backoffice/external/uui';
 import { UserResponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { UMB_AUTH_CONTEXT, UmbCurrentUser } from '@umbraco-cms/backoffice/auth';
+import { UMB_CURRENT_USER_CONTEXT, UmbCurrentUser } from '@umbraco-cms/backoffice/current-user';
 import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 
@@ -19,14 +19,14 @@ export class UmbUserWorkspaceProfileSettingsElement extends UmbLitElement {
 	@state()
 	private languages: Array<{ name: string; value: string; selected: boolean }> = [];
 
-	#authContext?: typeof UMB_AUTH_CONTEXT.TYPE;
+	#currentUserContext?: typeof UMB_CURRENT_USER_CONTEXT.TYPE;
 	#userWorkspaceContext?: typeof UMB_USER_WORKSPACE_CONTEXT.TYPE;
 
 	constructor() {
 		super();
 
-		this.consumeContext(UMB_AUTH_CONTEXT, (instance) => {
-			this.#authContext = instance;
+		this.consumeContext(UMB_CURRENT_USER_CONTEXT, (instance) => {
+			this.#currentUserContext = instance;
 			this.#observeCurrentUser();
 		});
 
@@ -45,9 +45,9 @@ export class UmbUserWorkspaceProfileSettingsElement extends UmbLitElement {
 	}
 
 	#observeCurrentUser() {
-		if (!this.#authContext) return;
+		if (!this.#currentUserContext) return;
 		this.observe(
-			this.#authContext.currentUser,
+			this.#currentUserContext.currentUser,
 			async (currentUser) => {
 				this._currentUser = currentUser;