@umbraco-cms/backoffice 14.0.0-5a2334a0 → 14.0.0-828c62a3

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

@@ -79,14 +79,14 @@ export let UmbAppElement = class UmbAppElement extends UmbLitElement {
         try {
             // Get the current runtime level
             await this.#setInitStatus();
-            if (this.bypassAuth === false) {
-                // Get service configuration from authentication server
-                await this.#authFlow.setInitialState();
-                // Instruct all requests to use the auth flow to get and use the access_token for all subsequent requests
-                OpenAPI.TOKEN = () => this.#authFlow.performWithFreshTokens();
-                OpenAPI.WITH_CREDENTIALS = true;
+            // If the runtime level is "install" we should clear any cached tokens
+            // else we should try and set the auth status
+            if (this.#runtimeLevel === RuntimeLevelModel.INSTALL) {
+                await authContext.signOut();
+            }
+            else {
+                await this.#setAuthStatus(authContext);
             }
-            authContext.isLoggedIn.next(true);
             // Initialise the router
             this.#redirect();
         }
@@ -134,6 +134,16 @@ export let UmbAppElement = class UmbAppElement extends UmbLitElement {
         }
         this.#runtimeLevel = data?.serverStatus ?? RuntimeLevelModel.UNKNOWN;
     }
+    async #setAuthStatus(authContext) {
+        if (this.bypassAuth === false) {
+            // Get service configuration from authentication server
+            await authContext.setInitialState();
+            // Instruct all requests to use the auth flow to get and use the access_token for all subsequent requests
+            OpenAPI.TOKEN = () => this.#authFlow.performWithFreshTokens();
+            OpenAPI.WITH_CREDENTIALS = true;
+        }
+        authContext.isLoggedIn.next(true);
+    }
     #redirect() {
         switch (this.#runtimeLevel) {
             case RuntimeLevelModel.INSTALL:

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

@@ -1 +1 @@
-{"version":3,"file":"app.element.js","sourceRoot":"","sources":["../../../src/apps/app/app.element.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.element.js","sourceRoot":"","sources":["../../../src/apps/app/app.element.ts"],"names":[],"mappings":"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"}

package/dist-cms/apps/backoffice/extension.controller.d.ts

@@ -1,9 +1,8 @@
-import { UmbController, UmbControllerHostElement } from '../../libs/controller-api/index.js';
+import { UmbBaseController, UmbControllerHost } from '../../libs/controller-api/index.js';
 import { UmbBackofficeExtensionRegistry } from '../../packages/core/extension-registry/index.js';
-export declare class UmbExtensionInitializer extends UmbController {
+export declare class UmbExtensionInitializer extends UmbBaseController {
     #private;
-    host: UmbControllerHostElement;
-    constructor(host: UmbControllerHostElement, extensionRegistry: UmbBackofficeExtensionRegistry);
+    constructor(host: UmbControllerHost, extensionRegistry: UmbBackofficeExtensionRegistry);
     setLocalPackages(localPackages: Array<Promise<any>>): void;
     hostConnected(): void;
     hostDisconnected(): void;

package/dist-cms/apps/backoffice/extension.controller.js

@@ -1,16 +1,15 @@
 import { Subject } from '../../external/rxjs/index.js';
 import { PackageResource, OpenAPI } from '../../external/backend-api/index.js';
-import { UmbController } from '../../libs/controller-api/index.js';
+import { UmbBaseController } from '../../libs/controller-api/index.js';
 import { tryExecuteAndNotify } from '../../shared/resources/index.js';
 import { isManifestJSType } from '../../libs/extension-api/index.js';
-export class UmbExtensionInitializer extends UmbController {
+export class UmbExtensionInitializer extends UmbBaseController {
     #extensionRegistry;
     #unobserve = new Subject();
     #localPackages = [];
     #apiBaseUrl = OpenAPI.BASE;
     constructor(host, extensionRegistry) {
         super(host, UmbExtensionInitializer.name);
-        this.host = host;
         this.#extensionRegistry = extensionRegistry;
     }
     setLocalPackages(localPackages) {
@@ -38,7 +37,7 @@ export class UmbExtensionInitializer extends UmbController {
 
             This code is copy pasted from the package repository. We probably don't need this is the package repository anymore.
         */
-        const { data: packages } = await tryExecuteAndNotify(this.host, PackageResource.getPackageManifest());
+        const { data: packages } = await tryExecuteAndNotify(this._host, PackageResource.getPackageManifest());
         if (packages) {
             // Append packages to the store but only if they have a name
             //store.appendItems(packages.filter((p) => p.name?.length));

package/dist-cms/apps/backoffice/extension.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"extension.controller.js","sourceRoot":"","sources":["../../../src/apps/backoffice/extension.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAA4B,MAAM,wCAAwC,CAAC;AAEjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAgB,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEvF,MAAM,OAAO,uBAAwB,SAAQ,aAAa;IAEzD,kBAAkB,CAAiC;IACnD,UAAU,GAAG,IAAI,OAAO,EAAQ,CAAC;IACjC,cAAc,GAAwB,EAAE,CAAC;IACzC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3B,YAAY,IAA8B,EAAE,iBAAiD;QAC5F,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAED,gBAAgB,CAAC,aAAkC;QAClD,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa;QACZ,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC5B,CAAC;IAED,gBAAgB;QACf,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;YACnD,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC;YAC1C,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB;;;;;;UAME;QACF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAEtG,IAAI,QAAQ,EAAE;YACb,4DAA4D;YAC5D,4DAA4D;YAC5D,MAAM,UAAU,GAAmB,EAAE,CAAC;YAEtC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACtB,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3B,kFAAkF;oBAClF,2CAA2C;oBAC3C,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;wBAC3B;;;2BAGG;wBACH,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE;4BACxB,8CAA8C;4BAC9C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gCAC7B,CAAC,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;6BACpC;yBACD;wBAED,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;qBACnB;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;SACjD;IACF,CAAC;IAEO,cAAc,CAAC,CAAU;QAChC,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,OAAO,IAAI,CAAC,CAAC;IAC5D,CAAC;CACD"}
+{"version":3,"file":"extension.controller.js","sourceRoot":"","sources":["../../../src/apps/backoffice/extension.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAqB,MAAM,wCAAwC,CAAC;AAE9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAgB,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEvF,MAAM,OAAO,uBAAwB,SAAQ,iBAAiB;IAC7D,kBAAkB,CAAiC;IACnD,UAAU,GAAG,IAAI,OAAO,EAAQ,CAAC;IACjC,cAAc,GAAwB,EAAE,CAAC;IACzC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3B,YAAY,IAAuB,EAAE,iBAAiD;QACrF,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAED,gBAAgB,CAAC,aAAkC;QAClD,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa;QACZ,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC5B,CAAC;IAED,gBAAgB;QACf,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;YACnD,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC;YAC1C,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB;;;;;;UAME;QACF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE,eAAe,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAEvG,IAAI,QAAQ,EAAE;YACb,4DAA4D;YAC5D,4DAA4D;YAC5D,MAAM,UAAU,GAAmB,EAAE,CAAC;YAEtC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACtB,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3B,kFAAkF;oBAClF,2CAA2C;oBAC3C,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;wBAC3B;;;2BAGG;wBACH,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE;4BACxB,8CAA8C;4BAC9C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gCAC7B,CAAC,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;6BACpC;yBACD;wBAED,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;qBACnB;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;SACjD;IACF,CAAC;IAEO,cAAc,CAAC,CAAU;QAChC,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,OAAO,IAAI,CAAC,CAAC;IAC5D,CAAC;CACD"}