@betterportal/config-manager 10.1.45 → 10.1.47

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.1.45
+ * @version 10.1.47
  */
 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.1.45
+ * @version 10.1.47
  */
 import { ServiceClient, bsb, createBroadcastEvent, createEventSchemas } from "@bsb/base";
 const _platformConfigChangedSchema = bsb.object({

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.1.45",
+    "version": "10.1.47",
     "category": "service",
     "deploymentModes": [
       "self-hosted"

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

@@ -197,6 +197,18 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
     })[];
 };
 export declare function renderAutomationLlmsApi(catalog: ReturnType<typeof automationServiceCatalog>): string;
+export declare function purgeServiceReferences(config: BetterPortalConfig, tenantId: string, serviceId: string): {
+    routesRemoved: number;
+    menuItemsRemoved: number;
+    slotsRemoved: number;
+    fragmentsRemoved: number;
+    roleGrantsRemoved: number;
+    shellCleared: number;
+    authCleared: number;
+    m2mBindingsRemoved: number;
+    m2mGrantsRemoved: number;
+    webhooksRemoved: number;
+};
 export declare function registerAdminApiRoutes(app: BetterPortalH3App, store: PlatformConfigStore, cpState: CpBootstrapState): void;
 export {};
 //# sourceMappingURL=adminApi.d.ts.map

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":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAEjB,mBAAmB,EACnB,SAAS,EACV,MAAM,yBAAyB,CAAC;AAYjC,OAAO,KAAK,EAAuE,kBAAkB,EAAE,eAAe,EAA0C,MAAM,yBAAyB,CAAC;AAChM,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AA0LzD,iBAAS,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiEpF;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,MAAM,CA2CpG;AAwkBD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,gBAAgB,GACxB,IAAI,CA+4CN"}
+{"version":3,"file":"adminApi.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/adminApi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAEjB,mBAAmB,EACnB,SAAS,EACV,MAAM,yBAAyB,CAAC;AAYjC,OAAO,KAAK,EAAuE,kBAAkB,EAAE,eAAe,EAA0C,MAAM,yBAAyB,CAAC;AAChM,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AA0LzD,iBAAS,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiEpF;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,MAAM,CA2CpG;AA8SD,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,CAmEA;AAiPD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,gBAAgB,GACxB,IAAI,CA48CN"}

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

@@ -525,9 +525,19 @@ function collectServiceDeleteBlockers(config, tenantId, serviceId) {
             }
         }
     }
+    for (const binding of config.m2m.bindings) {
+        if (binding.tenantId === tenantId && (binding.sourceServiceId === serviceId || binding.targetServiceId === serviceId)) {
+            blockers.push(`M2M binding ${binding.requestId} (${binding.id})`);
+        }
+    }
+    for (const target of config.webhooks.targets) {
+        if (target.tenantId === tenantId && target.serviceId === serviceId) {
+            blockers.push(`webhook target ${target.eventId} (${target.id})`);
+        }
+    }
     return blockers;
 }
-function purgeTenantServiceReferences(config, tenantId, serviceId) {
+export function purgeServiceReferences(config, tenantId, serviceId) {
     const summary = {
         routesRemoved: 0,
         menuItemsRemoved: 0,
@@ -535,7 +545,10 @@ function purgeTenantServiceReferences(config, tenantId, serviceId) {
         fragmentsRemoved: 0,
         roleGrantsRemoved: 0,
         shellCleared: 0,
-        authCleared: 0
+        authCleared: 0,
+        m2mBindingsRemoved: 0,
+        m2mGrantsRemoved: 0,
+        webhooksRemoved: 0
     };
     for (const app of config.apps.filter((candidate) => candidate.tenantId === tenantId)) {
         if (app.shell?.serviceId === serviceId) {
@@ -572,6 +585,18 @@ function purgeTenantServiceReferences(config, tenantId, serviceId) {
                 delete app.fragments[location];
         }
     }
+    const bindingIds = new Set(config.m2m.bindings
+        .filter((binding) => binding.tenantId === tenantId && (binding.sourceServiceId === serviceId || binding.targetServiceId === serviceId))
+        .map((binding) => binding.id));
+    const bindingsBefore = config.m2m.bindings.length;
+    config.m2m.bindings = config.m2m.bindings.filter((binding) => !bindingIds.has(binding.id));
+    summary.m2mBindingsRemoved = bindingsBefore - config.m2m.bindings.length;
+    const grantsBefore = config.m2m.grants.length;
+    config.m2m.grants = config.m2m.grants.filter((grant) => !bindingIds.has(grant.bindingId));
+    summary.m2mGrantsRemoved = grantsBefore - config.m2m.grants.length;
+    const webhooksBefore = config.webhooks.targets.length;
+    config.webhooks.targets = config.webhooks.targets.filter((target) => target.tenantId !== tenantId || target.serviceId !== serviceId);
+    summary.webhooksRemoved = webhooksBefore - config.webhooks.targets.length;
     return summary;
 }
 function sharedServiceIdFor(service, requested) {
@@ -742,23 +767,23 @@ function migrateTenantServiceToShared(config, tenantId, serviceId, options = {})
         removedTenantService: shouldRemove
     };
 }
-function linkedServiceError(blockers) {
-    return `Service is still linked and cannot be deleted. Remove these references first: ${blockers.slice(0, 8).join("; ")}${blockers.length > 8 ? `; and ${blockers.length - 8} more` : ""}`;
+function linkedServiceError(blockers, action = "deleted") {
+    return `Service is still linked and cannot be ${action}. Remove these references first: ${blockers.slice(0, 8).join("; ")}${blockers.length > 8 ? `; and ${blockers.length - 8} more` : ""}`;
 }
-function linkedServiceHtmxError(tenantId, serviceId, blockers) {
+function linkedServiceHtmxError(blockers, options) {
     const items = blockers.slice(0, 8).map((blocker) => `<li>${escapeHtml(blocker)}</li>`).join("");
     const more = blockers.length > 8 ? `<li>${blockers.length - 8} more references</li>` : "";
     return htmlResponse(`
     <div class="alert alert-warning">
-      <div class="fw-semibold mb-2">Service is still linked and cannot be deleted.</div>
+      <div class="fw-semibold mb-2">${escapeHtml(options.heading)}</div>
       <ul class="mb-3">${items}${more}</ul>
       <button
         class="btn btn-sm btn-danger"
-        hx-post="${API_BASE}/tenants/${encodeURIComponent(tenantId)}/services/${encodeURIComponent(serviceId)}/purge"
+        hx-post="${escapeHtml(options.actionUrl)}"
         hx-target="#bp-services-alerts"
         hx-swap="innerHTML"
-        hx-confirm="Purge all routes, menu entries, fragments, slots, auth links and role grants for this service, then delete it?"
-      >Purge references and delete service</button>
+        hx-confirm="${escapeHtml(options.confirm)}"
+      >${escapeHtml(options.buttonLabel)}</button>
     </div>
   `, 409, "text/html; mode=fragment");
 }
@@ -1101,12 +1126,63 @@ export function registerAdminApiRoutes(app, store, cpState) {
         if (!tenantId)
             return wantsHtmx(event) ? htmxError("tenantId required") : jsonResponse({ error: "tenantId required" }, 400);
         const config = await store.loadConfig();
+        const activations = config.sharedServiceActivations.filter((activation) => activation.sharedServiceId === sharedServiceId
+            && activation.tenantId === tenantId
+            && activation.appId === appId);
+        if (activations.length === 0) {
+            return wantsHtmx(event) ? htmxError("Shared service activation not found", 404) : jsonResponse({ error: "Shared service activation not found" }, 404);
+        }
+        const blockers = activations.flatMap((activation) => collectServiceDeleteBlockers(config, tenantId, activation.id));
+        if (blockers.length > 0) {
+            const message = linkedServiceError(blockers, "deactivated");
+            if (!wantsHtmx(event))
+                return jsonResponse({ error: message, blockers }, 409);
+            const query = new URLSearchParams({ tenantId });
+            if (appId)
+                query.set("appId", appId);
+            return linkedServiceHtmxError(blockers, {
+                heading: "Service is still linked and cannot be deactivated.",
+                actionUrl: `${API_BASE}/shared-services/${encodeURIComponent(sharedServiceId)}/activations/purge?${query}`,
+                confirm: "Purge all routes, menu entries, fragments, slots, auth links, role grants, M2M connections and webhooks for this activation, then deactivate it?",
+                buttonLabel: "Purge references and deactivate service"
+            });
+        }
         config.sharedServiceActivations = config.sharedServiceActivations.filter((activation) => !(activation.sharedServiceId === sharedServiceId && activation.tenantId === tenantId && activation.appId === appId));
         await store.saveConfig(config);
         if (wantsHtmx(event))
             return htmxReload(`/services?tenantId=${encodeURIComponent(tenantId)}`);
         return jsonResponse({ ok: true });
     });
+    app.post(`${API_BASE}/shared-services/:sharedServiceId/activations/purge`, async (event) => {
+        const sharedServiceId = getParam(event, "sharedServiceId");
+        if (!sharedServiceId)
+            return jsonResponse({ error: "sharedServiceId required" }, 400);
+        const url = new URL(event.req.url ?? "", RELATIVE_URL_PARSE_BASE);
+        const tenantId = url.searchParams.get("tenantId") ?? "";
+        const appId = url.searchParams.get("appId") ?? undefined;
+        if (!tenantId)
+            return wantsHtmx(event) ? htmxError("tenantId required") : jsonResponse({ error: "tenantId required" }, 400);
+        const config = await store.loadConfig();
+        const activations = config.sharedServiceActivations.filter((activation) => activation.sharedServiceId === sharedServiceId
+            && activation.tenantId === tenantId
+            && activation.appId === appId);
+        if (activations.length === 0) {
+            return wantsHtmx(event) ? htmxError("Shared service activation not found", 404) : jsonResponse({ error: "Shared service activation not found" }, 404);
+        }
+        const summaries = activations.map((activation) => purgeServiceReferences(config, tenantId, activation.id));
+        config.sharedServiceActivations = config.sharedServiceActivations.filter((activation) => !activations.includes(activation));
+        await store.saveConfig(config);
+        const removed = (key) => summaries.reduce((total, summary) => total + summary[key], 0);
+        if (wantsHtmx(event)) {
+            return htmlResponse(`
+        <div class="alert alert-success">
+          Shared service deactivated. Purged ${removed("routesRemoved")} route(s), ${removed("slotsRemoved")} slot(s), ${removed("fragmentsRemoved")} fragment(s), ${removed("roleGrantsRemoved")} role grant(s), ${removed("shellCleared")} shell binding(s), ${removed("authCleared")} auth binding(s), ${removed("m2mBindingsRemoved")} M2M connection(s), and ${removed("webhooksRemoved")} webhook(s).
+        </div>
+        <div hx-get="/services?tenantId=${encodeURIComponent(tenantId)}" hx-trigger="load" hx-target="#bp-main" hx-swap="innerHTML"></div>
+      `, 200, "text/html; mode=fragment");
+        }
+        return jsonResponse({ ok: true, summaries });
+    });
     // Tenants
     app.get(`${API_BASE}/tenants/:tenantId/services`, async (event) => {
         const tenantId = getParam(event, "tenantId");
@@ -1166,7 +1242,12 @@ export function registerAdminApiRoutes(app, store, cpState) {
         const blockers = collectServiceDeleteBlockers(config, tenantId, serviceId);
         if (blockers.length > 0) {
             const message = linkedServiceError(blockers);
-            return wantsHtmx(event) ? linkedServiceHtmxError(tenantId, serviceId, blockers) : jsonResponse({ error: message, blockers }, 409);
+            return wantsHtmx(event) ? linkedServiceHtmxError(blockers, {
+                heading: "Service is still linked and cannot be deleted.",
+                actionUrl: `${API_BASE}/tenants/${encodeURIComponent(tenantId)}/services/${encodeURIComponent(serviceId)}/purge`,
+                confirm: "Purge all routes, menu entries, fragments, slots, auth links, role grants, M2M connections and webhooks for this service, then delete it?",
+                buttonLabel: "Purge references and delete service"
+            }) : jsonResponse({ error: message, blockers }, 409);
         }
         tenant.services = tenant.services.filter((s) => s.id !== serviceId);
         await store.saveConfig(config);
@@ -1190,13 +1271,13 @@ export function registerAdminApiRoutes(app, store, cpState) {
         const service = tenant.services.find((candidate) => candidate.id === serviceId);
         if (!service)
             return wantsHtmx(event) ? htmxError("Service not found", 404) : jsonResponse({ error: "Service not found" }, 404);
-        const summary = purgeTenantServiceReferences(config, tenantId, serviceId);
+        const summary = purgeServiceReferences(config, tenantId, serviceId);
         tenant.services = tenant.services.filter((candidate) => candidate.id !== serviceId);
         await store.saveConfig(config);
         if (wantsHtmx(event)) {
             return htmlResponse(`
         <div class="alert alert-success">
-          Service deleted. Purged ${summary.routesRemoved} route(s), ${summary.slotsRemoved} slot(s), ${summary.fragmentsRemoved} fragment(s), ${summary.roleGrantsRemoved} role grant(s), ${summary.shellCleared} shell binding(s), and ${summary.authCleared} auth binding(s).
+          Service deleted. Purged ${summary.routesRemoved} route(s), ${summary.slotsRemoved} slot(s), ${summary.fragmentsRemoved} fragment(s), ${summary.roleGrantsRemoved} role grant(s), ${summary.shellCleared} shell binding(s), ${summary.authCleared} auth binding(s), ${summary.m2mBindingsRemoved} M2M connection(s), and ${summary.webhooksRemoved} webhook(s).
         </div>
         <div hx-get="/services?tenantId=${encodeURIComponent(tenantId)}" hx-trigger="load" hx-target="#bp-main" hx-swap="innerHTML"></div>
       `, 200, "text/html; mode=fragment");