@betterportal/config-manager 10.1.41 → 10.1.43

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.41
+ * @version 10.1.43
  */
 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.41
+ * @version 10.1.43
  */
 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.41",
+    "version": "10.1.43",
     "category": "service",
     "deploymentModes": [
       "self-hosted"
@@ -388,6 +388,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",
@@ -586,6 +589,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",
@@ -728,6 +734,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",
@@ -943,6 +952,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",
@@ -1126,6 +1138,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",
@@ -1419,6 +1434,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",
@@ -1680,6 +1698,167 @@
                   "description": "Tenant currently selected in the service registry."
                 }
               },
+              "selectedAppId": {
+                "kind": "optional",
+                "inner": {
+                  "kind": "string",
+                  "minLength": 1
+                },
+                "metadata": {
+                  "description": "App currently selected for service connections."
+                }
+              },
+              "m2mConnections": {
+                "kind": "array",
+                "items": {
+                  "kind": "object",
+                  "properties": {
+                    "sourceServiceId": {
+                      "kind": "string",
+                      "minLength": 1
+                    },
+                    "sourceServiceTitle": {
+                      "kind": "string",
+                      "minLength": 1
+                    },
+                    "sourceServiceType": {
+                      "kind": "string",
+                      "minLength": 1
+                    },
+                    "requestId": {
+                      "kind": "string",
+                      "minLength": 1
+                    },
+                    "title": {
+                      "kind": "string",
+                      "minLength": 1
+                    },
+                    "contractId": {
+                      "kind": "string",
+                      "minLength": 1
+                    },
+                    "version": {
+                      "kind": "optional",
+                      "inner": {
+                        "kind": "string",
+                        "minLength": 1
+                      }
+                    },
+                    "mode": {
+                      "kind": "enum",
+                      "values": [
+                        "service",
+                        "delegated"
+                      ]
+                    },
+                    "methods": {
+                      "kind": "array",
+                      "items": {
+                        "kind": "string"
+                      },
+                      "default": []
+                    },
+                    "permissions": {
+                      "kind": "array",
+                      "items": {
+                        "kind": "string"
+                      },
+                      "default": []
+                    },
+                    "optional": {
+                      "kind": "bool",
+                      "default": false
+                    },
+                    "status": {
+                      "kind": "enum",
+                      "values": [
+                        "connected",
+                        "pending",
+                        "choice",
+                        "unavailable",
+                        "stale"
+                      ]
+                    },
+                    "message": {
+                      "kind": "string",
+                      "minLength": 1
+                    },
+                    "bindingId": {
+                      "kind": "optional",
+                      "inner": {
+                        "kind": "string",
+                        "minLength": 1
+                      }
+                    },
+                    "targetServiceId": {
+                      "kind": "optional",
+                      "inner": {
+                        "kind": "string",
+                        "minLength": 1
+                      }
+                    },
+                    "targetViewId": {
+                      "kind": "optional",
+                      "inner": {
+                        "kind": "string",
+                        "minLength": 1
+                      }
+                    },
+                    "candidates": {
+                      "kind": "array",
+                      "items": {
+                        "kind": "object",
+                        "properties": {
+                          "targetServiceId": {
+                            "kind": "string",
+                            "minLength": 1
+                          },
+                          "targetServiceTitle": {
+                            "kind": "string",
+                            "minLength": 1
+                          },
+                          "targetServiceType": {
+                            "kind": "string",
+                            "minLength": 1
+                          },
+                          "targetViewId": {
+                            "kind": "string",
+                            "minLength": 1
+                          }
+                        },
+                        "required": [
+                          "targetServiceId",
+                          "targetServiceTitle",
+                          "targetServiceType",
+                          "targetViewId"
+                        ],
+                        "unknownKeys": "strip"
+                      },
+                      "default": []
+                    }
+                  },
+                  "required": [
+                    "sourceServiceId",
+                    "sourceServiceTitle",
+                    "sourceServiceType",
+                    "requestId",
+                    "title",
+                    "contractId",
+                    "mode",
+                    "methods",
+                    "permissions",
+                    "optional",
+                    "status",
+                    "message",
+                    "candidates"
+                  ],
+                  "unknownKeys": "strip"
+                },
+                "default": [],
+                "metadata": {
+                  "description": "App-scoped service dependency requests and connection status."
+                }
+              },
               "sharedServiceCatalog": {
                 "kind": "array",
                 "items": {
@@ -1904,6 +2083,7 @@
               "title",
               "services",
               "tenants",
+              "m2mConnections",
               "sharedServiceCatalog",
               "sharedServiceActivations",
               "apps",
@@ -1943,6 +2123,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",
@@ -1963,6 +2146,7 @@
               "title": "Service Registry",
               "services": [],
               "tenants": [],
+              "m2mConnections": [],
               "sharedServiceCatalog": [],
               "sharedServiceActivations": [],
               "apps": [],
@@ -2228,6 +2412,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",
@@ -2581,6 +2768,9 @@
         },
         "auth": {
           "required": true,
+          "callers": [
+            "user"
+          ],
           "permissions": [
             {
               "serviceId": "org.betterportal.config-manager",

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;AAmLzD,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,CAm1CN"}
+{"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"}

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

@@ -3,6 +3,7 @@ import { AppAuthRoleSchema, eventHeaders, htmlResponse, jsonResponse, resolveEmb
 import { generateApiKey, hashApiKey } from "./storage/index.js";
 import { getManifestCache } from "./syncApi.js";
 import { apiRoutePath, appRoutePatternKey, isApiRoute, pageRoutePath } from "./routeMounts.js";
+import { M2MConnectionError, approveM2MConnections, buildM2MConnectionModel, revokeM2MConnection } from "./m2mConnections.js";
 const API_BASE = "/.well-known/bp/admin";
 const CONFIG_TICKET_TTL_SECONDS = 5 * 60;
 // Parse-only base for relative request URLs. Never emit this origin.
@@ -1630,6 +1631,77 @@ export function registerAdminApiRoutes(app, store, cpState) {
             return htmxReload(`/auth?appId=${encodeURIComponent(appId)}`);
         return jsonResponse({ ok: true });
     });
+    // Service connections (per app)
+    app.get(`${API_BASE}/apps/:appId/m2m/connections`, async (event) => {
+        const appId = getParam(event, "appId");
+        if (!appId)
+            return jsonResponse({ error: "appId required" }, 400);
+        const config = await store.loadConfig();
+        if (!config.apps.some((candidate) => candidate.id === appId))
+            return jsonResponse({ error: "App not found" }, 404);
+        return jsonResponse(buildM2MConnectionModel(config, appId));
+    });
+    app.post(`${API_BASE}/apps/:appId/m2m/connections`, async (event) => {
+        const appId = getParam(event, "appId");
+        if (!appId)
+            return jsonResponse({ error: "appId required" }, 400);
+        const body = await readFormOrJsonBody(event);
+        let rawSelections = body.connections;
+        if (typeof rawSelections === "string") {
+            try {
+                rawSelections = JSON.parse(rawSelections);
+            }
+            catch {
+                rawSelections = undefined;
+            }
+        }
+        const inputs = Array.isArray(rawSelections) ? rawSelections : [body];
+        const selections = inputs.flatMap((input) => {
+            if (!input || typeof input !== "object")
+                return [];
+            const value = input;
+            return typeof value.sourceServiceId === "string" && typeof value.requestId === "string"
+                ? [{
+                        sourceServiceId: value.sourceServiceId,
+                        requestId: value.requestId,
+                        ...(typeof value.targetServiceId === "string" && value.targetServiceId ? { targetServiceId: value.targetServiceId } : {}),
+                        ...(typeof value.targetViewId === "string" && value.targetViewId ? { targetViewId: value.targetViewId } : {})
+                    }]
+                : [];
+        });
+        const config = await store.loadConfig();
+        const appDef = config.apps.find((candidate) => candidate.id === appId);
+        if (!appDef)
+            return jsonResponse({ error: "App not found" }, 404);
+        try {
+            const result = approveM2MConnections(config, appId, selections);
+            if (result.created.length > 0)
+                await store.saveConfig(config);
+            if (wantsHtmx(event))
+                return htmxReload(`/services?tenantId=${encodeURIComponent(appDef.tenantId)}&appId=${encodeURIComponent(appId)}`);
+            return jsonResponse(result, result.created.length > 0 ? 201 : 200);
+        }
+        catch (error) {
+            const status = error instanceof M2MConnectionError ? error.status : 500;
+            const message = error instanceof Error ? error.message : "Unable to approve service connection";
+            return wantsHtmx(event) ? htmxError(message, status) : jsonResponse({ error: message }, status);
+        }
+    });
+    app.delete(`${API_BASE}/apps/:appId/m2m/connections/:bindingId`, async (event) => {
+        const appId = getParam(event, "appId");
+        const bindingId = getParam(event, "bindingId");
+        if (!appId || !bindingId)
+            return jsonResponse({ error: "appId and bindingId required" }, 400);
+        const config = await store.loadConfig();
+        const appDef = config.apps.find((candidate) => candidate.id === appId);
+        if (!appDef || !revokeM2MConnection(config, appId, bindingId)) {
+            return wantsHtmx(event) ? htmxError("Service connection not found", 404) : jsonResponse({ error: "Service connection not found" }, 404);
+        }
+        await store.saveConfig(config);
+        if (wantsHtmx(event))
+            return htmxReload(`/services?tenantId=${encodeURIComponent(appDef.tenantId)}&appId=${encodeURIComponent(appId)}`);
+        return jsonResponse({ ok: true });
+    });
     // Routes (per app)
     app.get(`${API_BASE}/apps/:appId/routes`, async (event) => {
         const appId = getParam(event, "appId");