@umbraco-cms/backoffice 14.0.0--preview005-2dd3b083 → 14.0.0--preview005-7ef2bd26

package/dist-cms/packages/block/block-type/workspace/block-type-workspace.context.d.ts

@@ -1,11 +1,11 @@
-import type { UmbBlockTypeBaseModel } from '../types.js';
+import type { UmbBlockTypeWithGroupKey } from '../types.js';
 import type { UmbPropertyDatasetContext } from '../../../core/property/index.js';
 import type { UmbInvariantableWorkspaceContextInterface, UmbWorkspaceContextInterface } from '../../../core/workspace/index.js';
 import { UmbEditableWorkspaceContextBase } from '../../../core/workspace/index.js';
 import type { UmbControllerHost, UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import type { ManifestWorkspace, PropertyEditorConfigProperty } from '../../../core/extension-registry/index.js';
-export declare class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeBaseModel = UmbBlockTypeBaseModel> extends UmbEditableWorkspaceContextBase<BlockTypeData> implements UmbInvariantableWorkspaceContextInterface {
+export declare class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeWithGroupKey = UmbBlockTypeWithGroupKey> extends UmbEditableWorkspaceContextBase<BlockTypeData> implements UmbInvariantableWorkspaceContextInterface {
     #private;
     readonly IS_BLOCK_TYPE_WORKSPACE_CONTEXT = true;
     readonly data: import("rxjs").Observable<BlockTypeData | undefined>;
@@ -17,7 +17,7 @@ export declare class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlock
     });
     createPropertyDatasetContext(host: UmbControllerHost): UmbPropertyDatasetContext;
     load(unique: string): Promise<void>;
-    create(contentElementTypeId: string): Promise<{
+    create(contentElementTypeId: string, groupKey?: string | null): Promise<{
         data: BlockTypeData;
     }>;
     getData(): BlockTypeData | undefined;
@@ -32,4 +32,4 @@ export declare class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlock
     destroy(): void;
 }
 export default UmbBlockTypeWorkspaceContext;
-export declare const UMB_BLOCK_TYPE_WORKSPACE_CONTEXT: UmbContextToken<UmbWorkspaceContextInterface, UmbBlockTypeWorkspaceContext<UmbBlockTypeBaseModel>>;
+export declare const UMB_BLOCK_TYPE_WORKSPACE_CONTEXT: UmbContextToken<UmbWorkspaceContextInterface, UmbBlockTypeWorkspaceContext<UmbBlockTypeWithGroupKey>>;

package/dist-cms/packages/block/block-type/workspace/block-type-workspace.context.js

@@ -48,9 +48,11 @@ export class UmbBlockTypeWorkspaceContext extends UmbEditableWorkspaceContextBas
             });
         });
     }
-    async create(contentElementTypeId) {
+    async create(contentElementTypeId, groupKey) {
+        //Only set groupKey property if it exists
         const data = {
             contentElementTypeKey: contentElementTypeId,
+            ...(groupKey && { groupKey: groupKey }),
         };
         this.setIsNew(true);
         __classPrivateFieldGet(this, _UmbBlockTypeWorkspaceContext_data, "f").setValue(data);

package/dist-cms/packages/block/block-type/workspace/block-type-workspace.element.js

@@ -57,11 +57,13 @@ _UmbBlockTypeWorkspaceElement_gotWorkspaceContext = function _UmbBlockTypeWorksp
     __classPrivateFieldSet(this, _UmbBlockTypeWorkspaceElement_workspaceContext, context, "f");
     this._routes = [
         {
-            path: 'create/:elementTypeKey',
+            // Would it make more sense to have groupKey before elementTypeKey?
+            path: 'create/:elementTypeKey/:groupKey',
             component: __classPrivateFieldGet(this, _UmbBlockTypeWorkspaceElement_editorElement, "f"),
             setup: async (_component, info) => {
                 const elementTypeKey = info.match.params.elementTypeKey;
-                __classPrivateFieldGet(this, _UmbBlockTypeWorkspaceElement_workspaceContext, "f").create(elementTypeKey);
+                const groupKey = info.match.params.groupKey === 'null' ? null : info.match.params.groupKey;
+                __classPrivateFieldGet(this, _UmbBlockTypeWorkspaceElement_workspaceContext, "f").create(elementTypeKey, groupKey);
                 new UmbWorkspaceIsNewRedirectController(this, __classPrivateFieldGet(this, _UmbBlockTypeWorkspaceElement_workspaceContext, "f"), this.shadowRoot.querySelector('umb-router-slot'));
             },
         },

package/dist-cms/packages/core/localization/registry/localization.registry.d.ts

@@ -1,12 +1,12 @@
-import type { LocalizationSet } from '../../../../libs/localization-api/index.js';
+import type { UmbLocalizationSetBase } from '../../../../libs/localization-api/index.js';
 import type { UmbBackofficeExtensionRegistry } from '../../extension-registry/index.js';
 export declare class UmbLocalizationRegistry {
     #private;
+    readonly currentLanguage: import("rxjs/internal/Observable").Observable<string>;
     /**
      * Get the current registered translations.
      */
-    get localizations(): Map<string, LocalizationSet>;
-    get isDefaultLoaded(): import("rxjs/internal/Observable").Observable<boolean>;
+    get localizations(): Map<string, UmbLocalizationSetBase>;
     constructor(extensionRegistry: UmbBackofficeExtensionRegistry);
     /**
      * Load a language from the extension registry.

package/dist-cms/packages/core/localization/registry/localization.registry.js

@@ -3,72 +3,75 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _UmbLocalizationRegistry_instances, _UmbLocalizationRegistry_currentLanguage, _UmbLocalizationRegistry_isDefaultLoaded, _UmbLocalizationRegistry_addOrUpdateDictionary;
-import { registerLocalization, localizations, } from '../../../../libs/localization-api/index.js';
-import { hasDefaultExport, loadManifestPlainJs } from '../../../../libs/extension-api/index.js';
+var _UmbLocalizationRegistry_currentLanguage, _UmbLocalizationRegistry_loadedExtAliases, _UmbLocalizationRegistry_loadExtension;
+import { umbLocalizationManager } from '../../../../libs/localization-api/index.js';
 import { umbExtensionsRegistry } from '../../extension-registry/index.js';
-import { BehaviorSubject, Subject, combineLatest, map, distinctUntilChanged, filter, startWith, } from '../../../../external/rxjs/index.js';
+import { UmbStringState } from '../../../../libs/observable-api/index.js';
+import { combineLatest } from '../../../../external/rxjs/index.js';
+import { hasDefaultExport, loadManifestPlainJs } from '../../../../libs/extension-api/index.js';
+function addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary) {
+    for (const [key, value] of Object.entries(dictionary)) {
+        innerDictionary[`${dictionaryName}_${key}`] = value;
+    }
+}
 export class UmbLocalizationRegistry {
     /**
      * Get the current registered translations.
      */
     get localizations() {
-        return localizations;
-    }
-    get isDefaultLoaded() {
-        return __classPrivateFieldGet(this, _UmbLocalizationRegistry_isDefaultLoaded, "f").asObservable();
+        return umbLocalizationManager.localizations;
     }
     constructor(extensionRegistry) {
-        _UmbLocalizationRegistry_instances.add(this);
-        _UmbLocalizationRegistry_currentLanguage.set(this, new Subject());
-        _UmbLocalizationRegistry_isDefaultLoaded.set(this, new BehaviorSubject(false));
-        const currentLanguage$ = __classPrivateFieldGet(this, _UmbLocalizationRegistry_currentLanguage, "f").pipe(startWith(document.documentElement.lang || 'en-us'), map((x) => x.toLowerCase()), distinctUntilChanged());
-        const currentExtensions$ = extensionRegistry.extensionsOfType('localization').pipe(filter((x) => x.length > 0), distinctUntilChanged((prev, curr) => prev.length === curr.length && prev.every((x) => curr.includes(x))));
-        combineLatest([currentLanguage$, currentExtensions$]).subscribe(async ([userCulture, extensions]) => {
-            const locale = new Intl.Locale(userCulture);
-            const translations = await Promise.all(extensions
-                .filter((x) => x.meta.culture.toLowerCase() === locale.baseName.toLowerCase() ||
-                x.meta.culture.toLowerCase() === locale.language.toLowerCase())
-                .map(async (extension) => {
-                const innerDictionary = {};
-                // If extension contains a dictionary, add it to the inner dictionary.
-                if (extension.meta.localizations) {
-                    for (const [dictionaryName, dictionary] of Object.entries(extension.meta.localizations)) {
-                        __classPrivateFieldGet(this, _UmbLocalizationRegistry_instances, "m", _UmbLocalizationRegistry_addOrUpdateDictionary).call(this, innerDictionary, dictionaryName, dictionary);
-                    }
+        _UmbLocalizationRegistry_currentLanguage.set(this, new UmbStringState(document.documentElement.lang ?? 'en-us'));
+        this.currentLanguage = __classPrivateFieldGet(this, _UmbLocalizationRegistry_currentLanguage, "f").asObservable();
+        _UmbLocalizationRegistry_loadedExtAliases.set(this, []);
+        _UmbLocalizationRegistry_loadExtension.set(this, async (extension) => {
+            __classPrivateFieldGet(this, _UmbLocalizationRegistry_loadedExtAliases, "f").push(extension.alias);
+            const innerDictionary = {};
+            // If extension contains a dictionary, add it to the inner dictionary.
+            if (extension.meta.localizations) {
+                for (const [dictionaryName, dictionary] of Object.entries(extension.meta.localizations)) {
+                    addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
                 }
-                // If extension contains a js file, load it and add the default dictionary to the inner dictionary.
-                if (extension.js) {
-                    const loadedExtension = await loadManifestPlainJs(extension.js);
-                    if (loadedExtension && hasDefaultExport(loadedExtension)) {
-                        for (const [dictionaryName, dictionary] of Object.entries(loadedExtension.default)) {
-                            __classPrivateFieldGet(this, _UmbLocalizationRegistry_instances, "m", _UmbLocalizationRegistry_addOrUpdateDictionary).call(this, innerDictionary, dictionaryName, dictionary);
-                        }
+            }
+            // If extension contains a js file, load it and add the default dictionary to the inner dictionary.
+            if (extension.js) {
+                const loadedExtension = await loadManifestPlainJs(extension.js);
+                if (loadedExtension && hasDefaultExport(loadedExtension)) {
+                    for (const [dictionaryName, dictionary] of Object.entries(loadedExtension.default)) {
+                        addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
                     }
                 }
-                // Notify subscribers that the inner dictionary has changed.
-                return {
-                    $code: extension.meta.culture.toLowerCase(),
-                    $dir: extension.meta.direction ?? 'ltr',
-                    ...innerDictionary,
-                };
-            }));
-            if (translations.length) {
-                registerLocalization(...translations);
-                // Set the document language
-                const newLang = locale.baseName.toLowerCase();
-                if (document.documentElement.lang.toLowerCase() !== newLang) {
-                    document.documentElement.lang = newLang;
-                }
-                // Set the document direction to the direction of the primary language
-                const newDir = translations[0].$dir ?? 'ltr';
-                if (document.documentElement.dir !== newDir) {
-                    document.documentElement.dir = newDir;
-                }
             }
-            if (!__classPrivateFieldGet(this, _UmbLocalizationRegistry_isDefaultLoaded, "f").value) {
-                __classPrivateFieldGet(this, _UmbLocalizationRegistry_isDefaultLoaded, "f").next(true);
-                __classPrivateFieldGet(this, _UmbLocalizationRegistry_isDefaultLoaded, "f").complete();
+            // Notify subscribers that the inner dictionary has changed.
+            return {
+                $code: extension.meta.culture.toLowerCase(),
+                $dir: extension.meta.direction ?? 'ltr',
+                ...innerDictionary,
+            };
+        });
+        combineLatest([this.currentLanguage, extensionRegistry.extensionsOfType('localization')]).subscribe(async ([currentLanguage, extensions]) => {
+            const locale = new Intl.Locale(currentLanguage);
+            const filteredExt = extensions.filter((ext) => ext.meta.culture.toLowerCase() === locale.baseName.toLowerCase() ||
+                ext.meta.culture.toLowerCase() === locale.language.toLowerCase());
+            // Only get the extensions that are not already loading/loaded:
+            const diff = filteredExt.filter((ext) => !__classPrivateFieldGet(this, _UmbLocalizationRegistry_loadedExtAliases, "f").includes(ext.alias));
+            if (diff.length !== 0) {
+                // got new localizations to load:
+                const translations = await Promise.all(diff.map(__classPrivateFieldGet(this, _UmbLocalizationRegistry_loadExtension, "f")));
+                if (translations.length) {
+                    umbLocalizationManager.registerManyLocalizations(translations);
+                    // Set the document language
+                    const newLang = locale.baseName.toLowerCase();
+                    if (document.documentElement.lang.toLowerCase() !== newLang) {
+                        document.documentElement.lang = newLang;
+                    }
+                    // Set the document direction to the direction of the primary language
+                    const newDir = translations[0].$dir ?? 'ltr';
+                    if (document.documentElement.dir !== newDir) {
+                        document.documentElement.dir = newDir;
+                    }
+                }
             }
         });
     }
@@ -77,12 +80,8 @@ export class UmbLocalizationRegistry {
      * @param locale The locale to load.
      */
     loadLanguage(locale) {
-        __classPrivateFieldGet(this, _UmbLocalizationRegistry_currentLanguage, "f").next(locale);
+        __classPrivateFieldGet(this, _UmbLocalizationRegistry_currentLanguage, "f").setValue(locale.toLowerCase());
     }
 }
-_UmbLocalizationRegistry_currentLanguage = new WeakMap(), _UmbLocalizationRegistry_isDefaultLoaded = new WeakMap(), _UmbLocalizationRegistry_instances = new WeakSet(), _UmbLocalizationRegistry_addOrUpdateDictionary = function _UmbLocalizationRegistry_addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary) {
-    for (const [key, value] of Object.entries(dictionary)) {
-        innerDictionary[`${dictionaryName}_${key}`] = value;
-    }
-};
+_UmbLocalizationRegistry_currentLanguage = new WeakMap(), _UmbLocalizationRegistry_loadedExtAliases = new WeakMap(), _UmbLocalizationRegistry_loadExtension = new WeakMap();
 export const umbLocalizationRegistry = new UmbLocalizationRegistry(umbExtensionsRegistry);

package/dist-cms/packages/core/tree/tree-menu-item-default/tree-menu-item-default.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { html, nothing, customElement, property } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-import { umbExtensionsRegistry, } from '../../extension-registry/index.js';
+import { umbExtensionsRegistry } from '../../extension-registry/index.js';
 // TODO: Move to separate file:
 const manifest = {
     type: 'kind',

package/dist-cms/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.js

@@ -297,7 +297,7 @@ _UmbDocumentTypeWorkspaceViewEditElement_remove = function _UmbDocumentTypeWorks
         return;
     this._workspaceContext?.structure.removeContainer(null, tabId);
     this._tabsStructureHelper?.isOwnerContainer(tabId)
-        ? window.history.replaceState(null, '', this._routerPath + this._routes[0]?.path ?? '/root')
+        ? window.history.replaceState(null, '', this._routerPath + (this._routes[0]?.path ?? '/root'))
         : '';
 };
 _UmbDocumentTypeWorkspaceViewEditElement_addTab = async function _UmbDocumentTypeWorkspaceViewEditElement_addTab() {

package/dist-cms/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit.element.js

@@ -297,7 +297,7 @@ _UmbMediaTypeWorkspaceViewEditElement_remove = function _UmbMediaTypeWorkspaceVi
         return;
     this._workspaceContext?.structure.removeContainer(null, tabId);
     this._tabsStructureHelper?.isOwnerContainer(tabId)
-        ? window.history.replaceState(null, '', this._routerPath + this._routes[0]?.path ?? '/root')
+        ? window.history.replaceState(null, '', this._routerPath + (this._routes[0]?.path ?? '/root'))
         : '';
 };
 _UmbMediaTypeWorkspaceViewEditElement_addTab = async function _UmbMediaTypeWorkspaceViewEditElement_addTab() {

package/dist-cms/packages/user/current-user/current-user.context.js

@@ -30,13 +30,8 @@ export class UmbCurrentUserContext extends UmbBaseController {
             __classPrivateFieldSet(this, _UmbCurrentUserContext_authContext, instance, "f");
             __classPrivateFieldGet(this, _UmbCurrentUserContext_instances, "m", _UmbCurrentUserContext_observeIsAuthorized).call(this);
         });
-        // TODO: revisit this. It can probably be simplified
-        this.observe(umbLocalizationRegistry.isDefaultLoaded, (isDefaultLoaded) => {
-            if (!isDefaultLoaded)
-                return;
-            this.observe(this.languageIsoCode, (currentLanguageIsoCode) => {
-                umbLocalizationRegistry.loadLanguage(currentLanguageIsoCode);
-            }, 'umbCurrentUserLanguageIsoCode');
+        this.observe(this.languageIsoCode, (currentLanguageIsoCode) => {
+            umbLocalizationRegistry.loadLanguage(currentLanguageIsoCode);
         });
         this.provideContext(UMB_CURRENT_USER_CONTEXT, this);
     }

package/dist-cms/shared/auth/auth-flow.d.ts

@@ -42,14 +42,12 @@ export declare class UmbAuthFlow {
      * This method will initialize all the state needed for the auth flow.
      *
      * It will:
-     * - Fetch the service configuration from the server
      * - Check if there is a token response in local storage
      * - If there is a token response, check if it is valid
      * - If it is not valid, check if there is a new authorization to be made
      * - If there is a new authorization to be made, complete it
      * - If there is no token response, check if there is a new authorization to be made
      * - If there is a new authorization to be made, complete it
-     * - If there is no new authorization to be made, do nothing
      */
     setInitialState(): Promise<void>;
     /**

package/dist-cms/shared/auth/auth-flow.js

@@ -10,9 +10,24 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _UmbAuthFlow_instances, _UmbAuthFlow_notifier, _UmbAuthFlow_authorizationHandler, _UmbAuthFlow_tokenHandler, _UmbAuthFlow_storageBackend, _UmbAuthFlow_configuration, _UmbAuthFlow_redirectUri, _UmbAuthFlow_clientId, _UmbAuthFlow_scope, _UmbAuthFlow_refreshToken, _UmbAuthFlow_accessTokenResponse, _UmbAuthFlow_saveTokenState, _UmbAuthFlow_makeRefreshTokenRequest;
-import { BaseTokenRequestHandler, BasicQueryStringUtils, FetchRequestor, LocalStorageBackend, RedirectRequestHandler, AuthorizationRequest, AuthorizationNotifier, AuthorizationServiceConfiguration, GRANT_TYPE_AUTHORIZATION_CODE, GRANT_TYPE_REFRESH_TOKEN, RevokeTokenRequest, TokenRequest, TokenResponse } from '../../external/openid/index.js';
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+import { UMB_STORAGE_REDIRECT_URL, UMB_STORAGE_TOKEN_RESPONSE_NAME } from './auth.context.token.js';
+import { BaseTokenRequestHandler, BasicQueryStringUtils, FetchRequestor, LocalStorageBackend, RedirectRequestHandler, AuthorizationRequest, AuthorizationNotifier, AuthorizationServiceConfiguration, GRANT_TYPE_AUTHORIZATION_CODE, GRANT_TYPE_REFRESH_TOKEN, RevokeTokenRequest, TokenRequest, TokenResponse, } from '../../external/openid/index.js';
 const requestor = new FetchRequestor();
-const TOKEN_RESPONSE_NAME = 'umb:userAuthTokenResponse';
 /**
  * This class is needed to prevent the hash from being parsed as part of the query string.
  */
@@ -103,6 +118,14 @@ export class UmbAuthFlow {
                 await __classPrivateFieldGet(this, _UmbAuthFlow_instances, "m", _UmbAuthFlow_makeRefreshTokenRequest).call(this, response.code, codeVerifier);
                 await this.performWithFreshTokens();
                 await __classPrivateFieldGet(this, _UmbAuthFlow_instances, "m", _UmbAuthFlow_saveTokenState).call(this);
+                // Redirect to the saved state or root
+                let currentRoute = '/';
+                const savedRoute = sessionStorage.getItem(UMB_STORAGE_REDIRECT_URL);
+                if (savedRoute) {
+                    sessionStorage.removeItem(UMB_STORAGE_REDIRECT_URL);
+                    currentRoute = savedRoute;
+                }
+                history.replaceState(null, '', currentRoute);
             }
         });
     }
@@ -110,17 +133,15 @@ export class UmbAuthFlow {
      * This method will initialize all the state needed for the auth flow.
      *
      * It will:
-     * - Fetch the service configuration from the server
      * - Check if there is a token response in local storage
      * - If there is a token response, check if it is valid
      * - If it is not valid, check if there is a new authorization to be made
      * - If there is a new authorization to be made, complete it
      * - If there is no token response, check if there is a new authorization to be made
      * - If there is a new authorization to be made, complete it
-     * - If there is no new authorization to be made, do nothing
      */
     async setInitialState() {
-        const tokenResponseJson = await __classPrivateFieldGet(this, _UmbAuthFlow_storageBackend, "f").getItem(TOKEN_RESPONSE_NAME);
+        const tokenResponseJson = await __classPrivateFieldGet(this, _UmbAuthFlow_storageBackend, "f").getItem(UMB_STORAGE_TOKEN_RESPONSE_NAME);
         if (tokenResponseJson) {
             const response = new TokenResponse(JSON.parse(tokenResponseJson));
             if (response.isValid()) {
@@ -128,8 +149,6 @@ export class UmbAuthFlow {
                 __classPrivateFieldSet(this, _UmbAuthFlow_refreshToken, __classPrivateFieldGet(this, _UmbAuthFlow_accessTokenResponse, "f").refreshToken, "f");
             }
         }
-        // If no token was found, or if it was invalid, check if there is a new authorization to be made
-        await this.completeAuthorizationIfPossible();
     }
     /**
      * This method will check if there is a new authorization to be made and complete it if there is.
@@ -174,7 +193,7 @@ export class UmbAuthFlow {
      * Forget all cached token state
      */
     async clearTokenStorage() {
-        await __classPrivateFieldGet(this, _UmbAuthFlow_storageBackend, "f").removeItem(TOKEN_RESPONSE_NAME);
+        await __classPrivateFieldGet(this, _UmbAuthFlow_storageBackend, "f").removeItem(UMB_STORAGE_TOKEN_RESPONSE_NAME);
         // clear the internal state
         __classPrivateFieldSet(this, _UmbAuthFlow_accessTokenResponse, undefined, "f");
         __classPrivateFieldSet(this, _UmbAuthFlow_refreshToken, undefined, "f");
@@ -247,7 +266,7 @@ _UmbAuthFlow_notifier = new WeakMap(), _UmbAuthFlow_authorizationHandler = new W
  */
 async function _UmbAuthFlow_saveTokenState() {
     if (__classPrivateFieldGet(this, _UmbAuthFlow_accessTokenResponse, "f")) {
-        await __classPrivateFieldGet(this, _UmbAuthFlow_storageBackend, "f").setItem(TOKEN_RESPONSE_NAME, JSON.stringify(__classPrivateFieldGet(this, _UmbAuthFlow_accessTokenResponse, "f").toJson()));
+        await __classPrivateFieldGet(this, _UmbAuthFlow_storageBackend, "f").setItem(UMB_STORAGE_TOKEN_RESPONSE_NAME, JSON.stringify(__classPrivateFieldGet(this, _UmbAuthFlow_accessTokenResponse, "f").toJson()));
     }
 }, _UmbAuthFlow_makeRefreshTokenRequest = 
 /**

package/dist-cms/shared/auth/auth.context.d.ts

@@ -1,17 +1,20 @@
-import type { IUmbAuthContext } from './auth.context.interface.js';
 import type { UmbControllerHostElement } from '../../libs/controller-api/index.js';
 import { UmbBaseController } from '../../libs/class-api/index.js';
-export declare class UmbAuthContext extends UmbBaseController implements IUmbAuthContext {
+export declare class UmbAuthContext extends UmbBaseController {
     #private;
     readonly isAuthorized: import("rxjs").Observable<boolean>;
     constructor(host: UmbControllerHostElement, serverUrl: string, backofficePath: string, isBypassed: boolean);
     /**
      * Initiates the login flow.
      */
-    login(): void;
+    makeAuthorizationRequest(): void;
+    /**
+     * Completes the login flow.
+     */
+    completeAuthorizationRequest(): Promise<void>;
     /**
      * Checks if the user is authorized. If Authorization is bypassed, the user is always authorized.
-     * @returns {boolean} True if the user is authorized, otherwise false.
+     * @returns True if the user is authorized, otherwise false.
      */
     getIsAuthorized(): boolean;
     /**
@@ -25,6 +28,13 @@ export declare class UmbAuthContext extends UmbBaseController implements IUmbAut
      *
      * NB! The user may experience being redirected to the login screen if the token is expired.
      *
+     * @example
+     * ```js
+     *   const token = await authContext.getLatestToken();
+     *   const result = await fetch('https://my-api.com', { headers: { Authorization: `Bearer ${token}` } });
+     * ```
+     *
+     * @memberof UmbAuthContext
      * @returns The latest token from the Management API
      */
     getLatestToken(): Promise<string>;
@@ -35,7 +45,6 @@ export declare class UmbAuthContext extends UmbBaseController implements IUmbAut
     clearTokenStorage(): Promise<void>;
     /**
      * Signs the user out by removing any tokens from the browser.
-     * @return {*}  {Promise<void>}
      * @memberof UmbAuthContext
      */
     signOut(): Promise<void>;

package/dist-cms/shared/auth/auth.context.js

@@ -31,12 +31,18 @@ export class UmbAuthContext extends UmbBaseController {
     /**
      * Initiates the login flow.
      */
-    login() {
+    makeAuthorizationRequest() {
         return __classPrivateFieldGet(this, _UmbAuthContext_authFlow, "f").makeAuthorizationRequest();
     }
+    /**
+     * Completes the login flow.
+     */
+    completeAuthorizationRequest() {
+        return __classPrivateFieldGet(this, _UmbAuthContext_authFlow, "f").completeAuthorizationIfPossible();
+    }
     /**
      * Checks if the user is authorized. If Authorization is bypassed, the user is always authorized.
-     * @returns {boolean} True if the user is authorized, otherwise false.
+     * @returns True if the user is authorized, otherwise false.
      */
     getIsAuthorized() {
         if (__classPrivateFieldGet(this, _UmbAuthContext_isBypassed, "f")) {
@@ -62,6 +68,13 @@ export class UmbAuthContext extends UmbBaseController {
      *
      * NB! The user may experience being redirected to the login screen if the token is expired.
      *
+     * @example
+     * ```js
+     *   const token = await authContext.getLatestToken();
+     *   const result = await fetch('https://my-api.com', { headers: { Authorization: `Bearer ${token}` } });
+     * ```
+     *
+     * @memberof UmbAuthContext
      * @returns The latest token from the Management API
      */
     getLatestToken() {
@@ -76,7 +89,6 @@ export class UmbAuthContext extends UmbBaseController {
     }
     /**
      * Signs the user out by removing any tokens from the browser.
-     * @return {*}  {Promise<void>}
      * @memberof UmbAuthContext
      */
     signOut() {

package/dist-cms/shared/auth/auth.context.token.d.ts

@@ -1,3 +1,5 @@
-import type { IUmbAuthContext } from './auth.context.interface.js';
+import type { UmbAuthContext } from './auth.context.js';
 import { UmbContextToken } from '../../libs/context-api/index.js';
-export declare const UMB_AUTH_CONTEXT: UmbContextToken<IUmbAuthContext, IUmbAuthContext>;
+export declare const UMB_AUTH_CONTEXT: UmbContextToken<UmbAuthContext, UmbAuthContext>;
+export declare const UMB_STORAGE_TOKEN_RESPONSE_NAME = "umb:userAuthTokenResponse";
+export declare const UMB_STORAGE_REDIRECT_URL = "umb:auth:redirect";

package/dist-cms/shared/auth/auth.context.token.js

@@ -1,2 +1,4 @@
 import { UmbContextToken } from '../../libs/context-api/index.js';
 export const UMB_AUTH_CONTEXT = new UmbContextToken('UmbAuthContext');
+export const UMB_STORAGE_TOKEN_RESPONSE_NAME = 'umb:userAuthTokenResponse';
+export const UMB_STORAGE_REDIRECT_URL = 'umb:auth:redirect';

package/dist-cms/shared/auth/index.d.ts

@@ -1,3 +1,2 @@
-export * from './auth.context.interface.js';
 export * from './auth.context.js';
 export * from './auth.context.token.js';

package/dist-cms/shared/auth/index.js

@@ -1,3 +1,2 @@
-export * from './auth.context.interface.js';
 export * from './auth.context.js';
 export * from './auth.context.token.js';