@open-mercato/core 0.10.1-develop.7785.1.ec0898da36 → 0.10.1-develop.7787.1.96c7cfc66f

package/src/modules/messages/api/guards.ts

@@ -5,12 +5,18 @@ import {
   type MutationGuard,
   type MutationGuardInput,
 } from '@open-mercato/shared/lib/crud/mutation-guard-registry'
+import { getAllMutationGuardInstances } from '@open-mercato/shared/lib/crud/mutation-guard-store'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
+
+const logger = createLogger('messages')
 
 type GuardAfterCallback = {
   guard: MutationGuard
   metadata: Record<string, unknown> | null
 }
 
+/** @deprecated Mutation guard grants are resolved from RBAC by `runMessageMutationGuards`. */
 export function resolveUserFeatures(auth: unknown): string[] {
   const features = (auth as { features?: unknown })?.features
   if (!Array.isArray(features)) return []
@@ -20,7 +26,7 @@ export function resolveUserFeatures(auth: unknown): string[] {
 export async function runMessageMutationGuards(
   container: AwilixContainer,
   input: MutationGuardInput,
-  userFeatures: string[],
+  extraFeatures: string[] = [],
 ): Promise<{
   ok: boolean
   errorBody?: Record<string, unknown>
@@ -28,12 +34,35 @@ export async function runMessageMutationGuards(
   modifiedPayload?: Record<string, unknown>
   afterSuccessCallbacks: GuardAfterCallback[]
 }> {
+  const allGuards: MutationGuard[] = [...getAllMutationGuardInstances()]
   const legacyGuard = bridgeLegacyGuard(container)
-  if (!legacyGuard) {
+  if (legacyGuard) allGuards.push(legacyGuard)
+  if (!allGuards.length) {
     return { ok: true, afterSuccessCallbacks: [] }
   }
 
-  return runMutationGuards([legacyGuard], input, { userFeatures })
+  let grantedFeatures: string[] = []
+  try {
+    const rbacService = container.resolve('rbacService') as {
+      getGrantedFeatures?: (
+        userId: string,
+        scope: { tenantId: string | null; organizationId: string | null },
+      ) => Promise<string[]>
+    } | undefined
+    grantedFeatures = await rbacService?.getGrantedFeatures?.(input.userId, {
+      tenantId: input.tenantId,
+      organizationId: input.organizationId,
+    }) ?? []
+  } catch (err) {
+    logger.error('Failed to resolve mutation guard feature grants', { err })
+    getTelemetryRuntime()?.reportError(err, {
+      module: 'messages',
+      code: 'messages.mutation_guard_feature_resolution_failed',
+    })
+  }
+
+  const userFeatures = Array.from(new Set([...grantedFeatures, ...extraFeatures]))
+  return runMutationGuards(allGuards, input, { userFeatures })
 }
 
 export async function runMessageMutationGuardAfterSuccess(
@@ -51,9 +80,18 @@ export async function runMessageMutationGuardAfterSuccess(
 ): Promise<void> {
   for (const callback of callbacks) {
     if (!callback.guard.afterSuccess) continue
-    await callback.guard.afterSuccess({
-      ...input,
-      metadata: callback.metadata ?? null,
-    })
+    try {
+      await callback.guard.afterSuccess({
+        ...input,
+        metadata: callback.metadata ?? null,
+      })
+    } catch (err) {
+      logger.error('Mutation guard afterSuccess failed', { guardId: callback.guard.id, err })
+      getTelemetryRuntime()?.reportError(err, {
+        module: 'messages',
+        code: 'messages.mutation_guard_after_success_failed',
+        attributes: { guardId: callback.guard.id },
+      })
+    }
   }
 }

package/src/modules/payment_gateways/api/guards.ts

@@ -5,12 +5,18 @@ import {
   type MutationGuard,
   type MutationGuardInput,
 } from '@open-mercato/shared/lib/crud/mutation-guard-registry'
+import { getAllMutationGuardInstances } from '@open-mercato/shared/lib/crud/mutation-guard-store'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
+
+const logger = createLogger('payment_gateways')
 
 type GuardAfterCallback = {
   guard: MutationGuard
   metadata: Record<string, unknown> | null
 }
 
+/** @deprecated Mutation guard grants are resolved from RBAC by `runPaymentGatewayMutationGuards`. */
 export function resolveUserFeatures(auth: unknown): string[] {
   const features = (auth as { features?: unknown })?.features
   if (!Array.isArray(features)) return []
@@ -20,7 +26,7 @@ export function resolveUserFeatures(auth: unknown): string[] {
 export async function runPaymentGatewayMutationGuards(
   container: AwilixContainer,
   input: MutationGuardInput,
-  userFeatures: string[],
+  extraFeatures: string[] = [],
 ): Promise<{
   ok: boolean
   errorBody?: Record<string, unknown>
@@ -28,12 +34,35 @@ export async function runPaymentGatewayMutationGuards(
   modifiedPayload?: Record<string, unknown>
   afterSuccessCallbacks: GuardAfterCallback[]
 }> {
+  const allGuards: MutationGuard[] = [...getAllMutationGuardInstances()]
   const legacyGuard = bridgeLegacyGuard(container)
-  if (!legacyGuard) {
+  if (legacyGuard) allGuards.push(legacyGuard)
+  if (!allGuards.length) {
     return { ok: true, afterSuccessCallbacks: [] }
   }
 
-  return runMutationGuards([legacyGuard], input, { userFeatures })
+  let grantedFeatures: string[] = []
+  try {
+    const rbacService = container.resolve('rbacService') as {
+      getGrantedFeatures?: (
+        userId: string,
+        scope: { tenantId: string | null; organizationId: string | null },
+      ) => Promise<string[]>
+    } | undefined
+    grantedFeatures = await rbacService?.getGrantedFeatures?.(input.userId, {
+      tenantId: input.tenantId,
+      organizationId: input.organizationId,
+    }) ?? []
+  } catch (err) {
+    logger.error('Failed to resolve mutation guard feature grants', { err })
+    getTelemetryRuntime()?.reportError(err, {
+      module: 'payment_gateways',
+      code: 'payment_gateways.mutation_guard_feature_resolution_failed',
+    })
+  }
+
+  const userFeatures = Array.from(new Set([...grantedFeatures, ...extraFeatures]))
+  return runMutationGuards(allGuards, input, { userFeatures })
 }
 
 export async function runPaymentGatewayMutationGuardAfterSuccess(
@@ -51,9 +80,18 @@ export async function runPaymentGatewayMutationGuardAfterSuccess(
 ): Promise<void> {
   for (const callback of callbacks) {
     if (!callback.guard.afterSuccess) continue
-    await callback.guard.afterSuccess({
-      ...input,
-      metadata: callback.metadata ?? null,
-    })
+    try {
+      await callback.guard.afterSuccess({
+        ...input,
+        metadata: callback.metadata ?? null,
+      })
+    } catch (err) {
+      logger.error('Mutation guard afterSuccess failed', { guardId: callback.guard.id, err })
+      getTelemetryRuntime()?.reportError(err, {
+        module: 'payment_gateways',
+        code: 'payment_gateways.mutation_guard_after_success_failed',
+        attributes: { guardId: callback.guard.id },
+      })
+    }
   }
 }

package/src/modules/push_notifications/api/custom-send/route.ts

@@ -7,13 +7,7 @@ import { resolveSingleOrganizationIdOrDeny } from '@open-mercato/core/modules/di
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { createLogger } from '@open-mercato/shared/lib/logger'
-import {
-  bridgeLegacyGuard,
-  runMutationGuards,
-  type MutationGuard,
-  type MutationGuardInput,
-} from '@open-mercato/shared/lib/crud/mutation-guard-registry'
-import type { AwilixContainer } from 'awilix'
+import { runRouteMutationGuards } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 import {
   customSendSchema,
   customSendResponseSchema,
@@ -32,27 +26,6 @@ export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['push_notifications.send_custom'] },
 }
 
-function resolveUserFeatures(auth: unknown): string[] {
-  const features = (auth as { features?: unknown })?.features
-  if (!Array.isArray(features)) return []
-  return features.filter((value): value is string => typeof value === 'string')
-}
-
-async function runGuards(
-  container: AwilixContainer,
-  userFeatures: string[],
-  input: MutationGuardInput,
-): Promise<{
-  ok: boolean
-  errorBody?: Record<string, unknown>
-  errorStatus?: number
-  afterSuccessCallbacks: Array<{ guard: MutationGuard; metadata: Record<string, unknown> | null }>
-}> {
-  const legacyGuard = bridgeLegacyGuard(container)
-  if (!legacyGuard) return { ok: true, afterSuccessCallbacks: [] }
-  return runMutationGuards([legacyGuard], input, { userFeatures })
-}
-
 export async function POST(req: Request) {
   const { translate } = await resolveTranslations()
   try {
@@ -71,23 +44,23 @@ export async function POST(req: Request) {
 
     // Custom write route → wire the mutation-guard registry (AGENTS → API Routes). The send creates
     // append-only delivery rows; map it to a `create` on the delivery resource keyed by recipient.
-    const guardInput: MutationGuardInput = {
-      tenantId: auth.tenantId,
-      organizationId,
-      userId: auth.sub,
-      resourceKind: RESOURCE_KIND,
-      resourceId: body.recipientUserId,
-      operation: 'create',
-      requestMethod: req.method,
-      requestHeaders: req.headers,
-      mutationPayload: body,
-    }
-    const guardResult = await runGuards(container, resolveUserFeatures(auth), guardInput)
+    const guardResult = await runRouteMutationGuards({
+      container,
+      req,
+      auth: {
+        tenantId: auth.tenantId,
+        organizationId,
+        userId: auth.sub,
+      },
+      input: {
+        resourceKind: RESOURCE_KIND,
+        resourceId: body.recipientUserId,
+        operation: 'create',
+        mutationPayload: body,
+      },
+    })
     if (!guardResult.ok) {
-      return NextResponse.json(
-        guardResult.errorBody ?? { error: translate('push_notifications.errors.send_failed', 'Operation blocked') },
-        { status: guardResult.errorStatus ?? 422 },
-      )
+      return guardResult.response
     }
 
     const service = container.resolve('pushNotificationService') as PushNotificationService
@@ -104,14 +77,7 @@ export async function POST(req: Request) {
       silent: body.silent ?? false,
     })
 
-    for (const callback of guardResult.afterSuccessCallbacks) {
-      if (!callback.guard.afterSuccess) continue
-      await callback.guard.afterSuccess({
-        ...guardInput,
-        resourceId: body.recipientUserId,
-        metadata: callback.metadata ?? null,
-      })
-    }
+    await guardResult.runAfterSuccess()
 
     // A well-formed request that enqueued nothing (no push channel, no in-scope device, or no device
     // whose provider matches an active channel) previously returned a bare 201 — a silent

package/src/modules/sales/api/quotes/convert/route.ts

@@ -9,12 +9,7 @@ import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import {
-  bridgeLegacyGuard,
-  runMutationGuards,
-  type MutationGuard,
-  type MutationGuardInput,
-} from '@open-mercato/shared/lib/crud/mutation-guard-registry'
+import { runRouteMutationGuards } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 import { withScopedPayload } from '../../utils'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
@@ -35,53 +30,6 @@ type RequestContext = {
   ctx: CommandRuntimeContext
 }
 
-function resolveUserFeatures(auth: unknown): string[] {
-  const features = (auth as { features?: unknown })?.features
-  if (!Array.isArray(features)) return []
-  return features.filter((value): value is string => typeof value === 'string')
-}
-
-async function runGuards(
-  ctx: CommandRuntimeContext,
-  input: MutationGuardInput,
-): Promise<{
-  ok: boolean
-  errorBody?: Record<string, unknown>
-  errorStatus?: number
-  afterSuccessCallbacks: Array<{ guard: MutationGuard; metadata: Record<string, unknown> | null }>
-}> {
-  const legacyGuard = bridgeLegacyGuard(ctx.container)
-  if (!legacyGuard) {
-    return { ok: true, afterSuccessCallbacks: [] }
-  }
-
-  return runMutationGuards([legacyGuard], input, {
-    userFeatures: resolveUserFeatures(ctx.auth),
-  })
-}
-
-async function runGuardAfterSuccessCallbacks(
-  callbacks: Array<{ guard: MutationGuard; metadata: Record<string, unknown> | null }>,
-  input: {
-    tenantId: string
-    organizationId: string | null
-    userId: string
-    resourceKind: string
-    resourceId: string
-    operation: 'create' | 'update' | 'delete'
-    requestMethod: string
-    requestHeaders: Headers
-  },
-): Promise<void> {
-  for (const callback of callbacks) {
-    if (!callback.guard.afterSuccess) continue
-    await callback.guard.afterSuccess({
-      ...input,
-      metadata: callback.metadata ?? null,
-    })
-  }
-}
-
 async function resolveRequestContext(req: Request): Promise<RequestContext> {
   const container = await createRequestContainer()
   const auth = await getAuthFromRequest(req)
@@ -118,18 +66,23 @@ export async function POST(req: Request) {
     const payload = await req.json().catch(() => ({}))
     const scoped = withScopedPayload(payload ?? {}, ctx, translate)
     const input = convertSchema.parse(scoped)
-    const guardResult = await runGuards(ctx, {
-      tenantId: ctx.auth?.tenantId ?? '',
-      organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
-      userId: ctx.auth?.sub ?? '',
-      resourceKind: 'sales.quote',
-      resourceId: input.quoteId,
-      operation: 'update',
-      requestMethod: req.method,
-      requestHeaders: req.headers,
+    const guardResult = await runRouteMutationGuards({
+      container: ctx.container,
+      req,
+      auth: {
+        tenantId: ctx.auth?.tenantId ?? '',
+        organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
+        userId: ctx.auth?.sub ?? '',
+      },
+      input: {
+        resourceKind: 'sales.quote',
+        resourceId: input.quoteId,
+        operation: 'update',
+        mutationPayload: input,
+      },
     })
     if (!guardResult.ok) {
-      return NextResponse.json(guardResult.errorBody ?? { error: 'Operation blocked by guard' }, { status: guardResult.errorStatus ?? 422 })
+      return guardResult.response
     }
     const commandBus = ctx.container.resolve('commandBus') as CommandBus
     const { result, logEntry } = await commandBus.execute<
@@ -159,18 +112,7 @@ export async function POST(req: Request) {
       )
     }
 
-    if (guardResult.afterSuccessCallbacks.length) {
-      await runGuardAfterSuccessCallbacks(guardResult.afterSuccessCallbacks, {
-        tenantId: ctx.auth?.tenantId ?? '',
-        organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
-        userId: ctx.auth?.sub ?? '',
-        resourceKind: 'sales.quote',
-        resourceId: input.quoteId,
-        operation: 'update',
-        requestMethod: req.method,
-        requestHeaders: req.headers,
-      })
-    }
+    await guardResult.runAfterSuccess()
 
     return jsonResponse
   } catch (err) {

package/src/modules/sales/api/quotes/send/route.ts

@@ -8,12 +8,7 @@ import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations, detectLocale } from '@open-mercato/shared/lib/i18n/server'
 import { CrudHttpError, isCrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import {
-  bridgeLegacyGuard,
-  runMutationGuards,
-  type MutationGuard,
-  type MutationGuardInput,
-} from '@open-mercato/shared/lib/crud/mutation-guard-registry'
+import { runRouteMutationGuards } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import crypto from 'node:crypto'
 import { withScopedPayload } from '../../utils'
@@ -37,53 +32,6 @@ type RequestContext = {
   ctx: CommandRuntimeContext
 }
 
-function resolveUserFeatures(auth: unknown): string[] {
-  const features = (auth as { features?: unknown })?.features
-  if (!Array.isArray(features)) return []
-  return features.filter((value): value is string => typeof value === 'string')
-}
-
-async function runGuards(
-  ctx: CommandRuntimeContext,
-  input: MutationGuardInput,
-): Promise<{
-  ok: boolean
-  errorBody?: Record<string, unknown>
-  errorStatus?: number
-  afterSuccessCallbacks: Array<{ guard: MutationGuard; metadata: Record<string, unknown> | null }>
-}> {
-  const legacyGuard = bridgeLegacyGuard(ctx.container)
-  if (!legacyGuard) {
-    return { ok: true, afterSuccessCallbacks: [] }
-  }
-
-  return runMutationGuards([legacyGuard], input, {
-    userFeatures: resolveUserFeatures(ctx.auth),
-  })
-}
-
-async function runGuardAfterSuccessCallbacks(
-  callbacks: Array<{ guard: MutationGuard; metadata: Record<string, unknown> | null }>,
-  input: {
-    tenantId: string
-    organizationId: string | null
-    userId: string
-    resourceKind: string
-    resourceId: string
-    operation: 'create' | 'update' | 'delete'
-    requestMethod: string
-    requestHeaders: Headers
-  },
-): Promise<void> {
-  for (const callback of callbacks) {
-    if (!callback.guard.afterSuccess) continue
-    await callback.guard.afterSuccess({
-      ...input,
-      metadata: callback.metadata ?? null,
-    })
-  }
-}
-
 async function resolveRequestContext(req: Request): Promise<RequestContext> {
   const container = await createRequestContainer()
   const auth = await getAuthFromRequest(req)
@@ -143,18 +91,23 @@ export async function POST(req: Request) {
     const payload = await req.json().catch(() => ({}))
     const scoped = withScopedPayload(payload ?? {}, ctx, translate)
     const input = quoteSendSchema.parse(scoped)
-    const guardResult = await runGuards(ctx, {
-      tenantId: ctx.auth?.tenantId ?? '',
-      organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
-      userId: ctx.auth?.sub ?? '',
-      resourceKind: 'sales.quote',
-      resourceId: input.quoteId,
-      operation: 'update',
-      requestMethod: req.method,
-      requestHeaders: req.headers,
+    const guardResult = await runRouteMutationGuards({
+      container: ctx.container,
+      req,
+      auth: {
+        tenantId: ctx.auth?.tenantId ?? '',
+        organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
+        userId: ctx.auth?.sub ?? '',
+      },
+      input: {
+        resourceKind: 'sales.quote',
+        resourceId: input.quoteId,
+        operation: 'update',
+        mutationPayload: input,
+      },
     })
     if (!guardResult.ok) {
-      return NextResponse.json(guardResult.errorBody ?? { error: 'Operation blocked by guard' }, { status: guardResult.errorStatus ?? 422 })
+      return guardResult.response
     }
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
@@ -232,18 +185,7 @@ export async function POST(req: Request) {
       organizationId: quote.organizationId,
     })
 
-    if (guardResult.afterSuccessCallbacks.length) {
-      await runGuardAfterSuccessCallbacks(guardResult.afterSuccessCallbacks, {
-        tenantId: ctx.auth?.tenantId ?? '',
-        organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
-        userId: ctx.auth?.sub ?? '',
-        resourceKind: 'sales.quote',
-        resourceId: input.quoteId,
-        operation: 'update',
-        requestMethod: req.method,
-        requestHeaders: req.headers,
-      })
-    }
+    await guardResult.runAfterSuccess()
 
     return NextResponse.json({ ok: true })
   } catch (err) {