@betterportal/config-manager 10.6.31 → 10.6.32

package/lib/plugins/service-betterportal-config-manager/appQueries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"appQueries.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/appQueries.ts"],"names":[],"mappings":"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"}

package/lib/plugins/service-betterportal-config-manager/appQueries.js

@@ -0,0 +1,330 @@
+import { isDeepStrictEqual } from "node:util";
+import { randomUUID } from "node:crypto";
+import { BetterPortalAppSchema, BetterPortalTenantSchema, BetterPortalConfigSchema, resolveEmbeddedRequestContext } from "@betterportal/framework";
+import { getAvailableServiceInstanceIdsForApp, getServicePluginId, resolveAuthProviderRuntimeMetadata } from "./storage/core.js";
+import { AppDataConflictError, appSettings } from "./storage/appData.js";
+export async function readAppEditor(client, db, appId) {
+    const rows = await db.appData.read(client, db.entities, appId);
+    const app = rows.entities[0]?.value;
+    const empty = { apps: [], tenants: [], platformServices: [], sharedServiceCatalog: [], sharedServiceActivations: [], previewEnvironmentDeployments: [] };
+    if (!app)
+        return empty;
+    db.appData.hydrate([app], rows);
+    const result = await client.query(`with tenant as (
+      select value from ${db.entities} where scope_id=$1 and kind='tenants' and entity_id=$2
+    ), activations as (
+      select value from ${db.entities} where scope_id=$1 and kind='sharedServiceActivations'
+        and value->>'tenantId'=$2 and (value->>'appId' is null or value->>'appId'=$3)
+    ) select kind, entity_id, value from ${db.entities} where scope_id=$1 and (
+      (kind='tenants' and entity_id=$2)
+      or (kind='previewEnvironmentDeployments' and value->>'appId'=$3)
+      or (kind='tenantServices' and value->>'tenantId'=$2)
+      or (kind='platformServices' and entity_id in (select jsonb_array_elements_text(value->'activatedPlatformServices') from tenant))
+      or (kind='sharedServiceActivations' and value in (select value from activations))
+      or (kind='sharedServiceCatalog' and entity_id in (select value->>'sharedServiceId' from activations))) order by ordinal`, [db.scope, app.tenantId, appId]);
+    const values = (kind) => result.rows.filter(row => row.kind === kind).map(row => row.value);
+    const tenant = values("tenants")[0];
+    if (!tenant)
+        throw new Error("App tenant is missing");
+    tenant.services = values("tenantServices").map(({ tenantId: _tenantId, ...service }) => service);
+    return { apps: [BetterPortalAppSchema.parse(app)], tenants: [BetterPortalTenantSchema.parse(tenant)],
+        platformServices: values("platformServices"), sharedServiceCatalog: values("sharedServiceCatalog"),
+        sharedServiceActivations: values("sharedServiceActivations"), previewEnvironmentDeployments: values("previewEnvironmentDeployments") };
+}
+/** A short transaction over one app's relational collections. No platform snapshots. */
+export async function editAppRows(db, appId, obs, change) {
+    const span = obs?.startSpan("bp.app.edit");
+    const waiting = span?.startSpan("bp.app.pool_wait");
+    let client;
+    try {
+        client = await db.pool.connect();
+    }
+    catch (error) {
+        span?.end();
+        throw error;
+    }
+    finally {
+        waiting?.end();
+    }
+    try {
+        await client.query("begin");
+        await client.query("set local betterportal.app_data_writer = '3'");
+        const lock = span?.startSpan("bp.app.lock");
+        try {
+            await client.query("select pg_advisory_xact_lock(hashtextextended($1,0))", [JSON.stringify([db.tableName, db.scope, JSON.stringify(["apps", appId])])]);
+        }
+        finally {
+            lock?.end();
+        }
+        const reading = span?.startSpan("bp.app.read");
+        let data;
+        try {
+            data = await readAppEditor(client, db, appId);
+        }
+        finally {
+            reading?.end();
+        }
+        const before = data.apps[0] && structuredClone(data.apps[0]);
+        const availableAtRead = before ? getAvailableServiceInstanceIdsForApp(data, before) : new Set();
+        const result = await change(data);
+        if (result instanceof Response && !result.ok) {
+            await client.query("rollback");
+            return result;
+        }
+        if (!before) {
+            await client.query("rollback");
+            return result;
+        }
+        const after = BetterPortalAppSchema.parse(data.apps[0]);
+        if (before.auth?.roles.some(role => role.id === "*") && !after.auth?.roles.some(role => role.id === "*")) {
+            throw new Error("The reserved platform root role cannot be removed");
+        }
+        for (const route of after.routes) {
+            for (const path of [route.path, route.targetPath, route.servicePathVariant, route.resolvedServicePath]) {
+                if (path && /\{[^}]+\}/.test(path))
+                    throw new Error("Route paths must use :param syntax");
+            }
+            for (const [name, value] of Object.entries(route.fixedParams ?? {})) {
+                if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name) || value.length < 1 || value.length > 100)
+                    throw new Error("Invalid fixed route parameter");
+            }
+        }
+        if (!isDeepStrictEqual(appSettings(before), appSettings(after)))
+            throw new Error("App data edit cannot modify app settings");
+        if (db.appData.changed(before, after)) {
+            const writing = span?.startSpan("bp.app.write");
+            try {
+                // Existing writers use the same dependency lock names; refresh allocations after acquiring them.
+                const refs = [
+                    ...data.tenants.map(value => ["tenants", value.id]),
+                    ...data.tenants.flatMap(tenant => tenant.services.map(value => ["tenantServices", value.id])),
+                    ...data.platformServices.map(value => ["platformServices", value.id]),
+                    ...data.sharedServiceCatalog.map(value => ["sharedServiceCatalog", value.id]),
+                    ...data.sharedServiceActivations.map(value => ["sharedServiceActivations", value.id])
+                ];
+                await client.query(`select pg_advisory_xact_lock_shared(hashtextextended(k,0)) from unnest($1::text[]) k order by k`, [refs.map(ref => JSON.stringify([db.tableName, db.scope, JSON.stringify(ref)])).sort()]);
+                const current = await readAppEditor(client, db, appId);
+                const allowed = getAvailableServiceInstanceIdsForApp(current, after);
+                for (const serviceId of [
+                    ...after.routes.map(route => route.serviceId),
+                    ...(after.auth?.roles ?? []).flatMap(role => role.permissions.map(grant => grant.serviceId)),
+                    ...(after.auth?.serviceId ? [after.auth.serviceId] : []),
+                    ...(after.shell?.serviceId ? [after.shell.serviceId] : []),
+                    ...after.slots.map(slot => slot.serviceId),
+                    ...Object.values(after.fragments).flatMap(fragments => fragments.map(fragment => fragment.serviceId)),
+                    ...Object.values(after.auth?.redirects ?? {}).flatMap(target => target ? [target.serviceId] : [])
+                ]) {
+                    // A dependency absent from the original read has no lock/reference in this transaction.
+                    if (!allowed.has(serviceId))
+                        throw new Error("App references an unavailable service");
+                    if (!availableAtRead.has(serviceId))
+                        throw new AppDataConflictError();
+                }
+                await db.appData.save(client, appId, before, after);
+                const used = new Set();
+                const visit = (value) => {
+                    if (!value || typeof value !== "object")
+                        return;
+                    for (const [key, child] of Object.entries(value)) {
+                        if (key === "serviceId" && typeof child === "string")
+                            used.add(child);
+                        else
+                            visit(child);
+                    }
+                };
+                visit(after);
+                await client.query(`delete from ${db.references} where scope_id=$1 and kind='apps' and entity_id=$2
+          and target_kind in ('tenantServices','platformServices','sharedServiceCatalog','sharedServiceActivations')`, [db.scope, appId]);
+                for (const [kind, id] of refs)
+                    if (used.has(id))
+                        await client.query(`insert into ${db.references} (scope_id,kind,entity_id,target_kind,target_id) values ($1,'apps',$2,$3,$4) on conflict do nothing`, [db.scope, appId, kind, id]);
+                await client.query(`insert into ${db.outbox} (scope_id,id,delivery,event_name,payload)
+          values ($1,$2,'broadcast','platform-config.changed',jsonb_build_object('revision',nextval('${db.revisions}'),'appId',$3::text))`, [db.scope, randomUUID(), appId]);
+            }
+            finally {
+                writing?.end();
+            }
+        }
+        await client.query("commit");
+        return result;
+    }
+    catch (error) {
+        await client.query("rollback").catch(() => undefined);
+        throw error;
+    }
+    finally {
+        client.release();
+        span?.end();
+    }
+}
+/** Management request resolution reads app settings first, then only the matched app's rows. */
+export async function readRequestConfig(db, headers, obs) {
+    const span = obs?.startSpan("bp.request_context.read");
+    let client;
+    try {
+        client = await db.pool.connect();
+    }
+    catch (error) {
+        span?.end();
+        throw error;
+    }
+    try {
+        await client.query("begin isolation level repeatable read read only");
+        const result = await client.query(`with settings as (
+      select value from ${db.entities} where scope_id=$1 and kind='settings' and entity_id='platform'
+    ) select kind,value from ${db.entities} where scope_id=$1 and (
+      kind='settings'
+      or (kind='apps' and value->>'tenantId'=coalesce((select value->>'adminTenantId' from settings),'betterportal'))
+      or (kind='tenants' and entity_id=coalesce((select value->>'adminTenantId' from settings),'betterportal'))) order by ordinal`, [db.scope]);
+        const selector = BetterPortalConfigSchema.parse({
+            configManagement: result.rows.find(row => row.kind === "settings")?.value,
+            apps: result.rows.filter(row => row.kind === "apps").map(row => row.value),
+            tenants: result.rows.filter(row => row.kind === "tenants").map(row => row.value)
+        });
+        const selected = resolveEmbeddedRequestContext(selector, headers);
+        if (!selected) {
+            await client.query("commit");
+            return selector;
+        }
+        const data = await readAppEditor(client, db, selected.app.id);
+        const config = { ...selector, ...data };
+        const app = config.apps[0];
+        if (app.auth) {
+            const provider = resolveAuthProviderRuntimeMetadata(config, app.auth.serviceId);
+            if (provider)
+                Object.assign(app.auth, { expectedIssuer: provider.issuer, expectedAudience: provider.audience,
+                    jwksUri: provider.jwksUri, ...(provider.publicKeys ? { publicKeys: provider.publicKeys } : {}) });
+        }
+        if (app.shell) {
+            const activation = data.sharedServiceActivations.find(candidate => candidate.id === app.shell.serviceId);
+            const manifests = await client.query(`select value from ${db.entities} where scope_id=$1 and kind='manifestCache'
+        and entity_id=any($2::text[]) order by ordinal`, [db.scope, [app.shell.serviceId, activation?.sharedServiceId, getServicePluginId(data, app.shell.serviceId)].filter(Boolean)]);
+            config.manifestCache = manifests.rows.map(row => row.value);
+        }
+        await client.query("commit");
+        return config;
+    }
+    catch (error) {
+        await client.query("rollback").catch(() => undefined);
+        throw error;
+    }
+    finally {
+        client.release();
+        span?.end();
+    }
+}
+export async function readAppPage(db, appId, chooseFirst = false) {
+    const client = await db.pool.connect();
+    try {
+        await client.query("begin isolation level repeatable read read only");
+        const result = await client.query(`select entity_id as id,value->>'tenantId' as "tenantId",value->>'title' as title from ${db.entities} app
+       where scope_id=$1 and kind='apps' and not exists (
+         select 1 from ${db.entities} preview where preview.scope_id=app.scope_id and preview.kind='previewEnvironmentDeployments'
+           and preview.value->>'appId'=app.entity_id) order by ordinal`, [db.scope]);
+        const selected = result.rows.find(app => app.id === appId)?.id ?? (!appId && chooseFirst ? result.rows[0]?.id : undefined);
+        const data = await readAppEditor(client, db, selected ?? "");
+        await client.query("commit");
+        return { ...data, appChoices: result.rows };
+    }
+    catch (error) {
+        await client.query("rollback").catch(() => undefined);
+        throw error;
+    }
+    finally {
+        client.release();
+    }
+}
+/** Caches need service manifests and auth grants, never menus, routes or preview snapshots. */
+export async function readCacheData(db) {
+    const client = await db.pool.connect();
+    try {
+        await client.query("begin isolation level repeatable read read only");
+        const result = await client.query(`select kind,value from ${db.entities} where scope_id=$1
+      and kind in ('apps','tenants','tenantServices','platformServices','sharedServiceCatalog','sharedServiceActivations','settings','manifestCache') order by ordinal`, [db.scope]);
+        const values = (kind) => result.rows.filter(row => row.kind === kind).map(row => row.value);
+        const apps = values("apps");
+        const roles = await client.query(`select app_id,id,title,description,position from ${db.appData.roles} where scope_id=$1`, [db.scope]);
+        const grants = await client.query(`select app_id,role_id,service_id,view_id,actions,grant_position from ${db.appData.grants} where scope_id=$1`, [db.scope]);
+        db.appData.hydrate(apps, { roles: roles.rows, grants: grants.rows, routes: [], menus: [] });
+        const tenants = values("tenants");
+        const byId = new Map(tenants.map(tenant => [tenant.id, tenant]));
+        for (const { tenantId, ...service } of values("tenantServices"))
+            byId.get(tenantId)?.services.push(service);
+        const data = { apps: apps.map(app => BetterPortalAppSchema.parse(app)), tenants,
+            platformServices: values("platformServices"), sharedServiceCatalog: values("sharedServiceCatalog"),
+            sharedServiceActivations: values("sharedServiceActivations"), configManagement: values("settings")[0],
+            manifestCache: values("manifestCache") };
+        for (const app of data.apps)
+            if (app.auth) {
+                const provider = resolveAuthProviderRuntimeMetadata(data, app.auth.serviceId);
+                if (provider)
+                    Object.assign(app.auth, { expectedIssuer: provider.issuer, expectedAudience: provider.audience,
+                        jwksUri: provider.jwksUri, ...(provider.publicKeys ? { publicKeys: provider.publicKeys } : {}) });
+            }
+        await client.query("commit");
+        return data;
+    }
+    catch (error) {
+        await client.query("rollback").catch(() => undefined);
+        throw error;
+    }
+    finally {
+        client.release();
+    }
+}
+export async function readApp(db, appId) {
+    const client = await db.pool.connect();
+    try {
+        await client.query("begin isolation level repeatable read read only");
+        const data = await readAppEditor(client, db, appId);
+        await client.query("commit");
+        return data;
+    }
+    catch (error) {
+        await client.query("rollback").catch(() => undefined);
+        throw error;
+    }
+    finally {
+        client.release();
+    }
+}
+/** Service/settings pages need registration summaries, not app operational collections. */
+export async function readDirectory(db) {
+    const result = await db.pool.query(`with previews as (
+    select value->>'tenantId' as tenant_id,value->>'appId' as app_id from ${db.entities}
+      where scope_id=$1 and kind='previewEnvironmentDeployments'
+  ) select kind,value from ${db.entities} e where scope_id=$1
+    and kind in ('settings','apps','tenants','tenantServices','platformServices','sharedServiceCatalog','sharedServiceActivations','bindings','grants')
+    and not exists (select 1 from previews p where
+      (e.kind='apps' and e.entity_id=p.app_id) or (e.kind='tenants' and e.entity_id=p.tenant_id)
+      or (e.kind in ('tenantServices','sharedServiceActivations','bindings','grants') and e.value->>'tenantId'=p.tenant_id))
+    order by ordinal`, [db.scope]);
+    const values = (kind) => result.rows.filter(row => row.kind === kind).map(row => row.value);
+    const tenants = values("tenants");
+    const byId = new Map(tenants.map(tenant => [tenant.id, tenant]));
+    for (const { tenantId, ...service } of values("tenantServices"))
+        byId.get(tenantId)?.services.push(service);
+    const activity = await db.pool.query(`select service_id,last_seen_at,last_sync_at from ${db.activity} where scope_id=$1`, [db.scope]);
+    const activityById = new Map(activity.rows.map(row => [row.service_id, row]));
+    for (const tenant of tenants)
+        for (const service of tenant.services) {
+            const row = activityById.get(service.id);
+            if (row?.last_seen_at)
+                service.lastSeenAt = row.last_seen_at.toISOString();
+            if (row?.last_sync_at)
+                service.lastSyncAt = row.last_sync_at.toISOString();
+        }
+    return { apps: values("apps").map(app => BetterPortalAppSchema.parse(app)), tenants,
+        platformServices: values("platformServices"), sharedServiceCatalog: values("sharedServiceCatalog"),
+        sharedServiceActivations: values("sharedServiceActivations"), configManagement: values("settings")[0],
+        m2m: { bindings: values("bindings"), grants: values("grants") } };
+}
+/** Tenant editor needs route choices/counts, but no route options, menus or grants. */
+export async function readTenantPage(db) {
+    const data = await readDirectory(db);
+    const routes = await db.pool.query(`select app_id,id,kind,path,service_id,view_id,title,icon,enabled,operations,position
+    from ${db.appData.routes} where scope_id=$1 and app_id=any($2::text[])`, [db.scope, data.apps.map(app => app.id)]);
+    db.appData.hydrate(data.apps, { roles: [], grants: [], routes: routes.rows, menus: [] });
+    return data;
+}
+//# sourceMappingURL=appQueries.js.map

package/lib/plugins/service-betterportal-config-manager/appQueries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appQueries.js","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/appQueries.ts"],"names":[],"mappings":"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"}

package/lib/plugins/service-betterportal-config-manager/index.d.ts

@@ -178,6 +178,9 @@ export declare class Plugin extends BPService<InstanceType<typeof Config>, typeo
     private warmAuthCache;
     private refreshAuthCache;
     private loadRequestConfig;
+    private readonly contextConfigs;
+    private loadContextConfig;
+    private loadDirectory;
     protected resolveRequestContext(event: BetterPortalEvent): Promise<BetterPortalResolvedRequestContext | null>;
     protected describeCorsContextFailure(event: BetterPortalEvent): Promise<{
         candidateHosts: string;
@@ -190,6 +193,7 @@ export declare class Plugin extends BPService<InstanceType<typeof Config>, typeo
     private startOutbox;
     private populateConfigAdminContext;
     private populateServicesContext;
+    private loadEditorPage;
     private populateRoutesContext;
     private populateMenuContext;
     private populateFragmentsContext;

package/lib/plugins/service-betterportal-config-manager/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/service-betterportal-config-manager/index.js

@@ -7,6 +7,7 @@ import { cpBootstrap } from "./cpBootstrap.js";
 import { registerSetupEndpoints } from "./setupTokens.js";
 import { registerBootstrapEndpoint } from "./bootstrapEndpoint.js";
 import { registerAdminApiRoutes } from "./adminApi.js";
+import { readAppPage, readCacheData, readDirectory, readRequestConfig } from "./appQueries.js";
 import { registerMenuEditorRoutes } from "./menuEditor.js";
 import { registerFragmentsEditorRoutes } from "./fragmentsEditor.js";
 import { registerWebhookRoutes } from "./webhooks.js";
@@ -167,7 +168,7 @@ export class Plugin extends BPService {
     async refreshConfigCaches(obs) {
         const generation = ++this.authCacheGeneration;
         this.storage.invalidate();
-        const config = await this.storage.loadConfig();
+        const config = (this.postgresStorage ? await readCacheData(this.postgresStorage.database) : await this.storage.loadConfig());
         if (generation !== this.authCacheGeneration)
             return;
         hydrateManifestCache(config);
@@ -185,7 +186,7 @@ export class Plugin extends BPService {
     async warmAuthCache(obs, snapshot) {
         const generation = this.authCacheGeneration;
         try {
-            const config = snapshot ?? await this.storage.loadConfig();
+            const config = snapshot ?? (this.postgresStorage ? await readCacheData(this.postgresStorage.database) : await this.storage.loadConfig());
             if (generation !== this.authCacheGeneration)
                 return;
             const next = new Map();
@@ -226,7 +227,7 @@ export class Plugin extends BPService {
         const key = `${tenantId}::${appId}`;
         const generation = this.authCacheGeneration;
         try {
-            const config = await this.storage.loadConfig();
+            const config = (this.postgresStorage ? await readCacheData(this.postgresStorage.database) : await this.storage.loadConfig());
             if (generation !== this.authCacheGeneration)
                 return;
             const app = config.apps.find((a) => a.id === appId && a.tenantId === tenantId);
@@ -272,8 +273,30 @@ export class Plugin extends BPService {
         }
         return pending;
     }
+    contextConfigs = new WeakMap();
+    loadContextConfig(event) {
+        if (!this.postgresStorage)
+            return this.loadRequestConfig(event);
+        let pending = this.contextConfigs.get(event);
+        if (!pending) {
+            pending = readRequestConfig(this.postgresStorage.database, eventHeaders(event), eventObservability(event));
+            this.contextConfigs.set(event, pending);
+            void pending.catch(() => this.contextConfigs.delete(event));
+        }
+        return pending;
+    }
+    async loadDirectory(event) {
+        const span = eventObservability(event)?.startSpan("bp.directory.read");
+        try {
+            return this.postgresStorage ? await readDirectory(this.postgresStorage.database)
+                : visibleAdminConfig(await this.loadRequestConfig(event));
+        }
+        finally {
+            span?.end();
+        }
+    }
     async resolveRequestContext(event) {
-        const config = await this.loadRequestConfig(event);
+        const config = await this.loadContextConfig(event);
         const context = resolveEmbeddedRequestContext(config, eventHeaders(event));
         if (!context) {
             return null;
@@ -285,7 +308,7 @@ export class Plugin extends BPService {
         return context;
     }
     async describeCorsContextFailure(event) {
-        const config = await this.loadRequestConfig(event);
+        const config = await this.loadContextConfig(event);
         const details = describeEmbeddedContextResolution(config, eventHeaders(event));
         return {
             candidateHosts: details.candidates.join(","),
@@ -306,7 +329,7 @@ export class Plugin extends BPService {
         this.storage = this.withChangeBroadcasts(resolvedStorage.store, _obs, {
             backend: resolvedStorage.backend
         });
-        hydrateManifestCache(await this.storage.loadConfig());
+        hydrateManifestCache(this.postgresStorage ? await readCacheData(this.postgresStorage.database) : await this.storage.loadConfig());
         // Initialize CP keypair + JWKS (P7).
         this.cpState = await cpBootstrap({
             keyStorePath: resolve(cwd, this.config.cpKeyStorePath ?? "./.bp-cp-state/keys.json"),
@@ -337,6 +360,7 @@ export class Plugin extends BPService {
         });
         setConfigManagerRouteContext({
             storage: this.storage,
+            database: this.postgresStorage?.database,
             cpState: this.cpState,
             serviceBaseUrl: this.cpState.issuer
         });
@@ -354,8 +378,8 @@ export class Plugin extends BPService {
         this.app.use("/auth", (event) => this.populateAdminAuthContext(event));
         this.app.use("/settings", (event) => this.populateSettingsContext(event));
         this.app.use("/.well-known/bp", (event) => applyWellKnownCors(event));
-        registerAdminApiRoutes(this.app, this.storage, this.cpState);
-        registerMenuEditorRoutes(this.app, this.storage);
+        registerAdminApiRoutes(this.app, this.storage, this.cpState, this.postgresStorage?.database);
+        registerMenuEditorRoutes(this.app, this.storage, this.postgresStorage?.database);
         registerFragmentsEditorRoutes(this.app, this.storage);
         this.webhookRuntime = registerWebhookRoutes(this.app, this.storage, this.postgresStorage, this.workerId);
         registerPreviewDeploymentApi({
@@ -415,6 +439,16 @@ export class Plugin extends BPService {
     }
     async removeExpiredPreviews() {
         const cleanup = async () => {
+            if (this.postgresStorage) {
+                const { pool, entities, scope } = this.postgresStorage.database;
+                const due = await pool.query(`select 1 from ${entities} where scope_id=$1 and kind='previewEnvironmentDeployments'
+          and ((value->>'expiresAt')::timestamptz <= now()
+            or (value->'credentialReplay'->>'expiresAt')::timestamptz <= now()) limit 1`, [scope]);
+                if (!due.rows.length) {
+                    await this.postgresStorage.cleanupExpiredActions();
+                    return;
+                }
+            }
             const config = await this.storage.loadConfig();
             let changed = deleteExpiredPreviewDeployments(config).length > 0;
             for (const deployment of config.previewEnvironmentDeployments) {
@@ -495,8 +529,8 @@ export class Plugin extends BPService {
         this.outboxTimer.unref();
     }
     async populateConfigAdminContext(event) {
-        const portalConfig = visibleAdminConfig(await this.loadRequestConfig(event));
-        const requestContext = resolveEmbeddedRequestContext(portalConfig, eventHeaders(event));
+        const portalConfig = await this.loadDirectory(event);
+        const requestContext = resolveEmbeddedRequestContext(await this.loadContextConfig(event), eventHeaders(event));
         if (requestContext) {
             const tenant = requestContext.tenant;
             const allServices = [
@@ -552,7 +586,7 @@ export class Plugin extends BPService {
         }
     }
     async populateServicesContext(event) {
-        const config = visibleAdminConfig(await this.loadRequestConfig(event));
+        const config = await this.loadDirectory(event);
         const url = new URL(event.req.url ?? "", RELATIVE_URL_PARSE_BASE);
         const requestedTenantId = url.searchParams.get("tenantId") ?? undefined;
         const selectedTenantId = config.tenants.some((tenant) => tenant.id === requestedTenantId)
@@ -648,8 +682,22 @@ export class Plugin extends BPService {
             serviceBaseUrl: this.cpState.issuer
         };
     }
-    async populateRoutesContext(event) {
+    async loadEditorPage(event, chooseFirst = false) {
+        if (this.postgresStorage) {
+            const appId = new URL(event.req.url, RELATIVE_URL_PARSE_BASE).searchParams.get("appId") ?? undefined;
+            const span = eventObservability(event)?.startSpan("bp.app.read");
+            try {
+                return await readAppPage(this.postgresStorage.database, appId, chooseFirst);
+            }
+            finally {
+                span?.end();
+            }
+        }
         const config = visibleAdminConfig(await this.loadRequestConfig(event));
+        return { ...config, appChoices: config.apps };
+    }
+    async populateRoutesContext(event) {
+        const config = await this.loadEditorPage(event);
         const url = new URL(event.req.url ?? "", RELATIVE_URL_PARSE_BASE);
         const selectedAppId = url.searchParams.get("appId") ?? undefined;
         const openApiServiceId = url.searchParams.get("apiServiceId") ?? undefined;
@@ -744,7 +792,7 @@ export class Plugin extends BPService {
         });
         event.__bpResponseModel = {
             title: "Route Designer",
-            apps: config.apps.map((a) => ({ id: a.id, title: a.title, tenantId: a.tenantId })),
+            apps: config.appChoices.map((a) => ({ id: a.id, title: a.title, tenantId: a.tenantId })),
             selectedAppId,
             openApiServiceId,
             routes: routeModel,
@@ -755,13 +803,13 @@ export class Plugin extends BPService {
         };
     }
     async populateMenuContext(event) {
-        const config = visibleAdminConfig(await this.loadRequestConfig(event));
+        const config = await this.loadEditorPage(event);
         const url = new URL(event.req.url ?? "", RELATIVE_URL_PARSE_BASE);
         const selectedAppId = url.searchParams.get("appId") ?? undefined;
         const selectedApp = selectedAppId ? config.apps.find((a) => a.id === selectedAppId) : undefined;
         event.__bpResponseModel = {
             title: "Menu Designer",
-            apps: config.apps.map((a) => ({ id: a.id, title: a.title, tenantId: a.tenantId })),
+            apps: config.appChoices.map((a) => ({ id: a.id, title: a.title, tenantId: a.tenantId })),
             selectedAppId,
             menu: (selectedApp?.menu ?? []).map((m) => ({
                 id: m.id, type: m.type, title: m.title,
@@ -781,19 +829,19 @@ export class Plugin extends BPService {
         };
     }
     async populateFragmentsContext(event) {
-        const config = visibleAdminConfig(await this.loadRequestConfig(event));
+        const config = await this.loadEditorPage(event);
         const url = new URL(event.req.url ?? "", RELATIVE_URL_PARSE_BASE);
         const selectedAppId = url.searchParams.get("appId") ?? undefined;
         event.__bpResponseModel = {
             title: "Fragments",
-            apps: config.apps.map((a) => ({ id: a.id, title: a.title, tenantId: a.tenantId })),
+            apps: config.appChoices.map((a) => ({ id: a.id, title: a.title, tenantId: a.tenantId })),
             selectedAppId,
             adminApiBase: "/.well-known/bp/admin",
             serviceBaseUrl: this.cpState.issuer
         };
     }
     async populatePreviewContext(event) {
-        const config = visibleAdminConfig(await this.loadRequestConfig(event));
+        const config = await this.loadDirectory(event);
         const services = [];
         const allServiceHostnames = [
             ...config.tenants.flatMap((t) => t.services.filter((s) => s.enabled).map((s) => ({
@@ -820,7 +868,7 @@ export class Plugin extends BPService {
         };
     }
     async populateAdminAuthContext(event) {
-        const config = visibleAdminConfig(await this.loadRequestConfig(event));
+        const config = await this.loadEditorPage(event, true);
         const url = new URL(event.req.url ?? "", RELATIVE_URL_PARSE_BASE);
         const selectedAppId = url.searchParams.get("appId") ?? undefined;
         const selectedApp = selectedAppId
@@ -918,7 +966,7 @@ export class Plugin extends BPService {
             : undefined;
         event.__bpResponseModel = {
             title: "Permission Manager",
-            apps: config.apps.map((a) => ({ id: a.id, tenantId: a.tenantId, title: a.title })),
+            apps: config.appChoices.map((a) => ({ id: a.id, tenantId: a.tenantId, title: a.title })),
             selectedAppId: selectedApp?.id,
             selectedTenantId,
             authConfigured,
@@ -932,9 +980,9 @@ export class Plugin extends BPService {
         };
     }
     async populateSettingsContext(event) {
-        const config = visibleAdminConfig(await this.loadRequestConfig(event));
+        const config = await this.loadDirectory(event);
         const url = new URL(event.req.url ?? "", RELATIVE_URL_PARSE_BASE);
-        const requestContext = resolveEmbeddedRequestContext(config, eventHeaders(event));
+        const requestContext = resolveEmbeddedRequestContext(await this.loadContextConfig(event), eventHeaders(event));
         const requestedAppId = url.searchParams.get("appId") ?? undefined;
         const app = requestContext?.app
             ?? (requestedAppId ? config.apps.find((candidate) => candidate.id === requestedAppId) : undefined)