@wildo-ai/saas-backend-lib 1.1.1 → 1.1.3

package/dist/esm/runtime/services/execution-context-creator.backend.service.js

@@ -13,7 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 import { Container, inject, injectable } from 'inversify';
 import 'reflect-metadata';
 import { trace } from '@opentelemetry/api';
-import { ApiKeyScope, apiKeyScopeForCredential, CORE_APP_ROLES, CoreResourceType, coreResourceShared_FieldIdentifier, isApiKeyCredential, isAuthorityConferringOrganizationStatus, OrganizationMemberStatus, PRIMARY_SCOPE_TO_FIELD_IDENTIFIER, ResourcePrimaryScope, SERVICE_NATIVE_OPERATION_VARIANT_TYPES, URL_BEARING_OPERATION_VARIANT_TYPES, WildoHeaderKeys } from '@wildo-ai/saas-models';
+import { ApiKeyScope, apiKeyScopeForCredential, CORE_APP_ROLES, CoreResourceType, coreResourceShared_FieldIdentifier, isApiKeyCredential, isAuthorityConferringOrganizationStatus, OrganizationMemberStatus, PRIMARY_SCOPE_TO_FIELD_IDENTIFIER, requiredRolesDeclarePublicAccess, ResourcePrimaryScope, SERVICE_NATIVE_OPERATION_VARIANT_TYPES, URL_BEARING_OPERATION_VARIANT_TYPES, WildoHeaderKeys } from '@wildo-ai/saas-models';
 import { ApiKeyStatus, OAuthClientStatus, CoreResourceOperation, ErrorCustomMessageReference, ErrorType, ExecutionContext_ExecutionType, MachineAuthMethod, ResourceOperationVariantType, ResourcesConfig_OperationPathUtils, TokenAuthenticationPolicy, UserStatus, isWildoBackendError } from '@wildo-ai/saas-models';
 // =====================================================
 // Socket Authentication Types (reuses existing ExecutionContext types)
@@ -989,8 +989,15 @@ let ExecutionContextCreatorBackendService = class ExecutionContextCreatorBackend
         const headerToken = req.headers[WildoHeaderKeys.CONSUMABLE_TOKEN];
         const tokenAuthConfig = 'tokenAuthentication' in operation ? operation.tokenAuthentication : undefined;
         const policy = tokenAuthConfig?.policy;
-        // ── GATE 1: Query token present — route by policy ──
-        if (queryToken) {
+        // An ALTERNATIVE token may arrive in the `x-consumable-token` HEADER as well as the query string
+        // (issue #312, D5). Paths are recorded by every proxy and access log between the client and this
+        // process; headers are not — so a credential that travels through an LLM transcript and a shell
+        // history is handed to `curl` as a header, and the query form stays for links a browser must follow.
+        // Narrow on purpose: the header counts as a credential ONLY when the operation declares an ALTERNATIVE
+        // policy. An operation with no token config, or an ADDITIVE one, sees exactly what it saw before.
+        const alternativeToken = queryToken ?? (policy === TokenAuthenticationPolicy.ALTERNATIVE ? headerToken : undefined);
+        // ── GATE 1: Alternative token present — route by policy ──
+        if (alternativeToken) {
             if (!tokenAuthConfig) {
                 // Trap 6: operation doesn't accept token authentication
                 throw this.errorBuilder.buildError(ErrorType.AUTHENTICATION, undefined, {
@@ -1001,7 +1008,7 @@ let ExecutionContextCreatorBackendService = class ExecutionContextCreatorBackend
             if (policy === TokenAuthenticationPolicy.ALTERNATIVE) {
                 this.logDebug('Consumable token provided, processing ALTERNATIVE token authentication');
                 const expectedTypes = tokenAuthConfig.types || [];
-                const consumableTokenObject = await this.consumableTokenService.validateToken(queryToken, expectedTypes.length > 0 ? expectedTypes : undefined);
+                const consumableTokenObject = await this.consumableTokenService.validateToken(alternativeToken, expectedTypes.length > 0 ? expectedTypes : undefined);
                 // Build context from typed token fields (Trap 3: no untyped metadata bag)
                 const tokenContext = {};
                 if (consumableTokenObject.organizationId) {
@@ -1025,7 +1032,7 @@ let ExecutionContextCreatorBackendService = class ExecutionContextCreatorBackend
                     ...this.extractInitiatorIds(initiatorCriticalParamsValue),
                 };
                 const executionContext = new ExecutionContext(operation, ExecutionContext_ExecutionType.CONSUMABLE_TOKEN, new Map(Object.entries(initiatorCriticalParamsValue)), initiatorIds, consumableTokenObject.roles || [], relationshipContexts);
-                executionContext.setConsumableTokenValue(queryToken);
+                executionContext.setConsumableTokenValue(alternativeToken);
                 if (operation.resourcePrimaryScope === ResourcePrimaryScope.APPLICATION) {
                     await this.populateApplicationIdIfNeeded(executionContext);
                 }
@@ -1781,8 +1788,7 @@ let ExecutionContextCreatorBackendService = class ExecutionContextCreatorBackend
      * it is the authentication tier declining to demand a credential the operation never required.
      */
     operationAdmitsPublicAccess(operation) {
-        const roles = operation.roles;
-        return Array.isArray(roles) && roles.includes(CORE_APP_ROLES.APP_PUBLIC);
+        return requiredRolesDeclarePublicAccess(operation.roles);
     }
     /**
      * Build the execution context for a public request — no caller identity, minimal privilege.