@umbraco-cms/backoffice 14.0.0-rc2 → 14.0.0-rc4

package/dist-cms/apps/app/app-auth.controller.js

@@ -1,35 +1,18 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _UmbAppAuthController_instances, _UmbAppAuthController_authContext, _UmbAppAuthController_firstTimeLoggingIn, _UmbAppAuthController_showLoginModal, _UmbAppAuthController_updateState;
-import { UMB_AUTH_CONTEXT, UMB_MODAL_APP_AUTH, UMB_STORAGE_REDIRECT_URL, } from '../../packages/core/auth/index.js';
+import { UMB_AUTH_CONTEXT, UMB_MODAL_APP_AUTH } from '../../packages/core/auth/index.js';
 import { UmbControllerBase } from '../../libs/class-api/index.js';
-import { filter, firstValueFrom, skip } from '../../external/rxjs/index.js';
+import { firstValueFrom } from '../../external/rxjs/index.js';
 import { umbExtensionsRegistry } from '../../packages/core/extension-registry/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT } from '../../packages/core/modal/index.js';
+import { setStoredPath } from '../../packages/core/utils/index.js';
 export class UmbAppAuthController extends UmbControllerBase {
+    #authContext;
+    #isFirstCheck = true;
     constructor(host) {
         super(host);
-        _UmbAppAuthController_instances.add(this);
-        _UmbAppAuthController_authContext.set(this, void 0);
-        _UmbAppAuthController_firstTimeLoggingIn.set(this, true);
         this.consumeContext(UMB_AUTH_CONTEXT, (context) => {
-            __classPrivateFieldSet(this, _UmbAppAuthController_authContext, context, "f");
+            this.#authContext = context;
             // Observe the user's authorization state and start the authorization flow if the user is not authorized
-            this.observe(context.isAuthorized.pipe(
-            // Skip the first since it is always false
-            skip(1), 
-            // Only continue if the value is false
-            filter((x) => !x)), () => {
-                __classPrivateFieldSet(this, _UmbAppAuthController_firstTimeLoggingIn, false, "f");
+            this.observe(context.timeoutSignal, () => {
                 this.makeAuthorizationRequest('timedOut');
             }, '_authState');
         });
@@ -39,12 +22,24 @@ export class UmbAppAuthController extends UmbControllerBase {
      * If not, the authorization flow is started.
      */
     async isAuthorized() {
-        if (!__classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f")) {
+        if (!this.#authContext) {
             throw new Error('[Fatal] Auth context is not available');
         }
-        const isAuthorized = __classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f").getIsAuthorized();
+        const isAuthorized = this.#authContext.getIsAuthorized();
         if (isAuthorized) {
-            return true;
+            // If this is the first time we are checking the authorization state (i.e. on first load), we need to make sure
+            // that the token is still valid. If it is not, we need to start the authorization flow.
+            // If the token is still valid, we can return true.
+            if (this.#isFirstCheck) {
+                this.#isFirstCheck = false;
+                const isValid = await this.#authContext.validateToken();
+                if (isValid) {
+                    return true;
+                }
+            }
+            else {
+                return true;
+            }
         }
         // Make a request to the auth server to start the auth flow
         return this.makeAuthorizationRequest();
@@ -54,86 +49,72 @@ export class UmbAppAuthController extends UmbControllerBase {
      * It will check which providers are available and either redirect directly to the provider or show a provider selection screen.
      */
     async makeAuthorizationRequest(userLoginState = 'loggingIn') {
-        if (!__classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f")) {
+        if (!this.#authContext) {
             throw new Error('[Fatal] Auth context is not available');
         }
-        // Save location.href so we can redirect to it after login
-        if (location.href !== __classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f").getPostLogoutRedirectUrl()) {
-            window.sessionStorage.setItem(UMB_STORAGE_REDIRECT_URL, location.href);
+        // Save the current state
+        let currentUrl = window.location.href;
+        const searchParams = new URLSearchParams(window.location.search);
+        if (searchParams.has('returnPath')) {
+            currentUrl = decodeURIComponent(searchParams.get('returnPath') || currentUrl);
         }
+        setStoredPath(currentUrl);
         // Figure out which providers are available
-        const availableProviders = await firstValueFrom(__classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f").getAuthProviders(umbExtensionsRegistry));
+        const availableProviders = await firstValueFrom(this.#authContext.getAuthProviders(umbExtensionsRegistry));
         if (availableProviders.length === 0) {
             throw new Error('[Fatal] No auth providers available');
         }
-        // If the user is timed out, we can show the login modal directly
-        if (userLoginState === 'timedOut') {
-            const selected = await __classPrivateFieldGet(this, _UmbAppAuthController_instances, "m", _UmbAppAuthController_showLoginModal).call(this, userLoginState, availableProviders);
-            if (!selected) {
-                return false;
-            }
-            return __classPrivateFieldGet(this, _UmbAppAuthController_instances, "m", _UmbAppAuthController_updateState).call(this);
-        }
-        if (availableProviders.length === 1) {
+        // If we are logging in, we need to check if we can redirect directly to the provider
+        if (userLoginState === 'loggingIn') {
             // One provider available (most likely the Umbraco provider), so initiate the authorization request to the default provider
-            __classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f").makeAuthorizationRequest(availableProviders[0].forProviderName);
-            return __classPrivateFieldGet(this, _UmbAppAuthController_instances, "m", _UmbAppAuthController_updateState).call(this);
-        }
-        // Check if any provider is redirecting directly to the provider
-        const redirectProvider = userLoginState === 'loggingIn'
-            ? availableProviders.find((provider) => provider.meta?.behavior?.autoRedirect)
-            : undefined;
-        if (redirectProvider) {
+            if (availableProviders.length === 1) {
+                await this.#authContext.makeAuthorizationRequest(availableProviders[0].forProviderName, true);
+                return this.#updateState();
+            }
+            // Check if any provider is redirecting directly to the provider
+            const redirectProvider = availableProviders.find((provider) => provider.meta?.behavior?.autoRedirect);
             // Redirect directly to the provider
-            __classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f").makeAuthorizationRequest(redirectProvider.forProviderName);
-            return __classPrivateFieldGet(this, _UmbAppAuthController_instances, "m", _UmbAppAuthController_updateState).call(this);
+            if (redirectProvider) {
+                await this.#authContext.makeAuthorizationRequest(redirectProvider.forProviderName, true);
+                return this.#updateState();
+            }
         }
-        // Show the provider selection screen
-        const selected = await __classPrivateFieldGet(this, _UmbAppAuthController_instances, "m", _UmbAppAuthController_showLoginModal).call(this, userLoginState, availableProviders);
+        // Otherwise we can show the provider selection screen directly, because the user is either logged out, timed out, or has more than one provider available
+        const selected = await this.#showLoginModal(userLoginState);
         if (!selected) {
             return false;
         }
-        return __classPrivateFieldGet(this, _UmbAppAuthController_instances, "m", _UmbAppAuthController_updateState).call(this);
-    }
-}
-_UmbAppAuthController_authContext = new WeakMap(), _UmbAppAuthController_firstTimeLoggingIn = new WeakMap(), _UmbAppAuthController_instances = new WeakSet(), _UmbAppAuthController_showLoginModal = async function _UmbAppAuthController_showLoginModal(userLoginState, availableProviders) {
-    if (!__classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f")) {
-        throw new Error('[Fatal] Auth context is not available');
+        return this.#updateState();
     }
-    // Check if any provider denies local login
-    const denyLocalLogin = availableProviders.some((provider) => provider.meta?.behavior?.denyLocalLogin);
-    if (denyLocalLogin) {
-        // Unregister the Umbraco provider
-        umbExtensionsRegistry.unregister('Umb.AuthProviders.Umbraco');
-    }
-    // Show the provider selection screen
-    const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-    modalManager.remove('umbAuthModal');
-    const selected = await modalManager
-        .open(this._host, UMB_MODAL_APP_AUTH, {
-        data: {
-            userLoginState,
-        },
-        modal: {
-            key: 'umbAuthModal',
-            backdropBackground: __classPrivateFieldGet(this, _UmbAppAuthController_firstTimeLoggingIn, "f")
-                ? 'var(--umb-auth-backdrop, url("/umbraco/backoffice/assets/umbraco_logo_white.svg") 20px 20px / 200px no-repeat, radial-gradient(circle, rgba(2,0,36,1) 0%, rgba(40,58,151,.9) 50%, rgba(0,212,255,1) 100%))'
-                : 'var(--umb-auth-backdrop-timedout, rgba(0,0,0,0.75))',
-        },
-    })
-        .onSubmit()
-        .catch(() => undefined);
-    if (!selected?.providerName) {
-        return false;
+    async #showLoginModal(userLoginState) {
+        if (!this.#authContext) {
+            throw new Error('[Fatal] Auth context is not available');
+        }
+        // Show the provider selection screen
+        const authModalKey = 'umbAuthModal';
+        const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+        const selected = await modalManager
+            .open(this._host, UMB_MODAL_APP_AUTH, {
+            data: {
+                userLoginState,
+            },
+            modal: {
+                key: authModalKey,
+                backdropBackground: 'var(--umb-auth-backdrop, rgb(244, 244, 244))',
+            },
+        })
+            .onSubmit()
+            .catch(() => undefined);
+        if (!selected?.success) {
+            return false;
+        }
+        return true;
     }
-    __classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f").makeAuthorizationRequest(selected.providerName, selected.loginHint);
-    return true;
-}, _UmbAppAuthController_updateState = function _UmbAppAuthController_updateState() {
-    if (!__classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f")) {
-        throw new Error('[Fatal] Auth context is not available');
+    #updateState() {
+        if (!this.#authContext) {
+            throw new Error('[Fatal] Auth context is not available');
+        }
+        // The authorization flow is finished, so let the caller know if the user is authorized
+        return this.#authContext.getIsAuthorized();
     }
-    // Reinitialize the auth flow (load the state from local storage)
-    __classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f").setInitialState();
-    // The authorization flow is finished, so let the caller know if the user is authorized
-    return __classPrivateFieldGet(this, _UmbAppAuthController_authContext, "f").getIsAuthorized();
-};
+}

package/dist-cms/apps/app/app-error.element.d.ts

@@ -22,6 +22,12 @@ export declare class UmbAppErrorElement extends UmbLitElement {
      * @attr
      */
     error?: unknown;
+    /**
+     * Hide the back button
+     *
+     * @attr
+     */
+    hideBackButton: boolean;
     constructor();
     render: () => import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/apps/app/app-error.element.js

@@ -4,12 +4,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _UmbAppErrorElement_instances, _UmbAppErrorElement_generateErrorFromSearchParams, _UmbAppErrorElement_renderProblemDetails, _UmbAppErrorElement_renderErrorObj, _UmbAppErrorElement_isProblemDetails, _UmbAppErrorElement_isError, _UmbAppErrorElement_renderError;
 import { css, html, nothing, customElement, property } from '../../external/lit/index.js';
 import { UmbLitElement } from '../../packages/core/lit-element/index.js';
 import { UmbTextStyles } from '../../packages/core/style/index.js';
@@ -19,17 +13,22 @@ import { UmbTextStyles } from '../../packages/core/style/index.js';
 let UmbAppErrorElement = class UmbAppErrorElement extends UmbLitElement {
     constructor() {
         super();
-        _UmbAppErrorElement_instances.add(this);
-        _UmbAppErrorElement_renderProblemDetails.set(this, (problemDetails) => html `
+        /**
+         * Hide the back button
+         *
+         * @attr
+         */
+        this.hideBackButton = false;
+        this.#renderProblemDetails = (problemDetails) => html `
 		<p><strong>${problemDetails.title}</strong></p>
 		<p>${problemDetails.detail}</p>
 		<pre>${problemDetails.stack}</pre>
-	`);
-        _UmbAppErrorElement_renderErrorObj.set(this, (error) => html `
+	`;
+        this.#renderErrorObj = (error) => html `
 		<p><strong>${error.name}</strong></p>
 		<p>${error.message}</p>
 		<pre>${error.stack}</pre>
-	`);
+	`;
         this.render = () => html `
 		<div id="background"></div>
 
@@ -39,11 +38,15 @@ let UmbAppErrorElement = class UmbAppErrorElement extends UmbLitElement {
 
 		<div id="container" class="uui-text">
 			<uui-box id="box" headline-variant="h1">
-				<uui-button
-					slot="header-actions"
-					label=${this.localize.term('general_back')}
-					look="secondary"
-					@click=${() => (location.href = '')}></uui-button>
+				${this.hideBackButton
+            ? nothing
+            : html `
+							<uui-button
+								slot="header-actions"
+								label=${this.localize.term('general_back')}
+								look="secondary"
+								@click=${() => (location.href = '')}></uui-button>
+						`}
 				<div slot="headline">
 					${this.errorHeadline
             ? this.errorHeadline
@@ -54,115 +57,116 @@ let UmbAppErrorElement = class UmbAppErrorElement extends UmbLitElement {
             ? html `
 							<details>
 								<summary><umb-localize key="general_details">Details</umb-localize></summary>
-								${__classPrivateFieldGet(this, _UmbAppErrorElement_instances, "m", _UmbAppErrorElement_renderError).call(this, this.error)}
+								${this.#renderError(this.error)}
 							</details>
 						`
             : nothing}
 			</uui-box>
 		</div>
 	`;
-        __classPrivateFieldGet(this, _UmbAppErrorElement_instances, "m", _UmbAppErrorElement_generateErrorFromSearchParams).call(this);
+        this.#generateErrorFromSearchParams();
     }
-};
-_UmbAppErrorElement_renderProblemDetails = new WeakMap();
-_UmbAppErrorElement_renderErrorObj = new WeakMap();
-_UmbAppErrorElement_instances = new WeakSet();
-_UmbAppErrorElement_generateErrorFromSearchParams = function _UmbAppErrorElement_generateErrorFromSearchParams() {
-    const searchParams = new URLSearchParams(window.location.search);
-    const flow = searchParams.get('flow');
-    if (flow === 'external-login-callback') {
-        this.errorHeadline = this.localize.term('errors_externalLoginError');
-        console.log('External login error', searchParams.get('error'));
-        const status = searchParams.get('status');
-        // "Status" is controlled by Umbraco and is a string
-        if (status) {
-            switch (status) {
-                case 'unauthorized':
-                    this.errorMessage = this.localize.term('errors_unauthorized');
+    /**
+     * Generates an error from the search params before the properties are set
+     */
+    #generateErrorFromSearchParams() {
+        const searchParams = new URLSearchParams(window.location.search);
+        const flow = searchParams.get('flow');
+        if (flow === 'external-login-callback') {
+            this.errorHeadline = this.localize.term('errors_externalLoginError');
+            console.log('External login error', searchParams.get('error'));
+            const status = searchParams.get('status');
+            // "Status" is controlled by Umbraco and is a string
+            if (status) {
+                switch (status) {
+                    case 'unauthorized':
+                        this.errorMessage = this.localize.term('errors_unauthorized');
+                        break;
+                    case 'user-not-found':
+                        this.errorMessage = this.localize.term('errors_userNotFound');
+                        break;
+                    case 'external-info-not-found':
+                        this.errorMessage = this.localize.term('errors_externalInfoNotFound');
+                        break;
+                    case 'failed':
+                        this.errorMessage = this.localize.term('errors_externalLoginFailed');
+                        break;
+                    default:
+                        this.errorMessage = this.localize.term('errors_defaultError');
+                        break;
+                }
+            }
+            return;
+        }
+        if (flow === 'external-login') {
+            /**
+             * "Error" is controlled by OpenID and is a string
+             * @see https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2.1
+             */
+            const error = searchParams.get('error');
+            this.errorHeadline = this.localize.term('errors_externalLoginError');
+            switch (error) {
+                case 'access_denied':
+                    this.errorMessage = this.localize.term('openidErrors_accessDenied');
+                    break;
+                case 'invalid_request':
+                    this.errorMessage = this.localize.term('openidErrors_invalidRequest');
+                    break;
+                case 'invalid_client':
+                    this.errorMessage = this.localize.term('openidErrors_invalidClient');
+                    break;
+                case 'invalid_grant':
+                    this.errorMessage = this.localize.term('openidErrors_invalidGrant');
+                    break;
+                case 'unauthorized_client':
+                    this.errorMessage = this.localize.term('openidErrors_unauthorizedClient');
+                    break;
+                case 'unsupported_grant_type':
+                    this.errorMessage = this.localize.term('openidErrors_unsupportedGrantType');
                     break;
-                case 'user-not-found':
-                    this.errorMessage = this.localize.term('errors_userNotFound');
+                case 'invalid_scope':
+                    this.errorMessage = this.localize.term('openidErrors_invalidScope');
                     break;
-                case 'external-info-not-found':
-                    this.errorMessage = this.localize.term('errors_externalInfoNotFound');
+                case 'server_error':
+                    this.errorMessage = this.localize.term('openidErrors_serverError');
                     break;
-                case 'failed':
-                    this.errorMessage = this.localize.term('errors_externalLoginFailed');
+                case 'temporarily_unavailable':
+                    this.errorMessage = this.localize.term('openidErrors_temporarilyUnavailable');
                     break;
                 default:
                     this.errorMessage = this.localize.term('errors_defaultError');
                     break;
             }
+            // Set the error object with the original error parameters from the search params
+            let detail = searchParams.get('error_description');
+            const errorUri = searchParams.get('error_uri');
+            if (errorUri) {
+                detail = `${detail} (${errorUri})`;
+            }
+            this.error = { title: `External error code: ${error}`, detail };
+            return;
         }
-        return;
     }
-    if (flow === 'external-login') {
-        /**
-         * "Error" is controlled by OpenID and is a string
-         * @see https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2.1
-         */
-        const error = searchParams.get('error');
-        this.errorHeadline = this.localize.term('errors_externalLoginError');
-        switch (error) {
-            case 'access_denied':
-                this.errorMessage = this.localize.term('openidErrors_accessDenied');
-                break;
-            case 'invalid_request':
-                this.errorMessage = this.localize.term('openidErrors_invalidRequest');
-                break;
-            case 'invalid_client':
-                this.errorMessage = this.localize.term('openidErrors_invalidClient');
-                break;
-            case 'invalid_grant':
-                this.errorMessage = this.localize.term('openidErrors_invalidGrant');
-                break;
-            case 'unauthorized_client':
-                this.errorMessage = this.localize.term('openidErrors_unauthorizedClient');
-                break;
-            case 'unsupported_grant_type':
-                this.errorMessage = this.localize.term('openidErrors_unsupportedGrantType');
-                break;
-            case 'invalid_scope':
-                this.errorMessage = this.localize.term('openidErrors_invalidScope');
-                break;
-            case 'server_error':
-                this.errorMessage = this.localize.term('openidErrors_serverError');
-                break;
-            case 'temporarily_unavailable':
-                this.errorMessage = this.localize.term('openidErrors_temporarilyUnavailable');
-                break;
-            default:
-                this.errorMessage = this.localize.term('errors_defaultError');
-                break;
-        }
-        // Set the error object with the original error parameters from the search params
-        let detail = searchParams.get('error_description');
-        const errorUri = searchParams.get('error_uri');
-        if (errorUri) {
-            detail = `${detail} (${errorUri})`;
-        }
-        this.error = { title: `External error code: ${error}`, detail };
-        return;
+    #renderProblemDetails;
+    #renderErrorObj;
+    #isProblemDetails(error) {
+        return typeof error === 'object' && error !== null && 'detail' in error && 'title' in error;
     }
-};
-_UmbAppErrorElement_isProblemDetails = function _UmbAppErrorElement_isProblemDetails(error) {
-    return typeof error === 'object' && error !== null && 'detail' in error && 'title' in error;
-};
-_UmbAppErrorElement_isError = function _UmbAppErrorElement_isError(error) {
-    return typeof error === 'object' && error !== null && error instanceof Error;
-};
-_UmbAppErrorElement_renderError = function _UmbAppErrorElement_renderError(error) {
-    if (__classPrivateFieldGet(this, _UmbAppErrorElement_instances, "m", _UmbAppErrorElement_isProblemDetails).call(this, error)) {
-        return __classPrivateFieldGet(this, _UmbAppErrorElement_renderProblemDetails, "f").call(this, error);
+    #isError(error) {
+        return typeof error === 'object' && error !== null && error instanceof Error;
     }
-    else if (__classPrivateFieldGet(this, _UmbAppErrorElement_instances, "m", _UmbAppErrorElement_isError).call(this, error)) {
-        return __classPrivateFieldGet(this, _UmbAppErrorElement_renderErrorObj, "f").call(this, error);
+    #renderError(error) {
+        if (this.#isProblemDetails(error)) {
+            return this.#renderProblemDetails(error);
+        }
+        else if (this.#isError(error)) {
+            return this.#renderErrorObj(error);
+        }
+        return nothing;
     }
-    return nothing;
-};
-UmbAppErrorElement.styles = [
-    UmbTextStyles,
-    css `
+    static { this.styles = [
+        UmbTextStyles,
+        css `
 			#background {
 				position: fixed;
 				overflow: hidden;
@@ -217,7 +221,8 @@ UmbAppErrorElement.styles = [
 				overflow: auto;
 			}
 		`,
-];
+    ]; }
+};
 __decorate([
     property()
 ], UmbAppErrorElement.prototype, "errorHeadline", void 0);
@@ -227,6 +232,9 @@ __decorate([
 __decorate([
     property()
 ], UmbAppErrorElement.prototype, "error", void 0);
+__decorate([
+    property({ type: Boolean, attribute: 'hide-back-button' })
+], UmbAppErrorElement.prototype, "hideBackButton", void 0);
 UmbAppErrorElement = __decorate([
     customElement('umb-app-error')
 ], UmbAppErrorElement);

package/dist-cms/apps/app/app.context.js

@@ -1,31 +1,18 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _UmbAppContext_serverUrl, _UmbAppContext_backofficePath;
 import { UmbContextBase } from '../../libs/class-api/index.js';
 import { UmbContextToken } from '../../libs/context-api/index.js';
 export class UmbAppContext extends UmbContextBase {
+    #serverUrl;
+    #backofficePath;
     constructor(host, config) {
         super(host, UMB_APP_CONTEXT);
-        _UmbAppContext_serverUrl.set(this, void 0);
-        _UmbAppContext_backofficePath.set(this, void 0);
-        __classPrivateFieldSet(this, _UmbAppContext_serverUrl, config.serverUrl, "f");
-        __classPrivateFieldSet(this, _UmbAppContext_backofficePath, config.backofficePath, "f");
+        this.#serverUrl = config.serverUrl;
+        this.#backofficePath = config.backofficePath;
     }
     getBackofficePath() {
-        return __classPrivateFieldGet(this, _UmbAppContext_backofficePath, "f");
+        return this.#backofficePath;
     }
     getServerUrl() {
-        return __classPrivateFieldGet(this, _UmbAppContext_serverUrl, "f");
+        return this.#serverUrl;
     }
 }
-_UmbAppContext_serverUrl = new WeakMap(), _UmbAppContext_backofficePath = new WeakMap();
 export const UMB_APP_CONTEXT = new UmbContextToken('UmbAppContext');