yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consume current user context instead of auth context

Browse Source
This commit is contained in:
Mads Rasmussen
2023-11-10 10:09:28 +01:00
parent e75098005b
commit e1a407f973
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts
View File

@@ -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;
},

12
src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts
View File

@@ -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;