@betterportal/config-manager 10.6.30 → 10.6.32

package/lib/.bsb/clients/service-betterportal-config-manager.d.ts

@@ -1,7 +1,7 @@
 /**
  * Auto-generated BSB virtual client for service-betterportal-config-manager
  * DO NOT EDIT - Regenerated on every build
- * @version 10.6.30
+ * @version 10.6.32
  */
 import { ServiceClient, BSBService } from "@bsb/base";
 import type { Observable, BSBServiceClientDefinition, EventInputType } from "@bsb/base";

package/lib/.bsb/clients/service-betterportal-config-manager.js

@@ -1,7 +1,7 @@
 /**
  * Auto-generated BSB virtual client for service-betterportal-config-manager
  * DO NOT EDIT - Regenerated on every build
- * @version 10.6.30
+ * @version 10.6.32
  */
 import { ServiceClient, importPortableSchema, createFireAndForgetEvent, createBroadcastEvent, createEventSchemas } from "@bsb/base";
 const _webhookDeliveryAvailableSchema = importPortableSchema(JSON.parse("{\"anyvaliVersion\":\"1.0\",\"schemaVersion\":\"1.1\",\"root\":{\"kind\":\"object\",\"properties\":{},\"required\":[],\"unknownKeys\":\"strip\"},\"definitions\":{},\"extensions\":{}}"));

package/lib/bp-contracts/org.betterportal.config-manager.json

@@ -4,7 +4,7 @@
     "pluginId": "org.betterportal.config-manager",
     "title": "BetterPortal Config Manager",
     "description": "Admin-facing BetterPortal service for discovering and managing service config surfaces.",
-    "version": "10.6.30",
+    "version": "10.6.32",
     "category": "service",
     "deploymentModes": [
       "self-hosted"

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

@@ -1,8 +1,9 @@
+import { type AppDatabase, type AppEditorData } from "./appQueries.js";
 import type { BetterPortalH3App, PlatformConfigStore, JsonValue } from "@betterportal/framework";
 import type { BetterPortalConfig, BetterPortalApp } from "@betterportal/framework";
 import type { CpBootstrapState } from "./cpBootstrap.js";
 export declare function validateFixedParamValue(name: string, value: string, paramsSchema?: Record<string, JsonValue>): string | undefined;
-declare function automationServiceCatalog(config: BetterPortalConfig, appDef: BetterPortalApp): {
+declare function automationServiceCatalog(config: AppEditorData, appDef: BetterPortalApp): {
     protocol: string;
     tenantId: string;
     appId: string;
@@ -305,7 +306,7 @@ export declare function purgeServiceReferences(config: BetterPortalConfig, tenan
     m2mGrantsRemoved: number;
     webhooksRemoved: number;
 };
-export declare function registerAdminApiRoutes(app: BetterPortalH3App, store: PlatformConfigStore, cpState: CpBootstrapState): void;
+export declare function registerAdminApiRoutes(app: BetterPortalH3App, store: PlatformConfigStore, cpState: CpBootstrapState, database?: AppDatabase): void;
 export declare function renderConfigClientShell(d: {
     hostname: string;
     tenantId: string;

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

@@ -1 +1 @@
-{"version":3,"file":"adminApi.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/adminApi.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EAEjB,mBAAmB,EACnB,SAAS,EACV,MAAM,yBAAyB,CAAC;AAcjC,OAAO,KAAK,EAAuE,kBAAkB,EAAE,eAAe,EAAgE,MAAM,yBAAyB,CAAC;AACtN,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAgLzD,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACvC,MAAM,GAAG,SAAS,CAepB;AAwGD,iBAAS,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkEpF;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,MAAM,CA4CpG;AA8RD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAiDtH;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG;IACvG,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CA2FA;AAkPD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,gBAAgB,GACxB,IAAI,CAwiDN;AAwPD,wBAAgB,uBAAuB,CAAC,CAAC,EAAE;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClD,GAAG,MAAM,CAwaT"}
+{"version":3,"file":"adminApi.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/adminApi.ts"],"names":[],"mappings":"AACA,OAAO,EAA2C,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhH,OAAO,KAAK,EACV,iBAAiB,EAEjB,mBAAmB,EACnB,SAAS,EACV,MAAM,yBAAyB,CAAC;AAcjC,OAAO,KAAK,EAAuE,kBAAkB,EAAE,eAAe,EAAgE,MAAM,yBAAyB,CAAC;AACtN,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAkLzD,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACvC,MAAM,GAAG,SAAS,CAepB;AAwGD,iBAAS,wBAAwB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkE/E;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,MAAM,CA4CpG;AA8RD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAiDtH;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG;IACvG,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CA2FA;AAkPD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,gBAAgB,EACzB,QAAQ,CAAC,EAAE,WAAW,GACrB,IAAI,CAyjDN;AAwPD,wBAAgB,uBAAuB,CAAC,CAAC,EAAE;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClD,GAAG,MAAM,CAwaT"}

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

@@ -1,3 +1,5 @@
+import { eventObservability } from "@betterportal/framework";
+import { editAppRows, readApp, readRequestConfig } from "./appQueries.js";
 import { isMenuRouteExcluded } from "./routeMounts.js";
 import * as av from "anyvali";
 import { AppAuthRoleSchema, eventHeaders, htmlResponse, jsonResponse, resolveEmbeddedRequestContext, signServiceConfigTicket, uuidv7, BetterPortalMenuItemSchema, BetterPortalThemeConfigSchema } from "@betterportal/framework";
@@ -72,7 +74,7 @@ function validationError(event, message) {
 }
 // PostgreSQL edits read current rows under an app-scoped transaction.
 // File stores retain their existing single-process save semantics.
-async function editApp(store, appId, action) {
+async function editApp(store, appId, action, database, event) {
     const apply = async (config) => {
         const response = await action(config);
         if (!response.ok)
@@ -80,6 +82,8 @@ async function editApp(store, appId, action) {
         return response;
     };
     try {
+        if (database)
+            return await editAppRows(database, appId, event ? eventObservability(event) : undefined, action);
         if (store.mutateApp)
             return await store.mutateApp(appId, apply);
         const config = await store.loadConfig();
@@ -984,12 +988,29 @@ function automationAppFromRequest(config, event) {
         : config.apps.find((entry) => tenantUrl && appMatchesTenantUrl(entry, tenantUrl));
     return resolved && !isPreviewApp(config, resolved.id) ? resolved : undefined;
 }
-export function registerAdminApiRoutes(app, store, cpState) {
+export function registerAdminApiRoutes(app, store, cpState, database) {
+    const readCurrentApp = async (event) => {
+        if (!database) {
+            const config = await store.loadConfig();
+            return { config, appDef: currentAppFromRequest(config, event) };
+        }
+        const appId = new URL(event.req.url, RELATIVE_URL_PARSE_BASE).searchParams.get("appId") ?? event.req.headers.get("x-bp-app-id");
+        if (appId) {
+            const config = await readApp(database, appId);
+            const appDef = config.apps[0];
+            return { config, appDef: appDef && !isPreviewApp(config, appDef.id) ? appDef : undefined };
+        }
+        const config = await readRequestConfig(database, eventHeaders(event), eventObservability(event));
+        return { config, appDef: currentAppFromRequest(config, event) };
+    };
     app.use(`${API_BASE}/**`, async (event) => {
-        const config = await store.loadConfig();
+        const deployments = database
+            ? (await database.pool.query(`select value->>'tenantId' as "tenantId", value->>'appId' as "appId"
+          from ${database.entities} where scope_id=$1 and kind='previewEnvironmentDeployments'`, [database.scope])).rows
+            : (await store.loadConfig()).previewEnvironmentDeployments;
         const url = new URL(event.req.url, RELATIVE_URL_PARSE_BASE);
         const requestIds = `${url.pathname}\n${url.search}\n${event.req.headers.get("x-bp-tenant-id") ?? ""}\n${event.req.headers.get("x-bp-app-id") ?? ""}`;
-        const targetsPreview = config.previewEnvironmentDeployments.some((deployment) => requestIds.includes(deployment.tenantId) || requestIds.includes(deployment.appId));
+        const targetsPreview = deployments.some((deployment) => requestIds.includes(deployment.tenantId) || requestIds.includes(deployment.appId));
         if (targetsPreview)
             return jsonResponse({ error: "Preview resources are managed through Preview Environments" }, 404);
     });
@@ -1014,8 +1035,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
         });
     });
     app.get("/.well-known/bp/manage/current", async (event) => {
-        const config = await store.loadConfig();
-        const appDef = currentAppFromRequest(config, event);
+        const { config, appDef } = await readCurrentApp(event);
         if (!appDef)
             return jsonResponse({ error: "Unable to resolve current BetterPortal app" }, 404);
         const tenant = config.tenants.find((entry) => entry.id === appDef.tenantId);
@@ -1039,8 +1059,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
         });
     });
     app.get("/.well-known/bp/manage/services", async (event) => {
-        const config = await store.loadConfig();
-        const appDef = currentAppFromRequest(config, event);
+        const { config, appDef } = await readCurrentApp(event);
         if (!appDef)
             return jsonResponse({ error: "Unable to resolve current BetterPortal app" }, 404);
         return jsonResponse(automationServiceCatalog(config, appDef));
@@ -1073,40 +1092,43 @@ export function registerAdminApiRoutes(app, store, cpState) {
         return jsonResponse({ ok: true, activation }, 201);
     });
     app.get("/.well-known/bp/manage/routes", async (event) => {
-        const config = await store.loadConfig();
-        const appDef = currentAppFromRequest(config, event);
+        const { appDef } = await readCurrentApp(event);
         if (!appDef)
             return jsonResponse({ error: "Unable to resolve current BetterPortal app" }, 404);
         return jsonResponse({ appId: appDef.id, routes: appDef.routes });
     });
     app.post("/.well-known/bp/manage/routes", async (event) => {
-        const config = await store.loadConfig();
-        const appDef = currentAppFromRequest(config, event);
+        const { appDef } = await readCurrentApp(event);
         if (!appDef)
             return jsonResponse({ error: "Unable to resolve current BetterPortal app" }, 404);
         const body = await readFormOrJsonBody(event);
         const parsed = parseRouteCreateBody(body);
         if (parsed.error || !parsed.route)
             return validationError(event, parsed.error ?? "Invalid route");
-        if (appDef.routes.some((candidate) => appRoutePatternKey(candidate.path) === appRoutePatternKey(parsed.route.path))) {
-            return validationError(event, `A route already exists at ${parsed.route.path}.`);
-        }
-        const route = { id: uuidv7(), ...parsed.route };
-        appDef.routes.push(route);
-        addRouteDependencies(appDef, route);
-        await store.saveConfig(config);
-        return jsonResponse({ ok: true }, 201);
+        return editApp(store, appDef.id, async (data) => {
+            const current = data.apps.find(app => app.id === appDef.id);
+            if (!current || isPreviewApp(data, current.id))
+                return jsonResponse({ error: "App not found" }, 404);
+            const serviceError = validateRegisteredRouteService(data, current, parsed.route.serviceId);
+            if (serviceError)
+                return validationError(event, serviceError);
+            if (current.routes.some(candidate => appRoutePatternKey(candidate.path) === appRoutePatternKey(parsed.route.path))) {
+                return validationError(event, `A route already exists at ${parsed.route.path}.`);
+            }
+            const route = { id: uuidv7(), ...parsed.route };
+            current.routes.push(route);
+            addRouteDependencies(current, route);
+            return jsonResponse({ ok: true }, 201);
+        }, database, event);
     });
     app.get("/.well-known/bp/manage/fragments", async (event) => {
-        const config = await store.loadConfig();
-        const appDef = currentAppFromRequest(config, event);
+        const { appDef } = await readCurrentApp(event);
         if (!appDef)
             return jsonResponse({ error: "Unable to resolve current BetterPortal app" }, 404);
         return jsonResponse({ appId: appDef.id, fragments: appDef.fragments });
     });
     app.get("/.well-known/bp/manage/theme", async (event) => {
-        const config = await store.loadConfig();
-        const appDef = currentAppFromRequest(config, event);
+        const { appDef } = await readCurrentApp(event);
         if (!appDef)
             return jsonResponse({ error: "Unable to resolve current BetterPortal app" }, 404);
         return jsonResponse({ appId: appDef.id, themeConfig: appDef.themeConfig });
@@ -1745,7 +1767,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
         const appId = getParam(event, "appId");
         if (!appId)
             return jsonResponse({ error: "appId required" }, 400);
-        const { appDef } = await getAppOr404(appId);
+        const appDef = database ? (await readApp(database, appId)).apps[0] : (await getAppOr404(appId)).appDef;
         if (!appDef)
             return jsonResponse({ error: "App not found" }, 404);
         const auth = appDef.auth;
@@ -1777,7 +1799,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
                 return parsedRoles;
             authResult.auth.roles = parsedRoles;
             return jsonResponse({ ok: true, roles: parsedRoles.length });
-        });
+        }, database, event);
     });
     app.put(`${API_BASE}/services/self-mutation`, async (event) => {
         const parsed = SelfMutationRequestSchema.safeParse(await readJsonBody(event));
@@ -1813,7 +1835,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
                 return parsedRoles;
             authResult.auth.roles = parsedRoles;
             return jsonResponse({ ok: true, type, roles: parsedRoles.length });
-        });
+        }, database, event);
     });
     app.post(`${API_BASE}/apps/:appId/auth/roles`, async (event) => {
         const appId = getParam(event, "appId");
@@ -1849,7 +1871,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
             if (wantsHtmx(event))
                 return htmxReload(`/auth?appId=${encodeURIComponent(appId)}`);
             return jsonResponse(role, 201);
-        });
+        }, database, event);
     });
     app.put(`${API_BASE}/apps/:appId/auth/roles/:roleId`, async (event) => {
         const appId = getParam(event, "appId");
@@ -1892,7 +1914,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
             if (wantsHtmx(event))
                 return htmxReload(`/auth?appId=${encodeURIComponent(appId)}`);
             return jsonResponse(role);
-        });
+        }, database, event);
     });
     app.delete(`${API_BASE}/apps/:appId/auth/roles/:roleId`, async (event) => {
         const appId = getParam(event, "appId");
@@ -1914,7 +1936,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
             if (wantsHtmx(event))
                 return htmxReload(`/auth?appId=${encodeURIComponent(appId)}`);
             return jsonResponse({ ok: true });
-        });
+        }, database, event);
     });
     // Service connections (per app)
     app.get(`${API_BASE}/apps/:appId/m2m/connections`, async (event) => {
@@ -1992,7 +2014,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
         const appId = getParam(event, "appId");
         if (!appId)
             return jsonResponse({ error: "appId required" }, 400);
-        const config = await store.loadConfig();
+        const config = database ? await readApp(database, appId) : await store.loadConfig();
         const appDef = config.apps.find((a) => a.id === appId);
         if (!appDef)
             return jsonResponse({ error: "App not found" }, 404);
@@ -2026,7 +2048,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
             if (wantsHtmx(event))
                 return htmxReload(routesReloadPath(appId));
             return jsonResponse({ ok: true, id: route.id }, 201);
-        });
+        }, database, event);
     });
     app.put(`${API_BASE}/apps/:appId/routes/:routeId`, async (event) => {
         const appId = getParam(event, "appId");
@@ -2159,7 +2181,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
             if (wantsHtmx(event))
                 return htmxReload(routesReloadPath(appId, route.kind === "api" ? route.serviceId : undefined));
             return jsonResponse({ ok: true });
-        });
+        }, database, event);
     });
     app.delete(`${API_BASE}/apps/:appId/routes/:routeId`, async (event) => {
         const appId = getParam(event, "appId");
@@ -2193,14 +2215,14 @@ export function registerAdminApiRoutes(app, store, cpState) {
             if (wantsHtmx(event))
                 return htmxReload(`/routes?appId=${encodeURIComponent(appId)}`);
             return jsonResponse({ ok: true });
-        });
+        }, database, event);
     });
     // Menu (per app)
     app.get(`${API_BASE}/apps/:appId/menu`, async (event) => {
         const appId = getParam(event, "appId");
         if (!appId)
             return jsonResponse({ error: "appId required" }, 400);
-        const config = await store.loadConfig();
+        const config = database ? await readApp(database, appId) : await store.loadConfig();
         const appDef = config.apps.find((a) => a.id === appId);
         if (!appDef)
             return jsonResponse({ error: "App not found" }, 404);
@@ -2225,7 +2247,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
                 return jsonResponse({ error: "Menu contains a missing or excluded route" }, 400);
             appDef.menu = menu;
             return jsonResponse({ ok: true });
-        });
+        }, database, event);
     });
     // Full config (read-only)
     app.get(`${API_BASE}/config`, async () => {