@umbraco-cms/backoffice 17.5.0-rc → 17.5.0-rc2

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

@@ -217,7 +217,7 @@ let UmbAppElement = class UmbAppElement extends UmbLitElement {
         onInit(this, umbExtensionsRegistry);
         // Register public extensions (login extensions)
         await new UmbServerExtensionRegistrator(this, umbExtensionsRegistry).registerPublicExtensions();
-        new UmbAppEntryPointExtensionInitializer(this, umbExtensionsRegistry);
+        const entryPointInitializer = new UmbAppEntryPointExtensionInitializer(this, umbExtensionsRegistry);
         // Try to initialise the auth flow and get the runtime status
         try {
             // If the runtime level is "install" or ?status=false is set, we should clear any cached tokens
@@ -230,6 +230,11 @@ let UmbAppElement = class UmbAppElement extends UmbLitElement {
             else {
                 await this.#setAuthStatus();
             }
+            // The login screen decides which auth provider to use from the registered
+            // `authProvider` extensions. App-entry-points may register or unregister those during
+            // their async onInit, so wait for them to settle before routing — otherwise on a slow
+            // connection the decision races and falls back to the local login.
+            await this.observe(entryPointInitializer.loaded).asPromise();
             // Initialise the router
             this.#redirect();
         }

package/dist-cms/assets/lang/de.js

@@ -967,7 +967,7 @@ export default {
         greeting5: 'Willkommen',
         greeting6: 'Willkommen',
         instruction: 'Hier anmelden:',
-        signInWith: 'Anmelden mit',
+        signInWith: 'Anmelden mit {0}',
         timeout: 'Sitzung abgelaufen',
         bottomText: '<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.org</a></p> ',
         forgottenPassword: 'Kennwort vergessen?',

package/dist-cms/assets/lang/fr.js

@@ -848,7 +848,7 @@ export default {
         greeting5: 'Bienvenue',
         greeting6: 'Bienvenue',
         instruction: 'Connectez-vous ci-dessous',
-        signInWith: 'Identifiez-vous avec',
+        signInWith: 'Identifiez-vous avec {0}',
         timeout: 'La session a expiré',
         bottomText: '<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">Umbraco.com</a></p> ',
         forgottenPassword: 'Mot de passe oublié?',

package/dist-cms/assets/lang/nb.js

@@ -660,7 +660,7 @@ export default {
         greeting5: 'Velkommen',
         greeting6: 'Velkommen',
         instruction: 'Logg på nedenfor',
-        signInWith: 'Logg på med',
+        signInWith: 'Logg på med {0}',
         timeout: 'Din sesjon er utløpt',
         bottomText: '<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ',
     },

package/dist-cms/assets/lang/nl.js

@@ -866,7 +866,7 @@ export default {
         greeting5: 'Welkom',
         greeting6: 'Welkom',
         instruction: 'log hieronder in',
-        signInWith: 'Inloggen met',
+        signInWith: 'Inloggen met {0}',
         timeout: 'Sessie is verlopen',
         bottomText: '<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p>',
         forgottenPassword: 'Wachtwoord vergeten?',

package/dist-cms/assets/lang/sv.js

@@ -644,7 +644,7 @@ export default {
         greeting5: 'Välkommen',
         greeting6: 'Välkommen',
         instruction: 'Logga in nedan',
-        signInWith: 'Logga in med',
+        signInWith: 'Logga in med {0}',
         timeout: 'Sessionen har nått sin maxgräns',
     },
     main: {

package/dist-cms/libs/extension-api/initializers/extension-initializer-base.js

@@ -7,28 +7,52 @@ export class UmbExtensionInitializerBase extends UmbControllerBase {
     #extensionMap;
     // Use the value `undefined`, as that would not resolve a observation promise. [NL]
     #loaded;
+    // Identifies the current processing pass. The observer callback is async, so passes can
+    // overlap; only the latest pass is allowed to settle `loaded`, so a slower earlier pass
+    // cannot unblock waiters before the newest set of extensions has finished instantiating.
+    #loadPass;
     constructor(host, extensionRegistry, manifestType) {
         super(host);
         this.#extensionMap = new Map();
         // Use the value `undefined`, as that would not resolve a observation promise. [NL]
         this.#loaded = new UmbBooleanState(undefined);
         this.loaded = this.#loaded.asObservable();
+        // Identifies the current processing pass. The observer callback is async, so passes can
+        // overlap; only the latest pass is allowed to settle `loaded`, so a slower earlier pass
+        // cannot unblock waiters before the newest set of extensions has finished instantiating.
+        this.#loadPass = 0;
         this.host = host;
         this.extensionRegistry = extensionRegistry;
         this.observe(extensionRegistry.byType(manifestType), async (extensions) => {
+            const pass = ++this.#loadPass;
+            // Re-arm while this pass is in flight so a consumer awaiting `loaded` waits for it to
+            // finish instead of resolving on a stale `true` from a previous pass. `undefined`
+            // rather than `false` because `asPromise()` resolves on the first non-undefined value.
+            this.#loaded.setValue(undefined);
             this.#extensionMap.forEach((existingExt) => {
                 if (!extensions.find((b) => b.alias === existingExt.alias)) {
                     this.unloadExtension(existingExt);
                     this.#extensionMap.delete(existingExt.alias);
                 }
             });
-            await Promise.all(extensions.map((extension) => {
+            // `allSettled` so a throwing/rejecting `instantiateExtension` cannot leave `loaded`
+            // stuck at `undefined` and hang a waiter (e.g. the app boot gate). Failures are
+            // surfaced rather than swallowed.
+            const results = await Promise.allSettled(extensions.map((extension) => {
                 if (this.#extensionMap.has(extension.alias))
                     return;
                 this.#extensionMap.set(extension.alias, extension);
                 return this.instantiateExtension(extension);
             }));
-            if (extensions.length > 0) {
+            for (const result of results) {
+                if (result.status === 'rejected') {
+                    console.error('[UmbExtensionInitializer] Failed to instantiate extension', result.reason);
+                }
+            }
+            // Only the latest pass settles `loaded`. Resolving unconditionally — including for
+            // zero extensions — so a consumer awaiting `loaded` (the app-entry-point boot gate,
+            // the bundle guard) never hangs on a default install that registers none of this type.
+            if (pass === this.#loadPass) {
                 this.#loaded.setValue(true);
             }
         });