@onlineapps/conn-orch-api-mapper 1.0.27 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-api-mapper",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "API mapping connector for OA Drive - maps cookbook operations to HTTP endpoints",
   "main": "src/index.js",
   "scripts": {

package/src/ApiMapper.js

@@ -560,6 +560,9 @@ class ApiMapper {
         operations[operationId] = {
           method: (operation.method || 'POST').toUpperCase(),
           path: operation.endpoint || `/${operationId}`,
+          // Static headers from operations.json (e.g. x-validation-request).
+          // NOTE: account-id is controlled by workflow context (_system.account_id) and must not be overridden here.
+          headers: operation.headers || null,
           // Store original operations.json input schema for type-driven descriptor handling
           input: operation.input || null,
           parameters: operation.input ? this._convertOperationsJsonInputToOpenApi(operation.input) : [],
@@ -696,6 +699,27 @@ class ApiMapper {
       data: null
     };
 
+    // operations.json static headers (if present)
+    if (operation && operation.headers && typeof operation.headers === 'object') {
+      Object.entries(operation.headers).forEach(([k, v]) => {
+        if (!k) return;
+        // Never allow operation-level config to override tenant header
+        if (String(k).toLowerCase() === 'account-id') return;
+
+        // Optional: allow ${context.path} variable resolution (no env side-effects here).
+        if (typeof v === 'string' && v.startsWith('${') && v.endsWith('}')) {
+          const path = v.slice(2, -1);
+          const resolved = this._getValueFromPath(context, path);
+          if (resolved !== undefined) {
+            request.headers[k] = resolved;
+          }
+          return;
+        }
+
+        request.headers[k] = v;
+      });
+    }
+
     // Process path parameters
     operation.parameters.forEach(param => {
       const value = input[param.name];
@@ -738,17 +762,23 @@ class ApiMapper {
     }
 
     // Multitenancy: propagate account context from workflow _system into HTTP header.
-    // This is the single source of truth for workflow-scoped tenant.
-    // NOTE: Gateway must set cookbook._system.account_id explicitly (no fallbacks).
+    // FAIL-FAST: _system.account_id is REQUIRED for all workflow requests.
+    // Gateway sets this, so missing value indicates configuration error.
     const sys = context && typeof context === 'object' ? context._system : null;
-    if (sys && Object.prototype.hasOwnProperty.call(sys, 'account_id')) {
-      const accountId = Number.parseInt(String(sys.account_id), 10);
-      if (!Number.isInteger(accountId) || accountId <= 0) {
-        throw new Error(`[ApiMapper][AccountContext] Invalid account context - Expected context._system.account_id to be a positive integer, got: ${sys.account_id}`);
-      }
-      // Do not allow step input to override tenant header
-      request.headers['account-id'] = String(accountId);
+    if (!sys || !Object.prototype.hasOwnProperty.call(sys, 'account_id')) {
+      throw new Error(
+        '[ApiMapper][AccountContext] Missing account context - Expected context._system.account_id. ' +
+        'Fix: Gateway must set _system.account_id from account-id header.'
+      );
+    }
+    const accountId = Number.parseInt(String(sys.account_id), 10);
+    if (!Number.isInteger(accountId) || accountId <= 0) {
+      throw new Error(
+        `[ApiMapper][AccountContext] Invalid account context - Expected context._system.account_id to be a positive integer, got: ${sys.account_id}`
+      );
     }
+    // Do not allow step input to override tenant header
+    request.headers['account-id'] = String(accountId);
 
     return request;
   }