@lucaapp/service-utils 5.29.1 → 5.29.2

package/dist/lib/api/openapi.js

@@ -225,27 +225,6 @@ const hoistCombinatorRequiredFields = (spec) => {
     visit(schemas);
 };
 exports.hoistCombinatorRequiredFields = hoistCombinatorRequiredFields;
-/**
- * Turn each middleware's declared schemes into OpenAPI security requirements.
- *
- * OpenAPI expresses the two relations differently: separate objects in the
- * `security` array are alternatives (OR), while several schemes inside one
- * object are all required (AND). A middleware's own `security: [a, b]` means
- * "a or b" -- it accepts either credential -- but two middlewares on the same
- * route both run, so their requirements are combined with AND.
- *
- * That makes the result the cartesian product across middlewares:
- *
- *   [[a, b], [c]]  ->  [{a, c}, {b, c}]
- *
- * A single middleware therefore still renders as plain alternatives, which is
- * what it did before, and stacked middlewares no longer render as if presenting
- * any one of their credentials were enough.
- */
-const buildSecurityRequirements = (securityByMiddleware) => securityByMiddleware.reduce((requirements, alternatives) => requirements.flatMap(requirement => 
-// Duplicates collapse on their own: the same scheme required twice is
-// still one entry in the object.
-alternatives.map(scheme => ({ ...requirement, [scheme]: [] }))), [{}]);
 const registerEndpoint = (registry, method, prefixPath, rootPrefixPath, path, summary, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 options, tags, debug) => {
@@ -254,11 +233,15 @@ options, tags, debug) => {
     let querySchema = options.schemas?.query || undefined;
     let headersSchema = options.schemas?.headers || undefined;
     let responseSchemas = options.responses;
-    // One entry per security-declaring middleware, each holding that middleware's
-    // alternatives. Kept separate because the two levels mean different things:
-    // within a middleware the schemes are alternatives, across middlewares they
-    // are all enforced. See buildSecurityRequirements.
-    const securityByMiddleware = [];
+    // Union across middlewares, one scheme per requirement object, which OpenAPI
+    // reads as "any one of these". Deliberately not one object holding all of
+    // them, which would read as "all of these at once": jwt_operator,
+    // jwt_support, jwt_operator_device and jwt_consumer are all apiKey in the
+    // same X-Auth header, so requiring two of them is unsatisfiable. Nearly every
+    // location-guarded route stacks requireOperatorOROperatorDevice with
+    // authorizeLocation(Group), and 5.29.1 documented those 281 routes as needing
+    // an operator token and an operator-device token simultaneously.
+    const securitySchemes = new Set();
     if (options.errors) {
         for (const errorType of Object.keys(options.errors)) {
             const statusCode = options.errors[errorType];
@@ -319,9 +302,8 @@ options, tags, debug) => {
                 });
             }
         }
-        const middlewareSecurity = middleware.options.security || [];
-        if (middlewareSecurity.length > 0) {
-            securityByMiddleware.push([...middlewareSecurity]);
+        for (const scheme of middleware.options.security || []) {
+            securitySchemes.add(scheme);
         }
     }
     // Add ZodError response
@@ -381,8 +363,8 @@ options, tags, debug) => {
         responses: responseMap,
         operationId: options.operationId ||
             deriveOperationId(registry, method, prefixPath.slice(rootPrefixPath.length) + path),
-        ...(securityByMiddleware.length > 0 && {
-            security: buildSecurityRequirements(securityByMiddleware),
+        ...(securitySchemes.size > 0 && {
+            security: [...securitySchemes].map(scheme => ({ [scheme]: [] })),
         }),
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "5.29.1",
+  "version": "5.29.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [