@open-mercato/enterprise 0.8.1-develop.7296.1.2111d779db → 0.8.1-develop.7441.1.b42958b98c

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,6 +3,7 @@ import { z } from "zod";
3
3
  import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
4
4
  import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
5
5
  import { resolveOrganizationScopeForRequest } from "@open-mercato/core/modules/directory/utils/organizationScope";
6
+ import { resolveSingleOrganizationIdOrDeny } from "@open-mercato/core/modules/directory/utils/organizationScopeFilter";
6
7
  import { readJsonSafe } from "@open-mercato/shared/lib/http/readJsonSafe";
7
8
  import { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from "@open-mercato/shared/lib/crud/mutation-guard";
8
9
  import { isCrudHttpError } from "@open-mercato/shared/lib/crud/errors";
@@ -34,7 +35,7 @@ async function POST(req, ctx) {
34
35
  }
35
36
  const container = await createRequestContainer();
36
37
  const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req });
37
- const organizationId = scope?.selectedId ?? auth.orgId ?? null;
38
+ const organizationId = resolveSingleOrganizationIdOrDeny(scope, auth) ?? null;
38
39
  if (!organizationId) {
39
40
  return NextResponse.json(
40
41
  { error: "Select a single organization before starting a process." },
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../../../../src/modules/agent_orchestrator/api/processes/%5Bid%5D/executions/route.ts"],
4
- "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'\nimport type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { processExecutionStartSchema } from '../../../../data/validators'\nimport { ProcessDefinition } from '../../../../data/entities'\nimport { manualTrigger, parseProcessTriggers } from '../../../../lib/tasks/triggers'\nimport type {\n StartProcessExecutionInput,\n StartProcessExecutionResult,\n} from '../../../../commands/processes'\n\n/**\n * Start one business execution \u2014 always async (`202 { executionId }`).\n *\n * This is the external contract: a caller asks a PROCESS to run and gets back an\n * execution id to poll or subscribe to. It never exposes an agent, a runtime or a\n * workflow step, so the process can be re-implemented underneath without breaking\n * the integration.\n *\n * Callable by a human session or an ApiKey bearer whose role grants\n * `agent_orchestrator.processes.run`, and only when the definition DECLARES a\n * `{ kind: 'manual' }` trigger (403 otherwise): hand-starting is a declared\n * capability rather than an ambient one.\n *\n * `{ kind: 'manual', ref: <userId> }` records the INVOKER. It is provenance and\n * never an ACL identity \u2014 the run executes under the bound workflow definition's\n * own least-privilege principal, whoever started it.\n */\nexport const metadata = {\n POST: { requireAuth: true, requireFeatures: ['agent_orchestrator.processes.run'] },\n}\n\nconst errorSchema = z.object({ error: z.string() })\nconst acceptedSchema = z.object({ executionId: z.string().uuid() })\n\ntype RouteContext = { params: Promise<{ id: string }> }\n\nexport async function POST(req: Request, ctx: RouteContext) {\n const auth = await getAuthFromRequest(req)\n if (!auth) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n if (!auth.tenantId || !auth.sub) {\n return NextResponse.json({ error: 'Tenant context required' }, { status: 400 })\n }\n\n const { id } = await ctx.params\n if (!z.string().uuid().safeParse(id).success) {\n return NextResponse.json({ error: 'Process definition not found' }, { status: 404 })\n }\n\n const body = await readJsonSafe(req, {})\n const parsed = processExecutionStartSchema.safeParse(body)\n if (!parsed.success) {\n return NextResponse.json(\n { error: 'Validation failed', fieldErrors: parsed.error.flatten().fieldErrors },\n { status: 400 },\n )\n }\n\n const container = await createRequestContainer()\n\n // Fail-closed single-org attribution (same rule as the playground run route):\n // an execution must land in exactly one organization's ledger/caseload.\n const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n const organizationId = scope?.selectedId ?? auth.orgId ?? null\n if (!organizationId) {\n return NextResponse.json(\n { error: 'Select a single organization before starting a process.' },\n { status: 400 },\n )\n }\n\n // The declared manual trigger is resolved BEFORE the mutation guard so an\n // undeclared hand-start never reaches the command or an approval queue. The\n // command re-checks it \u2014 this is the surface that also enforces the trigger's\n // own `requireFeatures`, which only a request-scoped RBAC lookup can answer.\n const em = (container.resolve('em') as EntityManager).fork()\n const definition = await em.findOne(ProcessDefinition, {\n id,\n tenantId: auth.tenantId,\n organizationId,\n deletedAt: null,\n })\n if (!definition) return NextResponse.json({ error: 'Process definition not found' }, { status: 404 })\n const manual = manualTrigger(parseProcessTriggers(definition.triggers))\n if (!manual) {\n return NextResponse.json(\n { error: 'This process declares no manual trigger \u2014 add one to start it by hand.' },\n { status: 403 },\n )\n }\n if (manual.requireFeatures.length > 0) {\n const rbac = container.resolve('rbacService') as {\n userHasAllFeatures: (\n userId: string,\n features: string[],\n scope: { tenantId: string | null; organizationId: string | null },\n ) => Promise<boolean>\n }\n const allowed = await rbac.userHasAllFeatures(auth.sub, manual.requireFeatures, {\n tenantId: auth.tenantId,\n organizationId,\n })\n if (!allowed) {\n return NextResponse.json(\n { error: 'Missing the features this process requires to be started by hand.' },\n { status: 403 },\n )\n }\n }\n\n const guardResult = await validateCrudMutationGuard(container, {\n tenantId: auth.tenantId,\n organizationId,\n userId: auth.sub,\n resourceKind: 'agent_orchestrator.process_execution',\n resourceId: id,\n operation: 'custom',\n requestMethod: 'POST',\n requestHeaders: req.headers,\n })\n if (guardResult && !guardResult.ok) {\n return NextResponse.json(guardResult.body, { status: guardResult.status })\n }\n\n const commandBus = container.resolve('commandBus') as CommandBus\n const commandCtx: CommandRuntimeContext = {\n container,\n auth: { sub: auth.sub, tenantId: auth.tenantId, orgId: organizationId } as CommandRuntimeContext['auth'],\n organizationScope: null,\n selectedOrganizationId: organizationId,\n organizationIds: [organizationId],\n request: req,\n }\n\n // Both a human session and an ApiKey bearer are MANUAL entry \u2014 the difference\n // is which principal id the provenance ref carries.\n const triggeredBy = { kind: 'manual' as const, ref: auth.sub }\n\n let result: StartProcessExecutionResult\n try {\n const executed = await commandBus.execute<StartProcessExecutionInput, StartProcessExecutionResult>(\n 'agent_orchestrator.processes.startExecution',\n {\n input: {\n tenantId: auth.tenantId,\n organizationId,\n processDefinitionId: id,\n input: parsed.data.input,\n idempotencyKey: parsed.data.idempotencyKey ?? null,\n sourceEntityType: parsed.data.sourceEntityType ?? null,\n sourceEntityId: parsed.data.sourceEntityId ?? null,\n triggeredBy,\n },\n ctx: commandCtx,\n },\n )\n result = executed.result\n } catch (err) {\n if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })\n throw err\n }\n\n if (guardResult?.shouldRunAfterSuccess) {\n await runCrudMutationGuardAfterSuccess(container, {\n tenantId: auth.tenantId,\n organizationId,\n userId: auth.sub,\n resourceKind: 'agent_orchestrator.process_execution',\n resourceId: id,\n operation: 'custom',\n requestMethod: 'POST',\n requestHeaders: req.headers,\n metadata: guardResult.metadata,\n })\n }\n\n return NextResponse.json({ executionId: result.executionId }, { status: 202 })\n}\n\nexport const openApi: OpenApiRouteDoc = {\n tag: 'Agent Orchestrator',\n summary: 'Start a business execution',\n methods: {\n POST: {\n summary: 'Start one execution of this process (always async)',\n description:\n 'Requires the definition to declare a { kind: \"manual\" } trigger (403 otherwise) plus any features that trigger names. Validates input against the definition inputSchema when set, dedupes on idempotencyKey so one key can never produce two executions, and starts the bound workflow. Returns 202 with the executionId immediately; observe completion via the agent_orchestrator.process.execution.* events or GET /executions/:id. Gated by agent_orchestrator.processes.run (session or API key).',\n responses: [{ status: 202, description: 'Execution accepted', schema: acceptedSchema }],\n errors: [\n { status: 400, description: 'Validation failed (body or inputSchema)', schema: errorSchema },\n { status: 401, description: 'Unauthorized', schema: errorSchema },\n {\n status: 403,\n description:\n 'Missing agent_orchestrator.processes.run, no declared manual trigger, or missing the trigger\\'s requireFeatures',\n schema: errorSchema,\n },\n { status: 404, description: 'Unknown process definition id (or cross-tenant)', schema: errorSchema },\n { status: 409, description: 'Process definition disabled', schema: errorSchema },\n ],\n },\n },\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { resolveSingleOrganizationIdOrDeny } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'\nimport type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { processExecutionStartSchema } from '../../../../data/validators'\nimport { ProcessDefinition } from '../../../../data/entities'\nimport { manualTrigger, parseProcessTriggers } from '../../../../lib/tasks/triggers'\nimport type {\n StartProcessExecutionInput,\n StartProcessExecutionResult,\n} from '../../../../commands/processes'\n\n/**\n * Start one business execution \u2014 always async (`202 { executionId }`).\n *\n * This is the external contract: a caller asks a PROCESS to run and gets back an\n * execution id to poll or subscribe to. It never exposes an agent, a runtime or a\n * workflow step, so the process can be re-implemented underneath without breaking\n * the integration.\n *\n * Callable by a human session or an ApiKey bearer whose role grants\n * `agent_orchestrator.processes.run`, and only when the definition DECLARES a\n * `{ kind: 'manual' }` trigger (403 otherwise): hand-starting is a declared\n * capability rather than an ambient one.\n *\n * `{ kind: 'manual', ref: <userId> }` records the INVOKER. It is provenance and\n * never an ACL identity \u2014 the run executes under the bound workflow definition's\n * own least-privilege principal, whoever started it.\n */\nexport const metadata = {\n POST: { requireAuth: true, requireFeatures: ['agent_orchestrator.processes.run'] },\n}\n\nconst errorSchema = z.object({ error: z.string() })\nconst acceptedSchema = z.object({ executionId: z.string().uuid() })\n\ntype RouteContext = { params: Promise<{ id: string }> }\n\nexport async function POST(req: Request, ctx: RouteContext) {\n const auth = await getAuthFromRequest(req)\n if (!auth) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n if (!auth.tenantId || !auth.sub) {\n return NextResponse.json({ error: 'Tenant context required' }, { status: 400 })\n }\n\n const { id } = await ctx.params\n if (!z.string().uuid().safeParse(id).success) {\n return NextResponse.json({ error: 'Process definition not found' }, { status: 404 })\n }\n\n const body = await readJsonSafe(req, {})\n const parsed = processExecutionStartSchema.safeParse(body)\n if (!parsed.success) {\n return NextResponse.json(\n { error: 'Validation failed', fieldErrors: parsed.error.flatten().fieldErrors },\n { status: 400 },\n )\n }\n\n const container = await createRequestContainer()\n\n // Fail-closed single-org attribution (same rule as the playground run route):\n // an execution must land in exactly one organization's ledger/caseload.\n const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n const organizationId = resolveSingleOrganizationIdOrDeny(scope, auth) ?? null\n if (!organizationId) {\n return NextResponse.json(\n { error: 'Select a single organization before starting a process.' },\n { status: 400 },\n )\n }\n\n // The declared manual trigger is resolved BEFORE the mutation guard so an\n // undeclared hand-start never reaches the command or an approval queue. The\n // command re-checks it \u2014 this is the surface that also enforces the trigger's\n // own `requireFeatures`, which only a request-scoped RBAC lookup can answer.\n const em = (container.resolve('em') as EntityManager).fork()\n const definition = await em.findOne(ProcessDefinition, {\n id,\n tenantId: auth.tenantId,\n organizationId,\n deletedAt: null,\n })\n if (!definition) return NextResponse.json({ error: 'Process definition not found' }, { status: 404 })\n const manual = manualTrigger(parseProcessTriggers(definition.triggers))\n if (!manual) {\n return NextResponse.json(\n { error: 'This process declares no manual trigger \u2014 add one to start it by hand.' },\n { status: 403 },\n )\n }\n if (manual.requireFeatures.length > 0) {\n const rbac = container.resolve('rbacService') as {\n userHasAllFeatures: (\n userId: string,\n features: string[],\n scope: { tenantId: string | null; organizationId: string | null },\n ) => Promise<boolean>\n }\n const allowed = await rbac.userHasAllFeatures(auth.sub, manual.requireFeatures, {\n tenantId: auth.tenantId,\n organizationId,\n })\n if (!allowed) {\n return NextResponse.json(\n { error: 'Missing the features this process requires to be started by hand.' },\n { status: 403 },\n )\n }\n }\n\n const guardResult = await validateCrudMutationGuard(container, {\n tenantId: auth.tenantId,\n organizationId,\n userId: auth.sub,\n resourceKind: 'agent_orchestrator.process_execution',\n resourceId: id,\n operation: 'custom',\n requestMethod: 'POST',\n requestHeaders: req.headers,\n })\n if (guardResult && !guardResult.ok) {\n return NextResponse.json(guardResult.body, { status: guardResult.status })\n }\n\n const commandBus = container.resolve('commandBus') as CommandBus\n const commandCtx: CommandRuntimeContext = {\n container,\n auth: { sub: auth.sub, tenantId: auth.tenantId, orgId: organizationId } as CommandRuntimeContext['auth'],\n organizationScope: null,\n selectedOrganizationId: organizationId,\n organizationIds: [organizationId],\n request: req,\n }\n\n // Both a human session and an ApiKey bearer are MANUAL entry \u2014 the difference\n // is which principal id the provenance ref carries.\n const triggeredBy = { kind: 'manual' as const, ref: auth.sub }\n\n let result: StartProcessExecutionResult\n try {\n const executed = await commandBus.execute<StartProcessExecutionInput, StartProcessExecutionResult>(\n 'agent_orchestrator.processes.startExecution',\n {\n input: {\n tenantId: auth.tenantId,\n organizationId,\n processDefinitionId: id,\n input: parsed.data.input,\n idempotencyKey: parsed.data.idempotencyKey ?? null,\n sourceEntityType: parsed.data.sourceEntityType ?? null,\n sourceEntityId: parsed.data.sourceEntityId ?? null,\n triggeredBy,\n },\n ctx: commandCtx,\n },\n )\n result = executed.result\n } catch (err) {\n if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })\n throw err\n }\n\n if (guardResult?.shouldRunAfterSuccess) {\n await runCrudMutationGuardAfterSuccess(container, {\n tenantId: auth.tenantId,\n organizationId,\n userId: auth.sub,\n resourceKind: 'agent_orchestrator.process_execution',\n resourceId: id,\n operation: 'custom',\n requestMethod: 'POST',\n requestHeaders: req.headers,\n metadata: guardResult.metadata,\n })\n }\n\n return NextResponse.json({ executionId: result.executionId }, { status: 202 })\n}\n\nexport const openApi: OpenApiRouteDoc = {\n tag: 'Agent Orchestrator',\n summary: 'Start a business execution',\n methods: {\n POST: {\n summary: 'Start one execution of this process (always async)',\n description:\n 'Requires the definition to declare a { kind: \"manual\" } trigger (403 otherwise) plus any features that trigger names. Validates input against the definition inputSchema when set, dedupes on idempotencyKey so one key can never produce two executions, and starts the bound workflow. Returns 202 with the executionId immediately; observe completion via the agent_orchestrator.process.execution.* events or GET /executions/:id. Gated by agent_orchestrator.processes.run (session or API key).',\n responses: [{ status: 202, description: 'Execution accepted', schema: acceptedSchema }],\n errors: [\n { status: 400, description: 'Validation failed (body or inputSchema)', schema: errorSchema },\n { status: 401, description: 'Unauthorized', schema: errorSchema },\n {\n status: 403,\n description:\n 'Missing agent_orchestrator.processes.run, no declared manual trigger, or missing the trigger\\'s requireFeatures',\n schema: errorSchema,\n },\n { status: 404, description: 'Unknown process definition id (or cross-tenant)', schema: errorSchema },\n { status: 409, description: 'Process definition disabled', schema: errorSchema },\n ],\n },\n },\n}\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -1,5 +1,6 @@
1
1
  import { findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
2
2
  import { computeEmailHash } from "@open-mercato/core/modules/auth/lib/emailHash";
3
+ import { lockAuthorizationState } from "@open-mercato/core/modules/auth/lib/authorizationStateLocks";
3
4
  import {
4
5
  provisionAgentPrincipalSchema
5
6
  } from "../../data/validators.js";
@@ -38,34 +39,6 @@ async function provisionAgentPrincipal(container, scope, input) {
38
39
  tem.persist(role);
39
40
  await tem.flush();
40
41
  }
41
- const existingAcl = await findOneWithDecryption(
42
- tem,
43
- auth.RoleAcl,
44
- { role, tenantId },
45
- {},
46
- { tenantId, organizationId: null }
47
- );
48
- if (!existingAcl) {
49
- tem.persist(
50
- tem.create(auth.RoleAcl, {
51
- role,
52
- tenantId,
53
- featuresJson: parsed.roleFeatures,
54
- isSuperAdmin: false,
55
- organizationsJson: [organizationId],
56
- createdAt: /* @__PURE__ */ new Date()
57
- })
58
- );
59
- await tem.flush();
60
- } else {
61
- const current = Array.isArray(existingAcl.featuresJson) ? existingAcl.featuresJson : [];
62
- const merged = Array.from(/* @__PURE__ */ new Set([...current, ...parsed.roleFeatures]));
63
- if (merged.length !== current.length) {
64
- existingAcl.featuresJson = merged;
65
- tem.persist(existingAcl);
66
- await tem.flush();
67
- }
68
- }
69
42
  const agentEmail = buildAgentUserEmail(parsed.agentDefinitionId, organizationId);
70
43
  let user = existingPrincipal ? await findOneWithDecryption(
71
44
  tem,
@@ -99,6 +72,38 @@ async function provisionAgentPrincipal(container, scope, input) {
99
72
  } else if (user.kind !== "agent") {
100
73
  throw new Error("[internal] resolved a non-agent User for an agent principal");
101
74
  }
75
+ await lockAuthorizationState(tem, {
76
+ userIds: [String(user.id)],
77
+ roleIds: [String(role.id)]
78
+ });
79
+ const existingAcl = await findOneWithDecryption(
80
+ tem,
81
+ auth.RoleAcl,
82
+ { role, tenantId },
83
+ {},
84
+ { tenantId, organizationId: null }
85
+ );
86
+ if (!existingAcl) {
87
+ tem.persist(
88
+ tem.create(auth.RoleAcl, {
89
+ role,
90
+ tenantId,
91
+ featuresJson: parsed.roleFeatures,
92
+ isSuperAdmin: false,
93
+ organizationsJson: [organizationId],
94
+ createdAt: /* @__PURE__ */ new Date()
95
+ })
96
+ );
97
+ await tem.flush();
98
+ } else {
99
+ const current = Array.isArray(existingAcl.featuresJson) ? existingAcl.featuresJson : [];
100
+ const merged = Array.from(/* @__PURE__ */ new Set([...current, ...parsed.roleFeatures]));
101
+ if (merged.length !== current.length) {
102
+ existingAcl.featuresJson = merged;
103
+ tem.persist(existingAcl);
104
+ await tem.flush();
105
+ }
106
+ }
102
107
  const existingLink = await findOneWithDecryption(
103
108
  tem,
104
109
  auth.UserRole,
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../../src/modules/agent_orchestrator/lib/identity/agentPrincipalService.ts"],
4
- "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { AwilixContainer } from 'awilix'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { computeEmailHash } from '@open-mercato/core/modules/auth/lib/emailHash'\nimport {\n provisionAgentPrincipalSchema,\n type ProvisionAgentPrincipalInput,\n} from '../../data/validators'\nimport { AgentPrincipal } from '../../data/entities'\n\nexport type AgentPrincipalScope = { tenantId: string; organizationId: string }\n\n/**\n * The resolved identity of a provisioned agent \u2014 the concrete `auth.User` id used\n * as the actor on every write the agent makes, plus the scoped role and the\n * principal row. Phase 2 (`runAs` / on-behalf-of) reads `userId` as the\n * `actorUserId` it stamps on each `ActionLog`.\n */\nexport type ResolvedAgentPrincipal = {\n principal: AgentPrincipal\n userId: string\n roleId: string\n /** True iff the agent `User` holds NO interactive credential (passwordHash null + not confirmed). */\n interactiveLoginDisabled: boolean\n}\n\n/**\n * Deterministic, internal-only email for an agent `User`. Not a deliverable\n * mailbox \u2014 agents never receive mail and never log in interactively. Keyed by\n * the agent definition id + organization so it is stable across re-provisioning\n * (idempotency) and unique per org. The `.agent.internal` TLD is reserved/non-\n * routable so it can never collide with a real human's address.\n */\nfunction buildAgentUserEmail(agentDefinitionId: string, organizationId: string): string {\n const slug = agentDefinitionId.toLowerCase().replace(/[^a-z0-9._-]+/g, '-')\n return `agent+${slug}+${organizationId}@agent.internal`\n}\n\n/** Deterministic, tenant-scoped role name for an agent's least-privilege role. */\nfunction buildAgentRoleName(agentDefinitionId: string): string {\n return `agent:${agentDefinitionId}`\n}\n\nfunction resolveEm(container: AwilixContainer): EntityManager {\n return (container.resolve('em') as EntityManager).fork()\n}\n\n/**\n * Provisions \u2014 idempotently \u2014 an `AgentPrincipal`: a non-interactive `auth.User`\n * (`kind='agent'`) and a scoped, least-privilege `auth.Role`, so the agent is a\n * first-class principal attributed identically to a human on every write (agent\n * identity & on-behalf-of spec, Wave 4 Phase 1).\n *\n * Internal-agent attribution: the returned `userId` is the concrete actor id the\n * Phase-2 `runAs` wrapper stamps on each `ActionLog`.\n *\n * Non-interactive enforcement: the agent `User` is created with\n * `passwordHash = null` and `isConfirmed = false`, so the interactive\n * password/SSO login flow has no credential to verify against \u2014 it is a property\n * of the principal, not a special-case block. External token flows are Phase 3\n * (`credentialMode='oauth_client'`) and are NOT provisioned here.\n *\n * Idempotency: keyed on `(organizationId, agentDefinitionId)` over live rows\n * (partial unique index). A second call resolves and returns the same principal,\n * creating no duplicate `User`/`Role`/`AgentPrincipal` rows. Tenant-scoped: every\n * lookup and write pins both `tenantId` and `organizationId`.\n */\nexport async function provisionAgentPrincipal(\n container: AwilixContainer,\n scope: AgentPrincipalScope,\n input: ProvisionAgentPrincipalInput,\n): Promise<ResolvedAgentPrincipal> {\n const parsed = provisionAgentPrincipalSchema.parse(input)\n const em = resolveEm(container)\n const { tenantId, organizationId } = scope\n\n const auth = (await import(\n '@open-mercato/core/modules/auth/data/entities'\n )) as typeof import('@open-mercato/core/modules/auth/data/entities')\n\n return em.transactional(async (tem) => {\n const existingPrincipal = await tem.findOne(AgentPrincipal, {\n organizationId,\n agentDefinitionId: parsed.agentDefinitionId,\n deletedAt: null,\n })\n\n // \u2500\u2500 Scoped, least-privilege role (find-or-create, idempotent) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n const roleName = buildAgentRoleName(parsed.agentDefinitionId)\n let role = await findOneWithDecryption(\n tem,\n auth.Role,\n { name: roleName, tenantId },\n {},\n { tenantId, organizationId: null },\n )\n if (!role) {\n role = tem.create(auth.Role, { name: roleName, tenantId, minActiveHolders: 0, createdAt: new Date() })\n tem.persist(role)\n await tem.flush()\n }\n\n // The scoped role's ACL grants the agent's least-privilege features (merged\n // idempotently on re-provision), never super-admin.\n const existingAcl = await findOneWithDecryption(\n tem,\n auth.RoleAcl,\n { role, tenantId },\n {},\n { tenantId, organizationId: null },\n )\n if (!existingAcl) {\n tem.persist(\n tem.create(auth.RoleAcl, {\n role,\n tenantId,\n featuresJson: parsed.roleFeatures,\n isSuperAdmin: false,\n organizationsJson: [organizationId],\n createdAt: new Date(),\n }),\n )\n await tem.flush()\n } else {\n const current = Array.isArray(existingAcl.featuresJson) ? existingAcl.featuresJson : []\n const merged = Array.from(new Set([...current, ...parsed.roleFeatures]))\n if (merged.length !== current.length) {\n existingAcl.featuresJson = merged\n tem.persist(existingAcl)\n await tem.flush()\n }\n }\n\n // \u2500\u2500 Non-interactive agent User (find-or-create, idempotent) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n const agentEmail = buildAgentUserEmail(parsed.agentDefinitionId, organizationId)\n let user = existingPrincipal\n ? await findOneWithDecryption(\n tem,\n auth.User,\n { id: existingPrincipal.userId },\n {},\n { tenantId, organizationId },\n )\n : await findOneWithDecryption(\n tem,\n auth.User,\n { emailHash: computeEmailHash(agentEmail), tenantId, deletedAt: null },\n {},\n { tenantId, organizationId },\n )\n\n if (!user) {\n user = tem.create(auth.User, {\n email: agentEmail,\n emailHash: computeEmailHash(agentEmail),\n // No interactive credential: a null passwordHash + unconfirmed account\n // means the password/SSO login flow has nothing to authenticate against.\n passwordHash: null,\n isConfirmed: false,\n kind: 'agent',\n name: parsed.displayName ?? parsed.agentDefinitionId,\n tenantId,\n organizationId,\n createdAt: new Date(),\n })\n tem.persist(user)\n await tem.flush()\n } else if (user.kind !== 'agent') {\n // Defensive: an existing row resolved by the deterministic agent email must\n // be an agent principal. Never silently repurpose a human/service row.\n throw new Error('[internal] resolved a non-agent User for an agent principal')\n }\n\n // Link the agent User to its scoped role (idempotent).\n const existingLink = await findOneWithDecryption(\n tem,\n auth.UserRole,\n { user, role },\n {},\n { tenantId, organizationId: null },\n )\n if (!existingLink) {\n tem.persist(tem.create(auth.UserRole, { user, role, createdAt: new Date() }))\n await tem.flush()\n }\n\n // \u2500\u2500 AgentPrincipal row (find-or-create, idempotent) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n let principal = existingPrincipal\n if (!principal) {\n principal = tem.create(AgentPrincipal, {\n tenantId,\n organizationId,\n userId: user.id,\n agentDefinitionId: parsed.agentDefinitionId,\n roleId: role.id,\n credentialMode: parsed.credentialMode,\n enabled: true,\n createdAt: new Date(),\n updatedAt: new Date(),\n })\n tem.persist(principal)\n await tem.flush()\n }\n\n return {\n principal,\n userId: principal.userId,\n roleId: principal.roleId,\n interactiveLoginDisabled: !user.passwordHash && user.isConfirmed === false,\n }\n })\n}\n\n/**\n * Resolves the agent principal for `(organizationId, agentDefinitionId)` without\n * provisioning. Returns null when the agent has not been provisioned yet (or was\n * soft-deleted). Org-scoped \u2014 never returns another tenant's row.\n */\nexport async function resolveAgentPrincipal(\n container: AwilixContainer,\n scope: AgentPrincipalScope,\n agentDefinitionId: string,\n): Promise<AgentPrincipal | null> {\n const em = resolveEm(container)\n return em.findOne(AgentPrincipal, {\n organizationId: scope.organizationId,\n agentDefinitionId,\n deletedAt: null,\n })\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { AwilixContainer } from 'awilix'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { computeEmailHash } from '@open-mercato/core/modules/auth/lib/emailHash'\nimport { lockAuthorizationState } from '@open-mercato/core/modules/auth/lib/authorizationStateLocks'\nimport {\n provisionAgentPrincipalSchema,\n type ProvisionAgentPrincipalInput,\n} from '../../data/validators'\nimport { AgentPrincipal } from '../../data/entities'\n\nexport type AgentPrincipalScope = { tenantId: string; organizationId: string }\n\n/**\n * The resolved identity of a provisioned agent \u2014 the concrete `auth.User` id used\n * as the actor on every write the agent makes, plus the scoped role and the\n * principal row. Phase 2 (`runAs` / on-behalf-of) reads `userId` as the\n * `actorUserId` it stamps on each `ActionLog`.\n */\nexport type ResolvedAgentPrincipal = {\n principal: AgentPrincipal\n userId: string\n roleId: string\n /** True iff the agent `User` holds NO interactive credential (passwordHash null + not confirmed). */\n interactiveLoginDisabled: boolean\n}\n\n/**\n * Deterministic, internal-only email for an agent `User`. Not a deliverable\n * mailbox \u2014 agents never receive mail and never log in interactively. Keyed by\n * the agent definition id + organization so it is stable across re-provisioning\n * (idempotency) and unique per org. The `.agent.internal` TLD is reserved/non-\n * routable so it can never collide with a real human's address.\n */\nfunction buildAgentUserEmail(agentDefinitionId: string, organizationId: string): string {\n const slug = agentDefinitionId.toLowerCase().replace(/[^a-z0-9._-]+/g, '-')\n return `agent+${slug}+${organizationId}@agent.internal`\n}\n\n/** Deterministic, tenant-scoped role name for an agent's least-privilege role. */\nfunction buildAgentRoleName(agentDefinitionId: string): string {\n return `agent:${agentDefinitionId}`\n}\n\nfunction resolveEm(container: AwilixContainer): EntityManager {\n return (container.resolve('em') as EntityManager).fork()\n}\n\n/**\n * Provisions \u2014 idempotently \u2014 an `AgentPrincipal`: a non-interactive `auth.User`\n * (`kind='agent'`) and a scoped, least-privilege `auth.Role`, so the agent is a\n * first-class principal attributed identically to a human on every write (agent\n * identity & on-behalf-of spec, Wave 4 Phase 1).\n *\n * Internal-agent attribution: the returned `userId` is the concrete actor id the\n * Phase-2 `runAs` wrapper stamps on each `ActionLog`.\n *\n * Non-interactive enforcement: the agent `User` is created with\n * `passwordHash = null` and `isConfirmed = false`, so the interactive\n * password/SSO login flow has no credential to verify against \u2014 it is a property\n * of the principal, not a special-case block. External token flows are Phase 3\n * (`credentialMode='oauth_client'`) and are NOT provisioned here.\n *\n * Idempotency: keyed on `(organizationId, agentDefinitionId)` over live rows\n * (partial unique index). A second call resolves and returns the same principal,\n * creating no duplicate `User`/`Role`/`AgentPrincipal` rows. Tenant-scoped: every\n * lookup and write pins both `tenantId` and `organizationId`.\n */\nexport async function provisionAgentPrincipal(\n container: AwilixContainer,\n scope: AgentPrincipalScope,\n input: ProvisionAgentPrincipalInput,\n): Promise<ResolvedAgentPrincipal> {\n const parsed = provisionAgentPrincipalSchema.parse(input)\n const em = resolveEm(container)\n const { tenantId, organizationId } = scope\n\n const auth = (await import(\n '@open-mercato/core/modules/auth/data/entities'\n )) as typeof import('@open-mercato/core/modules/auth/data/entities')\n\n return em.transactional(async (tem) => {\n const existingPrincipal = await tem.findOne(AgentPrincipal, {\n organizationId,\n agentDefinitionId: parsed.agentDefinitionId,\n deletedAt: null,\n })\n\n // \u2500\u2500 Scoped, least-privilege role (find-or-create, idempotent) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n const roleName = buildAgentRoleName(parsed.agentDefinitionId)\n let role = await findOneWithDecryption(\n tem,\n auth.Role,\n { name: roleName, tenantId },\n {},\n { tenantId, organizationId: null },\n )\n if (!role) {\n role = tem.create(auth.Role, { name: roleName, tenantId, minActiveHolders: 0, createdAt: new Date() })\n tem.persist(role)\n await tem.flush()\n }\n\n // \u2500\u2500 Non-interactive agent User (find-or-create, idempotent) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n const agentEmail = buildAgentUserEmail(parsed.agentDefinitionId, organizationId)\n let user = existingPrincipal\n ? await findOneWithDecryption(\n tem,\n auth.User,\n { id: existingPrincipal.userId },\n {},\n { tenantId, organizationId },\n )\n : await findOneWithDecryption(\n tem,\n auth.User,\n { emailHash: computeEmailHash(agentEmail), tenantId, deletedAt: null },\n {},\n { tenantId, organizationId },\n )\n\n if (!user) {\n user = tem.create(auth.User, {\n email: agentEmail,\n emailHash: computeEmailHash(agentEmail),\n // No interactive credential: a null passwordHash + unconfirmed account\n // means the password/SSO login flow has nothing to authenticate against.\n passwordHash: null,\n isConfirmed: false,\n kind: 'agent',\n name: parsed.displayName ?? parsed.agentDefinitionId,\n tenantId,\n organizationId,\n createdAt: new Date(),\n })\n tem.persist(user)\n await tem.flush()\n } else if (user.kind !== 'agent') {\n // Defensive: an existing row resolved by the deterministic agent email must\n // be an agent principal. Never silently repurpose a human/service row.\n throw new Error('[internal] resolved a non-agent User for an agent principal')\n }\n\n await lockAuthorizationState(tem, {\n userIds: [String(user.id)],\n roleIds: [String(role.id)],\n })\n\n // The scoped role's ACL grants the agent's least-privilege features (merged\n // idempotently on re-provision), never super-admin.\n const existingAcl = await findOneWithDecryption(\n tem,\n auth.RoleAcl,\n { role, tenantId },\n {},\n { tenantId, organizationId: null },\n )\n if (!existingAcl) {\n tem.persist(\n tem.create(auth.RoleAcl, {\n role,\n tenantId,\n featuresJson: parsed.roleFeatures,\n isSuperAdmin: false,\n organizationsJson: [organizationId],\n createdAt: new Date(),\n }),\n )\n await tem.flush()\n } else {\n const current = Array.isArray(existingAcl.featuresJson) ? existingAcl.featuresJson : []\n const merged = Array.from(new Set([...current, ...parsed.roleFeatures]))\n if (merged.length !== current.length) {\n existingAcl.featuresJson = merged\n tem.persist(existingAcl)\n await tem.flush()\n }\n }\n\n // Link the agent User to its scoped role (idempotent).\n const existingLink = await findOneWithDecryption(\n tem,\n auth.UserRole,\n { user, role },\n {},\n { tenantId, organizationId: null },\n )\n if (!existingLink) {\n tem.persist(tem.create(auth.UserRole, { user, role, createdAt: new Date() }))\n await tem.flush()\n }\n\n // \u2500\u2500 AgentPrincipal row (find-or-create, idempotent) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n let principal = existingPrincipal\n if (!principal) {\n principal = tem.create(AgentPrincipal, {\n tenantId,\n organizationId,\n userId: user.id,\n agentDefinitionId: parsed.agentDefinitionId,\n roleId: role.id,\n credentialMode: parsed.credentialMode,\n enabled: true,\n createdAt: new Date(),\n updatedAt: new Date(),\n })\n tem.persist(principal)\n await tem.flush()\n }\n\n return {\n principal,\n userId: principal.userId,\n roleId: principal.roleId,\n interactiveLoginDisabled: !user.passwordHash && user.isConfirmed === false,\n }\n })\n}\n\n/**\n * Resolves the agent principal for `(organizationId, agentDefinitionId)` without\n * provisioning. Returns null when the agent has not been provisioned yet (or was\n * soft-deleted). Org-scoped \u2014 never returns another tenant's row.\n */\nexport async function resolveAgentPrincipal(\n container: AwilixContainer,\n scope: AgentPrincipalScope,\n agentDefinitionId: string,\n): Promise<AgentPrincipal | null> {\n const em = resolveEm(container)\n return em.findOne(AgentPrincipal, {\n organizationId: scope.organizationId,\n agentDefinitionId,\n deletedAt: null,\n })\n}\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -1,4 +1,4 @@
1
- var _a, _b;
1
+ var _a, _b, _c, _d;
2
2
  const EMAIL_NOT_VERIFIED_ERROR_MARKER = /* @__PURE__ */ Symbol.for("@open-mercato/sso/EmailNotVerifiedError");
3
3
  class EmailNotVerifiedError extends (_b = Error, _a = EMAIL_NOT_VERIFIED_ERROR_MARKER, _b) {
4
4
  constructor(message, options) {
@@ -10,12 +10,26 @@ class EmailNotVerifiedError extends (_b = Error, _a = EMAIL_NOT_VERIFIED_ERROR_M
10
10
  function isEmailNotVerifiedError(err) {
11
11
  return !!err && typeof err === "object" && err[EMAIL_NOT_VERIFIED_ERROR_MARKER] === true;
12
12
  }
13
+ const SSO_ROLES_REVOKED_ERROR_MARKER = /* @__PURE__ */ Symbol.for("@open-mercato/sso/SsoRolesRevokedError");
14
+ class SsoRolesRevokedError extends (_d = Error, _c = SSO_ROLES_REVOKED_ERROR_MARKER, _d) {
15
+ constructor(userId, message) {
16
+ super(message);
17
+ this.userId = userId;
18
+ this[_c] = true;
19
+ this.name = "SsoRolesRevokedError";
20
+ }
21
+ }
22
+ function isSsoRolesRevokedError(err) {
23
+ return !!err && typeof err === "object" && err[SSO_ROLES_REVOKED_ERROR_MARKER] === true;
24
+ }
13
25
  function resolveSsoCallbackErrorCode(err) {
14
26
  return isEmailNotVerifiedError(err) ? "sso_email_not_verified" : "sso_failed";
15
27
  }
16
28
  export {
17
29
  EmailNotVerifiedError,
30
+ SsoRolesRevokedError,
18
31
  isEmailNotVerifiedError,
32
+ isSsoRolesRevokedError,
19
33
  resolveSsoCallbackErrorCode
20
34
  };
21
35
  //# sourceMappingURL=errors.js.map
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/modules/sso/lib/errors.ts"],
4
- "sourcesContent": ["// Use Symbol.for so the marker survives module duplication across bundle\n// boundaries: the OIDC callback route and the account-linking service can be\n// bundled into separate chunks where `instanceof` silently returns false\n// (same rationale as isCrudHttpError in @open-mercato/shared).\nconst EMAIL_NOT_VERIFIED_ERROR_MARKER = Symbol.for('@open-mercato/sso/EmailNotVerifiedError')\n\nexport class EmailNotVerifiedError extends Error {\n readonly [EMAIL_NOT_VERIFIED_ERROR_MARKER] = true\n\n constructor(message: string, options?: { cause?: unknown }) {\n super(message, options)\n this.name = 'EmailNotVerifiedError'\n }\n}\n\n/**\n * Type-safe check that works across module/bundle boundaries. Prefer this over\n * `instanceof EmailNotVerifiedError` because the SSO callback route may be\n * bundled separately from the service that throws the error.\n */\nexport function isEmailNotVerifiedError(err: unknown): err is EmailNotVerifiedError {\n return !!err && typeof err === 'object' && (err as Record<symbol, unknown>)[EMAIL_NOT_VERIFIED_ERROR_MARKER] === true\n}\n\nexport type SsoCallbackErrorCode = 'sso_email_not_verified' | 'sso_failed'\n\n/**\n * Maps an error thrown during the OIDC callback to the login-page UX error code.\n * Keyed off the error type rather than a substring of the human-readable message,\n * which previously drifted out of sync and left `sso_email_not_verified`\n * unreachable (#2741).\n */\nexport function resolveSsoCallbackErrorCode(err: unknown): SsoCallbackErrorCode {\n return isEmailNotVerifiedError(err) ? 'sso_email_not_verified' : 'sso_failed'\n}\n"],
5
- "mappings": "AAAA;AAIA,MAAM,kCAAkC,uBAAO,IAAI,yCAAyC;AAErF,MAAM,+BAA8B,YAC/B,sCAD+B,IAAM;AAAA,EAG/C,YAAY,SAAiB,SAA+B;AAC1D,UAAM,SAAS,OAAO;AAHxB,SAAU,MAAmC;AAI3C,SAAK,OAAO;AAAA,EACd;AACF;AAOO,SAAS,wBAAwB,KAA4C;AAClF,SAAO,CAAC,CAAC,OAAO,OAAO,QAAQ,YAAa,IAAgC,+BAA+B,MAAM;AACnH;AAUO,SAAS,4BAA4B,KAAoC;AAC9E,SAAO,wBAAwB,GAAG,IAAI,2BAA2B;AACnE;",
4
+ "sourcesContent": ["// Use Symbol.for so the marker survives module duplication across bundle\n// boundaries: the OIDC callback route and the account-linking service can be\n// bundled into separate chunks where `instanceof` silently returns false\n// (same rationale as isCrudHttpError in @open-mercato/shared).\nconst EMAIL_NOT_VERIFIED_ERROR_MARKER = Symbol.for('@open-mercato/sso/EmailNotVerifiedError')\n\nexport class EmailNotVerifiedError extends Error {\n readonly [EMAIL_NOT_VERIFIED_ERROR_MARKER] = true\n\n constructor(message: string, options?: { cause?: unknown }) {\n super(message, options)\n this.name = 'EmailNotVerifiedError'\n }\n}\n\n/**\n * Type-safe check that works across module/bundle boundaries. Prefer this over\n * `instanceof EmailNotVerifiedError` because the SSO callback route may be\n * bundled separately from the service that throws the error.\n */\nexport function isEmailNotVerifiedError(err: unknown): err is EmailNotVerifiedError {\n return !!err && typeof err === 'object' && (err as Record<symbol, unknown>)[EMAIL_NOT_VERIFIED_ERROR_MARKER] === true\n}\n\nconst SSO_ROLES_REVOKED_ERROR_MARKER = Symbol.for('@open-mercato/sso/SsoRolesRevokedError')\n\n/**\n * Login denial raised after the IdP resolved no mapped roles. The revoked SSO\n * grants are already committed; `userId` lets the caller drop cached RBAC for\n * sessions that still hold the revoked roles.\n */\nexport class SsoRolesRevokedError extends Error {\n readonly [SSO_ROLES_REVOKED_ERROR_MARKER] = true\n\n constructor(readonly userId: string, message: string) {\n super(message)\n this.name = 'SsoRolesRevokedError'\n }\n}\n\nexport function isSsoRolesRevokedError(err: unknown): err is SsoRolesRevokedError {\n return !!err && typeof err === 'object' && (err as Record<symbol, unknown>)[SSO_ROLES_REVOKED_ERROR_MARKER] === true\n}\n\nexport type SsoCallbackErrorCode = 'sso_email_not_verified' | 'sso_failed'\n\n/**\n * Maps an error thrown during the OIDC callback to the login-page UX error code.\n * Keyed off the error type rather than a substring of the human-readable message,\n * which previously drifted out of sync and left `sso_email_not_verified`\n * unreachable (#2741).\n */\nexport function resolveSsoCallbackErrorCode(err: unknown): SsoCallbackErrorCode {\n return isEmailNotVerifiedError(err) ? 'sso_email_not_verified' : 'sso_failed'\n}\n"],
5
+ "mappings": "AAAA;AAIA,MAAM,kCAAkC,uBAAO,IAAI,yCAAyC;AAErF,MAAM,+BAA8B,YAC/B,sCAD+B,IAAM;AAAA,EAG/C,YAAY,SAAiB,SAA+B;AAC1D,UAAM,SAAS,OAAO;AAHxB,SAAU,MAAmC;AAI3C,SAAK,OAAO;AAAA,EACd;AACF;AAOO,SAAS,wBAAwB,KAA4C;AAClF,SAAO,CAAC,CAAC,OAAO,OAAO,QAAQ,YAAa,IAAgC,+BAA+B,MAAM;AACnH;AAEA,MAAM,iCAAiC,uBAAO,IAAI,wCAAwC;AAOnF,MAAM,8BAA6B,YAC9B,qCAD8B,IAAM;AAAA,EAG9C,YAAqB,QAAgB,SAAiB;AACpD,UAAM,OAAO;AADM;AAFrB,SAAU,MAAkC;AAI1C,SAAK,OAAO;AAAA,EACd;AACF;AAEO,SAAS,uBAAuB,KAA2C;AAChF,SAAO,CAAC,CAAC,OAAO,OAAO,QAAQ,YAAa,IAAgC,8BAA8B,MAAM;AAClH;AAUO,SAAS,4BAA4B,KAAoC;AAC9E,SAAO,wBAAwB,GAAG,IAAI,2BAA2B;AACnE;",
6
6
  "names": []
7
7
  }
@@ -3,8 +3,10 @@ import { findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find"
3
3
  import { computeEmailHash } from "@open-mercato/core/modules/auth/lib/emailHash";
4
4
  import { SsoIdentity, SsoRoleGrant, ScimToken } from "../data/entities.js";
5
5
  import { emitSsoEvent } from "../events.js";
6
- import { EmailNotVerifiedError } from "../lib/errors.js";
6
+ import { EmailNotVerifiedError, SsoRolesRevokedError } from "../lib/errors.js";
7
7
  import { createLogger } from "@open-mercato/shared/lib/logger";
8
+ import { conflict } from "@open-mercato/shared/lib/crud/errors";
9
+ import { lockUserRoleWriterAuthorizationState } from "@open-mercato/core/modules/auth/lib/authorizationStateLocks";
8
10
  const logger = createLogger("sso").child({ component: "account-linking" });
9
11
  class AccountLinkingService {
10
12
  constructor(em) {
@@ -145,13 +147,21 @@ class AccountLinkingService {
145
147
  async assignRolesFromSso(em, user, config, tenantId, idpGroups) {
146
148
  const hasMappings = config.appRoleMappings && Object.keys(config.appRoleMappings).length > 0;
147
149
  if (!hasMappings) return;
148
- await this.syncMappedRoles(em, user, config, tenantId, idpGroups);
149
- const hasAnySsoRole = await em.findOne(SsoRoleGrant, {
150
- userId: user.id,
151
- ssoConfigId: config.id
152
- });
150
+ const synchronize = async (transactionalEm) => {
151
+ const managedUser = typeof transactionalEm.getReference === "function" ? transactionalEm.getReference(User, String(user.id)) : user;
152
+ await this.syncMappedRoles(transactionalEm, managedUser, config, tenantId, idpGroups);
153
+ const remainingGrant = await transactionalEm.findOne(SsoRoleGrant, {
154
+ userId: user.id,
155
+ ssoConfigId: config.id
156
+ });
157
+ return remainingGrant !== null;
158
+ };
159
+ const hasAnySsoRole = typeof em.isInTransaction === "function" && em.isInTransaction() ? await synchronize(em) : await em.transactional(synchronize);
153
160
  if (!hasAnySsoRole) {
154
- throw new Error("No roles could be resolved from IdP groups \u2014 login denied. Configure role mappings or ensure the IdP sends matching group claims.");
161
+ throw new SsoRolesRevokedError(
162
+ String(user.id),
163
+ "No roles could be resolved from IdP groups \u2014 login denied. Configure role mappings or ensure the IdP sends matching group claims."
164
+ );
155
165
  }
156
166
  }
157
167
  /**
@@ -161,25 +171,49 @@ class AccountLinkingService {
161
171
  async syncMappedRoles(em, user, config, tenantId, idpGroups) {
162
172
  const resolvedTenantId = tenantId || user.tenantId || "";
163
173
  if (!resolvedTenantId) return;
164
- const allRoles = await em.find(Role, { tenantId: resolvedTenantId, deletedAt: null });
165
- const roleByNormalizedName = /* @__PURE__ */ new Map();
166
- for (const role of allRoles) {
167
- const normalized = normalizeToken(role.name);
168
- if (normalized) roleByNormalizedName.set(normalized, role);
169
- }
170
174
  const desiredRoleNames = resolveRoleNamesFromIdpGroups(idpGroups, config.appRoleMappings);
171
- const desiredRoleIds = /* @__PURE__ */ new Set();
172
- for (const roleName of desiredRoleNames) {
173
- const role = roleByNormalizedName.get(roleName);
174
- if (role) desiredRoleIds.add(role.id);
175
- }
176
- const existingGrants = await em.find(SsoRoleGrant, {
175
+ let allRoles = await em.find(Role, {
176
+ tenantId: resolvedTenantId,
177
+ deletedAt: null
178
+ });
179
+ let desiredRoleIds = resolveActiveRoleIds(allRoles, desiredRoleNames);
180
+ let existingGrants = await em.find(SsoRoleGrant, {
177
181
  userId: user.id,
178
182
  ssoConfigId: config.id
179
183
  });
184
+ let allUserRoles = await em.find(UserRole, { user: user.id });
185
+ const lockedRoleIds = /* @__PURE__ */ new Set([
186
+ ...desiredRoleIds,
187
+ ...existingGrants.map((grant) => grant.roleId),
188
+ ...allUserRoles.filter((userRole) => userRole.deletedAt).map((userRole) => String(userRole.role?.id ?? userRole.role))
189
+ ]);
190
+ await lockUserRoleWriterAuthorizationState(em, {
191
+ userIds: [String(user.id)],
192
+ roleIds: Array.from(lockedRoleIds)
193
+ });
194
+ allRoles = await em.find(Role, {
195
+ tenantId: resolvedTenantId,
196
+ deletedAt: null
197
+ }, { refresh: true });
198
+ existingGrants = await em.find(SsoRoleGrant, {
199
+ userId: user.id,
200
+ ssoConfigId: config.id
201
+ }, { refresh: true });
202
+ allUserRoles = await em.find(
203
+ UserRole,
204
+ { user: user.id },
205
+ { refresh: true }
206
+ );
207
+ desiredRoleIds = resolveActiveRoleIds(allRoles, desiredRoleNames);
180
208
  const existingGrantedRoleIds = new Set(existingGrants.map((g) => g.roleId));
181
209
  const toAdd = [...desiredRoleIds].filter((id) => !existingGrantedRoleIds.has(id));
182
210
  const toRemove = existingGrants.filter((g) => !desiredRoleIds.has(g.roleId));
211
+ const softDeletedUserRoles = allUserRoles.filter((userRole) => userRole.deletedAt);
212
+ assertRoleMutationFootprintWasLocked([
213
+ ...desiredRoleIds,
214
+ ...toRemove.map((grant) => grant.roleId),
215
+ ...softDeletedUserRoles.map((userRole) => String(userRole.role?.id ?? userRole.role))
216
+ ], lockedRoleIds);
183
217
  for (const roleId of toAdd) {
184
218
  const role = allRoles.find((r) => r.id === roleId);
185
219
  if (!role) continue;
@@ -204,13 +238,10 @@ class AccountLinkingService {
204
238
  }
205
239
  em.remove(grant);
206
240
  }
207
- const allUserRoles = await em.find(UserRole, { user: user.id });
208
- for (const ur of allUserRoles) {
209
- if (ur.deletedAt) {
210
- em.remove(ur);
211
- }
241
+ for (const userRole of softDeletedUserRoles) {
242
+ em.remove(userRole);
212
243
  }
213
- if (toAdd.length > 0 || toRemove.length > 0 || allUserRoles.some((ur) => ur.deletedAt)) {
244
+ if (toAdd.length > 0 || toRemove.length > 0 || softDeletedUserRoles.length > 0) {
214
245
  await em.flush();
215
246
  }
216
247
  }
@@ -222,8 +253,28 @@ class AccountLinkingService {
222
253
  });
223
254
  if (existingLink) return;
224
255
  const userRole = em.create(UserRole, { user, role, createdAt: /* @__PURE__ */ new Date() });
225
- await em.persist(userRole).flush();
256
+ em.persist(userRole);
257
+ }
258
+ }
259
+ function assertRoleMutationFootprintWasLocked(roleIds, lockedRoleIds) {
260
+ for (const roleId of roleIds) {
261
+ if (!lockedRoleIds.has(roleId)) {
262
+ throw conflict("[internal] Authorization state changed while acquiring its lock footprint");
263
+ }
264
+ }
265
+ }
266
+ function resolveActiveRoleIds(roles, desiredRoleNames) {
267
+ const roleByNormalizedName = /* @__PURE__ */ new Map();
268
+ for (const role of roles) {
269
+ const normalized = normalizeToken(role.name);
270
+ if (normalized) roleByNormalizedName.set(normalized, role);
271
+ }
272
+ const desiredRoleIds = /* @__PURE__ */ new Set();
273
+ for (const roleName of desiredRoleNames) {
274
+ const role = roleByNormalizedName.get(roleName);
275
+ if (role) desiredRoleIds.add(role.id);
226
276
  }
277
+ return desiredRoleIds;
227
278
  }
228
279
  function resolveRoleNamesFromIdpGroups(idpGroups, configMappings) {
229
280
  if (!Array.isArray(idpGroups) || idpGroups.length === 0) return [];
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/modules/sso/services/accountLinkingService.ts"],
4
- "sourcesContent": ["import { EntityManager, type FilterQuery, type RequiredEntityData } from '@mikro-orm/postgresql'\nimport { User, UserRole, Role } from '@open-mercato/core/modules/auth/data/entities'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { computeEmailHash } from '@open-mercato/core/modules/auth/lib/emailHash'\nimport { SsoConfig, SsoIdentity, SsoRoleGrant, ScimToken } from '../data/entities'\nimport { emitSsoEvent } from '../events'\nimport { EmailNotVerifiedError } from '../lib/errors'\nimport type { SsoIdentityPayload } from '../lib/types'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('sso').child({ component: 'account-linking' })\n\nexport class AccountLinkingService {\n constructor(private em: EntityManager) {}\n\n async resolveUser(\n config: SsoConfig,\n idpPayload: SsoIdentityPayload,\n tenantId: string,\n ): Promise<{ user: User; identity: SsoIdentity }> {\n const existing = await this.findExistingLink(config.id, idpPayload.subject, tenantId, config.organizationId)\n if (existing) {\n await this.assignRolesFromSso(this.em, existing.user, config, tenantId, idpPayload.groups)\n return existing\n }\n\n if (idpPayload.emailVerified !== true) {\n throw new EmailNotVerifiedError('IdP did not verify the email claim \u2014 cannot link or provision account')\n }\n\n const emailDomain = idpPayload.email.split('@')[1]?.toLowerCase()\n if (!emailDomain || !config.allowedDomains.some((d) => d.toLowerCase() === emailDomain)) {\n throw new Error('Email domain is not in the allowed domains for this SSO configuration')\n }\n\n const emailLinked = config.autoLinkByEmail\n ? await this.linkByEmail(config, idpPayload, tenantId)\n : null\n if (emailLinked) {\n await this.assignRolesFromSso(this.em, emailLinked.user, config, tenantId, idpPayload.groups)\n return emailLinked\n }\n\n if (config.jitEnabled) {\n const scimActive = await this.em.count(ScimToken, { ssoConfigId: config.id, isActive: true }) > 0\n if (scimActive) {\n throw new Error('JIT provisioning is disabled because SCIM directory sync is active')\n }\n return this.jitProvision(config, idpPayload, tenantId)\n }\n\n throw new Error('No matching user found and JIT provisioning is disabled')\n }\n\n private async findExistingLink(\n ssoConfigId: string,\n idpSubject: string,\n tenantId: string,\n organizationId: string,\n ): Promise<{ user: User; identity: SsoIdentity } | null> {\n const identity = await findOneWithDecryption(\n this.em,\n SsoIdentity,\n { ssoConfigId, idpSubject, deletedAt: null },\n {},\n { tenantId, organizationId },\n )\n if (!identity) return null\n\n const user = await findOneWithDecryption(\n this.em,\n User,\n { id: identity.userId, deletedAt: null },\n {},\n { tenantId, organizationId },\n )\n if (!user) {\n identity.deletedAt = new Date()\n await this.em.flush()\n return null\n }\n\n identity.lastLoginAt = new Date()\n await this.em.flush()\n\n return { user, identity }\n }\n\n private async linkByEmail(\n config: SsoConfig,\n idpPayload: SsoIdentityPayload,\n tenantId: string,\n ): Promise<{ user: User; identity: SsoIdentity } | null> {\n const emailHash = computeEmailHash(idpPayload.email)\n const user = await findOneWithDecryption(\n this.em,\n User,\n {\n organizationId: config.organizationId,\n deletedAt: null,\n $or: [\n { email: idpPayload.email },\n { emailHash },\n ],\n } as FilterQuery<User>,\n {},\n { tenantId, organizationId: config.organizationId },\n )\n if (!user) return null\n\n const now = new Date()\n const identity = this.em.create(SsoIdentity, {\n tenantId,\n organizationId: config.organizationId,\n ssoConfigId: config.id,\n userId: user.id,\n idpSubject: idpPayload.subject,\n idpEmail: idpPayload.email,\n idpName: idpPayload.name ?? null,\n idpGroups: idpPayload.groups ?? [],\n provisioningMethod: 'manual',\n firstLoginAt: now,\n lastLoginAt: now,\n createdAt: now,\n updatedAt: now,\n } as RequiredEntityData<SsoIdentity>)\n await this.em.persist(identity).flush()\n\n void emitSsoEvent('sso.identity.linked', {\n id: identity.id,\n tenantId,\n organizationId: config.organizationId,\n }).catch((eventError) => logger.error('SSO event emit failed', { err: eventError }))\n\n return { user, identity }\n }\n\n private async jitProvision(\n config: SsoConfig,\n idpPayload: SsoIdentityPayload,\n tenantId: string,\n ): Promise<{ user: User; identity: SsoIdentity }> {\n return this.em.transactional(async (txEm) => {\n const user = txEm.create(User, {\n tenantId,\n organizationId: config.organizationId,\n email: idpPayload.email,\n emailHash: computeEmailHash(idpPayload.email),\n name: idpPayload.name ?? null,\n passwordHash: null,\n isConfirmed: true,\n createdAt: new Date(),\n })\n await txEm.persist(user).flush()\n\n await this.assignRolesFromSso(txEm, user, config, tenantId, idpPayload.groups)\n\n const now = new Date()\n const identity = txEm.create(SsoIdentity, {\n tenantId,\n organizationId: config.organizationId,\n ssoConfigId: config.id,\n userId: user.id,\n idpSubject: idpPayload.subject,\n idpEmail: idpPayload.email,\n idpName: idpPayload.name ?? null,\n idpGroups: idpPayload.groups ?? [],\n provisioningMethod: 'jit',\n firstLoginAt: now,\n lastLoginAt: now,\n createdAt: now,\n updatedAt: now,\n } as RequiredEntityData<SsoIdentity>)\n await txEm.persist(identity).flush()\n\n void emitSsoEvent('sso.identity.created', {\n id: identity.id,\n tenantId,\n organizationId: config.organizationId,\n }).catch((eventError) => logger.error('SSO event emit failed', { err: eventError }))\n\n return { user, identity }\n })\n }\n\n private async assignRolesFromSso(\n em: EntityManager,\n user: User,\n config: SsoConfig,\n tenantId: string,\n idpGroups?: string[],\n ): Promise<void> {\n const hasMappings = config.appRoleMappings && Object.keys(config.appRoleMappings).length > 0\n if (!hasMappings) return\n\n await this.syncMappedRoles(em, user, config, tenantId, idpGroups)\n\n const hasAnySsoRole = await em.findOne(SsoRoleGrant, {\n userId: user.id,\n ssoConfigId: config.id,\n })\n if (!hasAnySsoRole) {\n throw new Error('No roles could be resolved from IdP groups \u2014 login denied. Configure role mappings or ensure the IdP sends matching group claims.')\n }\n }\n\n /**\n * Sync/replace SSO-sourced roles: on each login, SSO-managed roles are replaced\n * with what the IdP sends, while manually-assigned roles are preserved.\n */\n private async syncMappedRoles(\n em: EntityManager,\n user: User,\n config: SsoConfig,\n tenantId: string,\n idpGroups?: string[],\n ): Promise<void> {\n const resolvedTenantId = tenantId || user.tenantId || ''\n if (!resolvedTenantId) return\n\n const allRoles = await em.find(Role, { tenantId: resolvedTenantId, deletedAt: null } as FilterQuery<Role>)\n const roleByNormalizedName = new Map<string, Role>()\n for (const role of allRoles) {\n const normalized = normalizeToken(role.name)\n if (normalized) roleByNormalizedName.set(normalized, role)\n }\n\n // Resolve desired role IDs from IdP groups using merged mappings\n const desiredRoleNames = resolveRoleNamesFromIdpGroups(idpGroups, config.appRoleMappings)\n const desiredRoleIds = new Set<string>()\n for (const roleName of desiredRoleNames) {\n const role = roleByNormalizedName.get(roleName)\n if (role) desiredRoleIds.add(role.id)\n }\n\n // Query current SSO grants for this user+config\n const existingGrants = await em.find(SsoRoleGrant, {\n userId: user.id,\n ssoConfigId: config.id,\n })\n const existingGrantedRoleIds = new Set(existingGrants.map((g) => g.roleId))\n\n // Compute diff\n const toAdd = [...desiredRoleIds].filter((id) => !existingGrantedRoleIds.has(id))\n const toRemove = existingGrants.filter((g) => !desiredRoleIds.has(g.roleId))\n\n // Add new roles\n for (const roleId of toAdd) {\n const role = allRoles.find((r) => r.id === roleId)\n if (!role) continue\n await this.ensureUserRole(em, user, role)\n const grant = em.create(SsoRoleGrant, {\n tenantId: resolvedTenantId,\n organizationId: config.organizationId,\n userId: user.id,\n roleId,\n ssoConfigId: config.id,\n } as RequiredEntityData<SsoRoleGrant>)\n em.persist(grant)\n }\n\n // Remove stale SSO-sourced roles\n for (const grant of toRemove) {\n const userRole = await em.findOne(UserRole, {\n user: user.id,\n role: grant.roleId,\n deletedAt: null,\n } as FilterQuery<UserRole>)\n if (userRole) {\n em.remove(userRole)\n }\n em.remove(grant)\n }\n\n // Clean up orphaned soft-deleted UserRole rows (ghost rows from previous soft-delete logic)\n const allUserRoles = await em.find(UserRole, { user: user.id } as FilterQuery<UserRole>)\n for (const ur of allUserRoles) {\n if (ur.deletedAt) {\n em.remove(ur)\n }\n }\n\n if (toAdd.length > 0 || toRemove.length > 0 || allUserRoles.some((ur) => ur.deletedAt)) {\n await em.flush()\n }\n }\n\n private async ensureUserRole(em: EntityManager, user: User, role: Role): Promise<void> {\n const existingLink = await em.findOne(UserRole, {\n user: user.id,\n role: role.id,\n deletedAt: null,\n } as FilterQuery<UserRole>)\n if (existingLink) return\n\n const userRole = em.create(UserRole, { user, role, createdAt: new Date() })\n await em.persist(userRole).flush()\n }\n}\n\nfunction resolveRoleNamesFromIdpGroups(\n idpGroups?: string[],\n configMappings?: Record<string, string>,\n): string[] {\n if (!Array.isArray(idpGroups) || idpGroups.length === 0) return []\n\n const normalizedGroups = idpGroups\n .map((group) => normalizeToken(group))\n .filter((group): group is string => group !== null)\n if (normalizedGroups.length === 0) return []\n\n const mergedMappings = loadMergedMappings(configMappings)\n const roleNames = new Set<string>()\n\n for (const group of normalizedGroups) {\n const mapped = mergedMappings.get(group)\n if (!mapped?.length) continue\n\n for (const role of mapped) roleNames.add(role)\n }\n\n return Array.from(roleNames)\n}\n\nfunction loadMergedMappings(configMappings?: Record<string, string>): Map<string, string[]> {\n const mappings = new Map<string, string[]>()\n\n if (configMappings && Object.keys(configMappings).length > 0) {\n for (const [group, roleName] of Object.entries(configMappings)) {\n const normalizedGroup = normalizeToken(group)\n if (!normalizedGroup) continue\n const normalizedRole = normalizeToken(roleName)\n if (!normalizedRole) continue\n mappings.set(normalizedGroup, [normalizedRole])\n }\n }\n\n return mappings\n}\n\nfunction normalizeToken(value: unknown): string | null {\n if (typeof value !== 'string') return null\n const normalized = value.trim().toLowerCase()\n return normalized.length > 0 ? normalized : null\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import { EntityManager, type FilterQuery, type RequiredEntityData } from '@mikro-orm/postgresql'\nimport { User, UserRole, Role } from '@open-mercato/core/modules/auth/data/entities'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { computeEmailHash } from '@open-mercato/core/modules/auth/lib/emailHash'\nimport { SsoConfig, SsoIdentity, SsoRoleGrant, ScimToken } from '../data/entities'\nimport { emitSsoEvent } from '../events'\nimport { EmailNotVerifiedError, SsoRolesRevokedError } from '../lib/errors'\nimport type { SsoIdentityPayload } from '../lib/types'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { conflict } from '@open-mercato/shared/lib/crud/errors'\nimport { lockUserRoleWriterAuthorizationState } from '@open-mercato/core/modules/auth/lib/authorizationStateLocks'\n\nconst logger = createLogger('sso').child({ component: 'account-linking' })\n\nexport class AccountLinkingService {\n constructor(private em: EntityManager) {}\n\n async resolveUser(\n config: SsoConfig,\n idpPayload: SsoIdentityPayload,\n tenantId: string,\n ): Promise<{ user: User; identity: SsoIdentity }> {\n const existing = await this.findExistingLink(config.id, idpPayload.subject, tenantId, config.organizationId)\n if (existing) {\n await this.assignRolesFromSso(this.em, existing.user, config, tenantId, idpPayload.groups)\n return existing\n }\n\n if (idpPayload.emailVerified !== true) {\n throw new EmailNotVerifiedError('IdP did not verify the email claim \u2014 cannot link or provision account')\n }\n\n const emailDomain = idpPayload.email.split('@')[1]?.toLowerCase()\n if (!emailDomain || !config.allowedDomains.some((d) => d.toLowerCase() === emailDomain)) {\n throw new Error('Email domain is not in the allowed domains for this SSO configuration')\n }\n\n const emailLinked = config.autoLinkByEmail\n ? await this.linkByEmail(config, idpPayload, tenantId)\n : null\n if (emailLinked) {\n await this.assignRolesFromSso(this.em, emailLinked.user, config, tenantId, idpPayload.groups)\n return emailLinked\n }\n\n if (config.jitEnabled) {\n const scimActive = await this.em.count(ScimToken, { ssoConfigId: config.id, isActive: true }) > 0\n if (scimActive) {\n throw new Error('JIT provisioning is disabled because SCIM directory sync is active')\n }\n return this.jitProvision(config, idpPayload, tenantId)\n }\n\n throw new Error('No matching user found and JIT provisioning is disabled')\n }\n\n private async findExistingLink(\n ssoConfigId: string,\n idpSubject: string,\n tenantId: string,\n organizationId: string,\n ): Promise<{ user: User; identity: SsoIdentity } | null> {\n const identity = await findOneWithDecryption(\n this.em,\n SsoIdentity,\n { ssoConfigId, idpSubject, deletedAt: null },\n {},\n { tenantId, organizationId },\n )\n if (!identity) return null\n\n const user = await findOneWithDecryption(\n this.em,\n User,\n { id: identity.userId, deletedAt: null },\n {},\n { tenantId, organizationId },\n )\n if (!user) {\n identity.deletedAt = new Date()\n await this.em.flush()\n return null\n }\n\n identity.lastLoginAt = new Date()\n await this.em.flush()\n\n return { user, identity }\n }\n\n private async linkByEmail(\n config: SsoConfig,\n idpPayload: SsoIdentityPayload,\n tenantId: string,\n ): Promise<{ user: User; identity: SsoIdentity } | null> {\n const emailHash = computeEmailHash(idpPayload.email)\n const user = await findOneWithDecryption(\n this.em,\n User,\n {\n organizationId: config.organizationId,\n deletedAt: null,\n $or: [\n { email: idpPayload.email },\n { emailHash },\n ],\n } as FilterQuery<User>,\n {},\n { tenantId, organizationId: config.organizationId },\n )\n if (!user) return null\n\n const now = new Date()\n const identity = this.em.create(SsoIdentity, {\n tenantId,\n organizationId: config.organizationId,\n ssoConfigId: config.id,\n userId: user.id,\n idpSubject: idpPayload.subject,\n idpEmail: idpPayload.email,\n idpName: idpPayload.name ?? null,\n idpGroups: idpPayload.groups ?? [],\n provisioningMethod: 'manual',\n firstLoginAt: now,\n lastLoginAt: now,\n createdAt: now,\n updatedAt: now,\n } as RequiredEntityData<SsoIdentity>)\n await this.em.persist(identity).flush()\n\n void emitSsoEvent('sso.identity.linked', {\n id: identity.id,\n tenantId,\n organizationId: config.organizationId,\n }).catch((eventError) => logger.error('SSO event emit failed', { err: eventError }))\n\n return { user, identity }\n }\n\n private async jitProvision(\n config: SsoConfig,\n idpPayload: SsoIdentityPayload,\n tenantId: string,\n ): Promise<{ user: User; identity: SsoIdentity }> {\n return this.em.transactional(async (txEm) => {\n const user = txEm.create(User, {\n tenantId,\n organizationId: config.organizationId,\n email: idpPayload.email,\n emailHash: computeEmailHash(idpPayload.email),\n name: idpPayload.name ?? null,\n passwordHash: null,\n isConfirmed: true,\n createdAt: new Date(),\n })\n await txEm.persist(user).flush()\n\n await this.assignRolesFromSso(txEm, user, config, tenantId, idpPayload.groups)\n\n const now = new Date()\n const identity = txEm.create(SsoIdentity, {\n tenantId,\n organizationId: config.organizationId,\n ssoConfigId: config.id,\n userId: user.id,\n idpSubject: idpPayload.subject,\n idpEmail: idpPayload.email,\n idpName: idpPayload.name ?? null,\n idpGroups: idpPayload.groups ?? [],\n provisioningMethod: 'jit',\n firstLoginAt: now,\n lastLoginAt: now,\n createdAt: now,\n updatedAt: now,\n } as RequiredEntityData<SsoIdentity>)\n await txEm.persist(identity).flush()\n\n void emitSsoEvent('sso.identity.created', {\n id: identity.id,\n tenantId,\n organizationId: config.organizationId,\n }).catch((eventError) => logger.error('SSO event emit failed', { err: eventError }))\n\n return { user, identity }\n })\n }\n\n private async assignRolesFromSso(\n em: EntityManager,\n user: User,\n config: SsoConfig,\n tenantId: string,\n idpGroups?: string[],\n ): Promise<void> {\n const hasMappings = config.appRoleMappings && Object.keys(config.appRoleMappings).length > 0\n if (!hasMappings) return\n\n const synchronize = async (transactionalEm: EntityManager): Promise<boolean> => {\n const managedUser = typeof transactionalEm.getReference === 'function'\n ? transactionalEm.getReference(User, String(user.id))\n : user\n await this.syncMappedRoles(transactionalEm, managedUser, config, tenantId, idpGroups)\n const remainingGrant = await transactionalEm.findOne(SsoRoleGrant, {\n userId: user.id,\n ssoConfigId: config.id,\n })\n return remainingGrant !== null\n }\n const hasAnySsoRole = typeof em.isInTransaction === 'function' && em.isInTransaction()\n ? await synchronize(em)\n : await em.transactional(synchronize)\n if (!hasAnySsoRole) {\n throw new SsoRolesRevokedError(\n String(user.id),\n 'No roles could be resolved from IdP groups \u2014 login denied. Configure role mappings or ensure the IdP sends matching group claims.',\n )\n }\n }\n\n /**\n * Sync/replace SSO-sourced roles: on each login, SSO-managed roles are replaced\n * with what the IdP sends, while manually-assigned roles are preserved.\n */\n private async syncMappedRoles(\n em: EntityManager,\n user: User,\n config: SsoConfig,\n tenantId: string,\n idpGroups?: string[],\n ): Promise<void> {\n const resolvedTenantId = tenantId || user.tenantId || ''\n if (!resolvedTenantId) return\n\n const desiredRoleNames = resolveRoleNamesFromIdpGroups(idpGroups, config.appRoleMappings)\n let allRoles = await em.find(Role, {\n tenantId: resolvedTenantId,\n deletedAt: null,\n } as FilterQuery<Role>)\n let desiredRoleIds = resolveActiveRoleIds(allRoles, desiredRoleNames)\n\n // Query current SSO grants for this user+config\n let existingGrants = await em.find(SsoRoleGrant, {\n userId: user.id,\n ssoConfigId: config.id,\n })\n let allUserRoles = await em.find(UserRole, { user: user.id } as FilterQuery<UserRole>)\n const lockedRoleIds = new Set([\n ...desiredRoleIds,\n ...existingGrants.map((grant) => grant.roleId),\n ...allUserRoles\n .filter((userRole) => userRole.deletedAt)\n .map((userRole) => String(userRole.role?.id ?? userRole.role)),\n ])\n await lockUserRoleWriterAuthorizationState(em, {\n userIds: [String(user.id)],\n roleIds: Array.from(lockedRoleIds),\n })\n allRoles = await em.find(Role, {\n tenantId: resolvedTenantId,\n deletedAt: null,\n } as FilterQuery<Role>, { refresh: true })\n existingGrants = await em.find(SsoRoleGrant, {\n userId: user.id,\n ssoConfigId: config.id,\n }, { refresh: true })\n allUserRoles = await em.find(\n UserRole,\n { user: user.id } as FilterQuery<UserRole>,\n { refresh: true },\n )\n\n desiredRoleIds = resolveActiveRoleIds(allRoles, desiredRoleNames)\n const existingGrantedRoleIds = new Set(existingGrants.map((g) => g.roleId))\n\n // Compute diff\n const toAdd = [...desiredRoleIds].filter((id) => !existingGrantedRoleIds.has(id))\n const toRemove = existingGrants.filter((g) => !desiredRoleIds.has(g.roleId))\n const softDeletedUserRoles = allUserRoles.filter((userRole) => userRole.deletedAt)\n assertRoleMutationFootprintWasLocked([\n ...desiredRoleIds,\n ...toRemove.map((grant) => grant.roleId),\n ...softDeletedUserRoles.map((userRole) => String(userRole.role?.id ?? userRole.role)),\n ], lockedRoleIds)\n\n // Add new roles\n for (const roleId of toAdd) {\n const role = allRoles.find((r) => r.id === roleId)\n if (!role) continue\n await this.ensureUserRole(em, user, role)\n const grant = em.create(SsoRoleGrant, {\n tenantId: resolvedTenantId,\n organizationId: config.organizationId,\n userId: user.id,\n roleId,\n ssoConfigId: config.id,\n } as RequiredEntityData<SsoRoleGrant>)\n em.persist(grant)\n }\n\n // Remove stale SSO-sourced roles\n for (const grant of toRemove) {\n const userRole = await em.findOne(UserRole, {\n user: user.id,\n role: grant.roleId,\n deletedAt: null,\n } as FilterQuery<UserRole>)\n if (userRole) {\n em.remove(userRole)\n }\n em.remove(grant)\n }\n\n // Clean up orphaned soft-deleted UserRole rows (ghost rows from previous soft-delete logic)\n for (const userRole of softDeletedUserRoles) {\n em.remove(userRole)\n }\n\n if (toAdd.length > 0 || toRemove.length > 0 || softDeletedUserRoles.length > 0) {\n await em.flush()\n }\n }\n\n private async ensureUserRole(em: EntityManager, user: User, role: Role): Promise<void> {\n const existingLink = await em.findOne(UserRole, {\n user: user.id,\n role: role.id,\n deletedAt: null,\n } as FilterQuery<UserRole>)\n if (existingLink) return\n\n const userRole = em.create(UserRole, { user, role, createdAt: new Date() })\n em.persist(userRole)\n }\n}\n\nfunction assertRoleMutationFootprintWasLocked(\n roleIds: Iterable<string>,\n lockedRoleIds: ReadonlySet<string>,\n): void {\n for (const roleId of roleIds) {\n if (!lockedRoleIds.has(roleId)) {\n throw conflict('[internal] Authorization state changed while acquiring its lock footprint')\n }\n }\n}\n\nfunction resolveActiveRoleIds(roles: Role[], desiredRoleNames: string[]): Set<string> {\n const roleByNormalizedName = new Map<string, Role>()\n for (const role of roles) {\n const normalized = normalizeToken(role.name)\n if (normalized) roleByNormalizedName.set(normalized, role)\n }\n\n const desiredRoleIds = new Set<string>()\n for (const roleName of desiredRoleNames) {\n const role = roleByNormalizedName.get(roleName)\n if (role) desiredRoleIds.add(role.id)\n }\n return desiredRoleIds\n}\n\nfunction resolveRoleNamesFromIdpGroups(\n idpGroups?: string[],\n configMappings?: Record<string, string>,\n): string[] {\n if (!Array.isArray(idpGroups) || idpGroups.length === 0) return []\n\n const normalizedGroups = idpGroups\n .map((group) => normalizeToken(group))\n .filter((group): group is string => group !== null)\n if (normalizedGroups.length === 0) return []\n\n const mergedMappings = loadMergedMappings(configMappings)\n const roleNames = new Set<string>()\n\n for (const group of normalizedGroups) {\n const mapped = mergedMappings.get(group)\n if (!mapped?.length) continue\n\n for (const role of mapped) roleNames.add(role)\n }\n\n return Array.from(roleNames)\n}\n\nfunction loadMergedMappings(configMappings?: Record<string, string>): Map<string, string[]> {\n const mappings = new Map<string, string[]>()\n\n if (configMappings && Object.keys(configMappings).length > 0) {\n for (const [group, roleName] of Object.entries(configMappings)) {\n const normalizedGroup = normalizeToken(group)\n if (!normalizedGroup) continue\n const normalizedRole = normalizeToken(roleName)\n if (!normalizedRole) continue\n mappings.set(normalizedGroup, [normalizedRole])\n }\n }\n\n return mappings\n}\n\nfunction normalizeToken(value: unknown): string | null {\n if (typeof value !== 'string') return null\n const normalized = value.trim().toLowerCase()\n return normalized.length > 0 ? normalized : null\n}\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -4,6 +4,7 @@ import { signJwt } from "@open-mercato/shared/lib/auth/jwt";
4
4
  import { SsoConfig } from "../data/entities.js";
5
5
  import { encryptStateCookie, decryptStateCookie, createFlowState } from "../lib/state-cookie.js";
6
6
  import { emitSsoEvent } from "../events.js";
7
+ import { isSsoRolesRevokedError } from "../lib/errors.js";
7
8
  import { createLogger } from "@open-mercato/shared/lib/logger";
8
9
  const logger = createLogger("sso").child({ component: "service" });
9
10
  class SsoService {
@@ -83,7 +84,14 @@ class SsoService {
83
84
  clientSecret
84
85
  });
85
86
  const tenantId = config.tenantId ?? "";
86
- const { user } = await this.accountLinkingService.resolveUser(config, idpPayload, tenantId);
87
+ let user;
88
+ try {
89
+ ;
90
+ ({ user } = await this.accountLinkingService.resolveUser(config, idpPayload, tenantId));
91
+ } catch (err) {
92
+ if (isSsoRolesRevokedError(err)) await this.rbacService.invalidateUserCache(err.userId);
93
+ throw err;
94
+ }
87
95
  await this.rbacService.invalidateUserCache(String(user.id));
88
96
  const roles = await this.authService.getUserRoles(user, tenantId || null);
89
97
  await this.authService.updateLastLoginAt(user);
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/modules/sso/services/ssoService.ts"],
4
- "sourcesContent": ["import crypto from 'node:crypto'\nimport { EntityManager } from '@mikro-orm/postgresql'\nimport { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { signJwt } from '@open-mercato/shared/lib/auth/jwt'\nimport type { AuthService } from '@open-mercato/core/modules/auth/services/authService'\nimport type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'\nimport { SsoConfig } from '../data/entities'\nimport type { SsoProviderRegistry } from '../lib/registry'\nimport type { AccountLinkingService } from './accountLinkingService'\nimport { encryptStateCookie, decryptStateCookie, createFlowState } from '../lib/state-cookie'\nimport { emitSsoEvent } from '../events'\nimport type { TenantDataEncryptionService } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('sso').child({ component: 'service' })\n\nexport class SsoService {\n constructor(\n private em: EntityManager,\n private ssoProviderRegistry: SsoProviderRegistry,\n private accountLinkingService: AccountLinkingService,\n private tenantEncryptionService: TenantDataEncryptionService,\n private authService: AuthService,\n private rbacService: RbacService,\n ) {}\n\n async findConfigByEmail(email: string): Promise<SsoConfig | null> {\n const domain = email.split('@')[1]?.toLowerCase()\n if (!domain) return null\n\n const configs = await findWithDecryption(\n this.em,\n SsoConfig,\n { isActive: true, deletedAt: null },\n {},\n { tenantId: null },\n )\n const matches = configs.filter((c) => c.allowedDomains.some((d) => d.toLowerCase() === domain))\n return matches.length === 1 ? matches[0]! : null\n }\n\n async initiateLogin(\n configId: string,\n returnUrl: string,\n redirectUri: string,\n ): Promise<{ redirectUrl: string; stateCookie: string }> {\n const config = await findOneWithDecryption(\n this.em,\n SsoConfig,\n { id: configId, isActive: true, deletedAt: null },\n {},\n { tenantId: null },\n )\n if (!config) throw new Error('SSO configuration not found or inactive')\n\n const provider = this.ssoProviderRegistry.resolve(config.protocol)\n if (!provider) throw new Error(`No provider registered for protocol: ${config.protocol}`)\n\n const clientSecret = await this.decryptClientSecret(config)\n\n const { state } = createFlowState({ configId, returnUrl })\n\n void emitSsoEvent('sso.login.initiated', {\n tenantId: config.tenantId,\n organizationId: config.organizationId,\n }).catch((eventError) => logger.error('SSO event emit failed', { err: eventError }))\n\n const authUrl = await provider.buildAuthUrl(config, {\n state: state.state,\n nonce: state.nonce,\n redirectUri,\n codeVerifier: state.codeVerifier,\n clientSecret,\n })\n\n const stateCookie = encryptStateCookie(state)\n return { redirectUrl: authUrl, stateCookie }\n }\n\n async handleOidcCallback(\n callbackParams: Record<string, string>,\n stateCookie: string,\n redirectUri: string,\n ): Promise<{\n token: string\n sessionToken: string\n sessionExpiresAt: Date\n redirectUrl: string\n tenantId: string | null\n organizationId: string\n }> {\n const flowState = decryptStateCookie(stateCookie)\n if (!flowState) throw new Error('Invalid or expired SSO state')\n\n const receivedState = Buffer.from(callbackParams.state || '')\n const expectedState = Buffer.from(flowState.state)\n if (receivedState.length !== expectedState.length || !crypto.timingSafeEqual(receivedState, expectedState)) {\n throw new Error('State mismatch \u2014 possible CSRF attack')\n }\n\n const config = await findOneWithDecryption(\n this.em,\n SsoConfig,\n { id: flowState.configId, isActive: true, deletedAt: null },\n {},\n { tenantId: null },\n )\n if (!config) throw new Error('SSO configuration no longer active')\n\n const provider = this.ssoProviderRegistry.resolve(config.protocol)\n if (!provider) throw new Error(`No provider for protocol: ${config.protocol}`)\n\n const clientSecret = await this.decryptClientSecret(config)\n\n const idpPayload = await provider.handleCallback(config, {\n callbackParams,\n redirectUri,\n expectedState: flowState.state,\n expectedNonce: flowState.nonce,\n codeVerifier: flowState.codeVerifier,\n clientSecret,\n })\n\n const tenantId = config.tenantId ?? ''\n const { user } = await this.accountLinkingService.resolveUser(config, idpPayload, tenantId)\n\n await this.rbacService.invalidateUserCache(String(user.id))\n\n const roles = await this.authService.getUserRoles(user, tenantId || null)\n\n await this.authService.updateLastLoginAt(user)\n\n const days = Number(process.env.REMEMBER_ME_DAYS || '30')\n const sessionExpiresAt = new Date(Date.now() + days * 24 * 60 * 60 * 1000)\n const { session, token: sessionRefreshToken } = await this.authService.createSession(user, sessionExpiresAt)\n\n const token = signJwt({\n sub: String(user.id),\n sid: String(session.id),\n tenantId: tenantId || null,\n orgId: user.organizationId ? String(user.organizationId) : null,\n email: user.email,\n roles,\n })\n\n void emitSsoEvent('sso.login.completed', {\n id: String(user.id),\n tenantId: config.tenantId,\n organizationId: config.organizationId,\n }).catch((eventError) => logger.error('SSO event emit failed', { err: eventError }))\n\n return {\n token,\n sessionToken: sessionRefreshToken,\n sessionExpiresAt,\n redirectUrl: flowState.returnUrl || '/backend',\n tenantId: config.tenantId ?? null,\n organizationId: config.organizationId,\n }\n }\n\n private async decryptClientSecret(config: SsoConfig): Promise<string | undefined> {\n if (!config.clientSecretEnc) return undefined\n\n const decrypted = await this.tenantEncryptionService.decryptEntityPayload(\n config.id,\n { clientSecretEnc: config.clientSecretEnc },\n config.tenantId,\n config.organizationId,\n )\n return (decrypted.clientSecretEnc as string) ?? undefined\n }\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import crypto from 'node:crypto'\nimport { EntityManager } from '@mikro-orm/postgresql'\nimport { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { signJwt } from '@open-mercato/shared/lib/auth/jwt'\nimport type { AuthService } from '@open-mercato/core/modules/auth/services/authService'\nimport type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'\nimport { SsoConfig } from '../data/entities'\nimport type { SsoProviderRegistry } from '../lib/registry'\nimport type { AccountLinkingService } from './accountLinkingService'\nimport { encryptStateCookie, decryptStateCookie, createFlowState } from '../lib/state-cookie'\nimport { emitSsoEvent } from '../events'\nimport { isSsoRolesRevokedError } from '../lib/errors'\nimport type { TenantDataEncryptionService } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('sso').child({ component: 'service' })\n\nexport class SsoService {\n constructor(\n private em: EntityManager,\n private ssoProviderRegistry: SsoProviderRegistry,\n private accountLinkingService: AccountLinkingService,\n private tenantEncryptionService: TenantDataEncryptionService,\n private authService: AuthService,\n private rbacService: RbacService,\n ) {}\n\n async findConfigByEmail(email: string): Promise<SsoConfig | null> {\n const domain = email.split('@')[1]?.toLowerCase()\n if (!domain) return null\n\n const configs = await findWithDecryption(\n this.em,\n SsoConfig,\n { isActive: true, deletedAt: null },\n {},\n { tenantId: null },\n )\n const matches = configs.filter((c) => c.allowedDomains.some((d) => d.toLowerCase() === domain))\n return matches.length === 1 ? matches[0]! : null\n }\n\n async initiateLogin(\n configId: string,\n returnUrl: string,\n redirectUri: string,\n ): Promise<{ redirectUrl: string; stateCookie: string }> {\n const config = await findOneWithDecryption(\n this.em,\n SsoConfig,\n { id: configId, isActive: true, deletedAt: null },\n {},\n { tenantId: null },\n )\n if (!config) throw new Error('SSO configuration not found or inactive')\n\n const provider = this.ssoProviderRegistry.resolve(config.protocol)\n if (!provider) throw new Error(`No provider registered for protocol: ${config.protocol}`)\n\n const clientSecret = await this.decryptClientSecret(config)\n\n const { state } = createFlowState({ configId, returnUrl })\n\n void emitSsoEvent('sso.login.initiated', {\n tenantId: config.tenantId,\n organizationId: config.organizationId,\n }).catch((eventError) => logger.error('SSO event emit failed', { err: eventError }))\n\n const authUrl = await provider.buildAuthUrl(config, {\n state: state.state,\n nonce: state.nonce,\n redirectUri,\n codeVerifier: state.codeVerifier,\n clientSecret,\n })\n\n const stateCookie = encryptStateCookie(state)\n return { redirectUrl: authUrl, stateCookie }\n }\n\n async handleOidcCallback(\n callbackParams: Record<string, string>,\n stateCookie: string,\n redirectUri: string,\n ): Promise<{\n token: string\n sessionToken: string\n sessionExpiresAt: Date\n redirectUrl: string\n tenantId: string | null\n organizationId: string\n }> {\n const flowState = decryptStateCookie(stateCookie)\n if (!flowState) throw new Error('Invalid or expired SSO state')\n\n const receivedState = Buffer.from(callbackParams.state || '')\n const expectedState = Buffer.from(flowState.state)\n if (receivedState.length !== expectedState.length || !crypto.timingSafeEqual(receivedState, expectedState)) {\n throw new Error('State mismatch \u2014 possible CSRF attack')\n }\n\n const config = await findOneWithDecryption(\n this.em,\n SsoConfig,\n { id: flowState.configId, isActive: true, deletedAt: null },\n {},\n { tenantId: null },\n )\n if (!config) throw new Error('SSO configuration no longer active')\n\n const provider = this.ssoProviderRegistry.resolve(config.protocol)\n if (!provider) throw new Error(`No provider for protocol: ${config.protocol}`)\n\n const clientSecret = await this.decryptClientSecret(config)\n\n const idpPayload = await provider.handleCallback(config, {\n callbackParams,\n redirectUri,\n expectedState: flowState.state,\n expectedNonce: flowState.nonce,\n codeVerifier: flowState.codeVerifier,\n clientSecret,\n })\n\n const tenantId = config.tenantId ?? ''\n let user: Awaited<ReturnType<AccountLinkingService['resolveUser']>>['user']\n try {\n ;({ user } = await this.accountLinkingService.resolveUser(config, idpPayload, tenantId))\n } catch (err) {\n if (isSsoRolesRevokedError(err)) await this.rbacService.invalidateUserCache(err.userId)\n throw err\n }\n\n await this.rbacService.invalidateUserCache(String(user.id))\n\n const roles = await this.authService.getUserRoles(user, tenantId || null)\n\n await this.authService.updateLastLoginAt(user)\n\n const days = Number(process.env.REMEMBER_ME_DAYS || '30')\n const sessionExpiresAt = new Date(Date.now() + days * 24 * 60 * 60 * 1000)\n const { session, token: sessionRefreshToken } = await this.authService.createSession(user, sessionExpiresAt)\n\n const token = signJwt({\n sub: String(user.id),\n sid: String(session.id),\n tenantId: tenantId || null,\n orgId: user.organizationId ? String(user.organizationId) : null,\n email: user.email,\n roles,\n })\n\n void emitSsoEvent('sso.login.completed', {\n id: String(user.id),\n tenantId: config.tenantId,\n organizationId: config.organizationId,\n }).catch((eventError) => logger.error('SSO event emit failed', { err: eventError }))\n\n return {\n token,\n sessionToken: sessionRefreshToken,\n sessionExpiresAt,\n redirectUrl: flowState.returnUrl || '/backend',\n tenantId: config.tenantId ?? null,\n organizationId: config.organizationId,\n }\n }\n\n private async decryptClientSecret(config: SsoConfig): Promise<string | undefined> {\n if (!config.clientSecretEnc) return undefined\n\n const decrypted = await this.tenantEncryptionService.decryptEntityPayload(\n config.id,\n { clientSecretEnc: config.clientSecretEnc },\n config.tenantId,\n config.organizationId,\n )\n return (decrypted.clientSecretEnc as string) ?? undefined\n }\n}\n"],
5
+ "mappings": "AAAA,OAAO,YAAY;AAEnB,SAAS,uBAAuB,0BAA0B;AAC1D,SAAS,eAAe;AAGxB,SAAS,iBAAiB;AAG1B,SAAS,oBAAoB,oBAAoB,uBAAuB;AACxE,SAAS,oBAAoB;AAC7B,SAAS,8BAA8B;AAEvC,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,KAAK,EAAE,MAAM,EAAE,WAAW,UAAU,CAAC;AAE1D,MAAM,WAAW;AAAA,EACtB,YACU,IACA,qBACA,uBACA,yBACA,aACA,aACR;AANQ;AACA;AACA;AACA;AACA;AACA;AAAA,EACP;AAAA,EAEH,MAAM,kBAAkB,OAA0C;AAChE,UAAM,SAAS,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,YAAY;AAChD,QAAI,CAAC,OAAQ,QAAO;AAEpB,UAAM,UAAU,MAAM;AAAA,MACpB,KAAK;AAAA,MACL;AAAA,MACA,EAAE,UAAU,MAAM,WAAW,KAAK;AAAA,MAClC,CAAC;AAAA,MACD,EAAE,UAAU,KAAK;AAAA,IACnB;AACA,UAAM,UAAU,QAAQ,OAAO,CAAC,MAAM,EAAE,eAAe,KAAK,CAAC,MAAM,EAAE,YAAY,MAAM,MAAM,CAAC;AAC9F,WAAO,QAAQ,WAAW,IAAI,QAAQ,CAAC,IAAK;AAAA,EAC9C;AAAA,EAEA,MAAM,cACJ,UACA,WACA,aACuD;AACvD,UAAM,SAAS,MAAM;AAAA,MACnB,KAAK;AAAA,MACL;AAAA,MACA,EAAE,IAAI,UAAU,UAAU,MAAM,WAAW,KAAK;AAAA,MAChD,CAAC;AAAA,MACD,EAAE,UAAU,KAAK;AAAA,IACnB;AACA,QAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,yCAAyC;AAEtE,UAAM,WAAW,KAAK,oBAAoB,QAAQ,OAAO,QAAQ;AACjE,QAAI,CAAC,SAAU,OAAM,IAAI,MAAM,wCAAwC,OAAO,QAAQ,EAAE;AAExF,UAAM,eAAe,MAAM,KAAK,oBAAoB,MAAM;AAE1D,UAAM,EAAE,MAAM,IAAI,gBAAgB,EAAE,UAAU,UAAU,CAAC;AAEzD,SAAK,aAAa,uBAAuB;AAAA,MACvC,UAAU,OAAO;AAAA,MACjB,gBAAgB,OAAO;AAAA,IACzB,CAAC,EAAE,MAAM,CAAC,eAAe,OAAO,MAAM,yBAAyB,EAAE,KAAK,WAAW,CAAC,CAAC;AAEnF,UAAM,UAAU,MAAM,SAAS,aAAa,QAAQ;AAAA,MAClD,OAAO,MAAM;AAAA,MACb,OAAO,MAAM;AAAA,MACb;AAAA,MACA,cAAc,MAAM;AAAA,MACpB;AAAA,IACF,CAAC;AAED,UAAM,cAAc,mBAAmB,KAAK;AAC5C,WAAO,EAAE,aAAa,SAAS,YAAY;AAAA,EAC7C;AAAA,EAEA,MAAM,mBACJ,gBACA,aACA,aAQC;AACD,UAAM,YAAY,mBAAmB,WAAW;AAChD,QAAI,CAAC,UAAW,OAAM,IAAI,MAAM,8BAA8B;AAE9D,UAAM,gBAAgB,OAAO,KAAK,eAAe,SAAS,EAAE;AAC5D,UAAM,gBAAgB,OAAO,KAAK,UAAU,KAAK;AACjD,QAAI,cAAc,WAAW,cAAc,UAAU,CAAC,OAAO,gBAAgB,eAAe,aAAa,GAAG;AAC1G,YAAM,IAAI,MAAM,4CAAuC;AAAA,IACzD;AAEA,UAAM,SAAS,MAAM;AAAA,MACnB,KAAK;AAAA,MACL;AAAA,MACA,EAAE,IAAI,UAAU,UAAU,UAAU,MAAM,WAAW,KAAK;AAAA,MAC1D,CAAC;AAAA,MACD,EAAE,UAAU,KAAK;AAAA,IACnB;AACA,QAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,oCAAoC;AAEjE,UAAM,WAAW,KAAK,oBAAoB,QAAQ,OAAO,QAAQ;AACjE,QAAI,CAAC,SAAU,OAAM,IAAI,MAAM,6BAA6B,OAAO,QAAQ,EAAE;AAE7E,UAAM,eAAe,MAAM,KAAK,oBAAoB,MAAM;AAE1D,UAAM,aAAa,MAAM,SAAS,eAAe,QAAQ;AAAA,MACvD;AAAA,MACA;AAAA,MACA,eAAe,UAAU;AAAA,MACzB,eAAe,UAAU;AAAA,MACzB,cAAc,UAAU;AAAA,MACxB;AAAA,IACF,CAAC;AAED,UAAM,WAAW,OAAO,YAAY;AACpC,QAAI;AACJ,QAAI;AACF;AAAC,OAAC,EAAE,KAAK,IAAI,MAAM,KAAK,sBAAsB,YAAY,QAAQ,YAAY,QAAQ;AAAA,IACxF,SAAS,KAAK;AACZ,UAAI,uBAAuB,GAAG,EAAG,OAAM,KAAK,YAAY,oBAAoB,IAAI,MAAM;AACtF,YAAM;AAAA,IACR;AAEA,UAAM,KAAK,YAAY,oBAAoB,OAAO,KAAK,EAAE,CAAC;AAE1D,UAAM,QAAQ,MAAM,KAAK,YAAY,aAAa,MAAM,YAAY,IAAI;AAExE,UAAM,KAAK,YAAY,kBAAkB,IAAI;AAE7C,UAAM,OAAO,OAAO,QAAQ,IAAI,oBAAoB,IAAI;AACxD,UAAM,mBAAmB,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,KAAK,GAAI;AACzE,UAAM,EAAE,SAAS,OAAO,oBAAoB,IAAI,MAAM,KAAK,YAAY,cAAc,MAAM,gBAAgB;AAE3G,UAAM,QAAQ,QAAQ;AAAA,MACpB,KAAK,OAAO,KAAK,EAAE;AAAA,MACnB,KAAK,OAAO,QAAQ,EAAE;AAAA,MACtB,UAAU,YAAY;AAAA,MACtB,OAAO,KAAK,iBAAiB,OAAO,KAAK,cAAc,IAAI;AAAA,MAC3D,OAAO,KAAK;AAAA,MACZ;AAAA,IACF,CAAC;AAED,SAAK,aAAa,uBAAuB;AAAA,MACvC,IAAI,OAAO,KAAK,EAAE;AAAA,MAClB,UAAU,OAAO;AAAA,MACjB,gBAAgB,OAAO;AAAA,IACzB,CAAC,EAAE,MAAM,CAAC,eAAe,OAAO,MAAM,yBAAyB,EAAE,KAAK,WAAW,CAAC,CAAC;AAEnF,WAAO;AAAA,MACL;AAAA,MACA,cAAc;AAAA,MACd;AAAA,MACA,aAAa,UAAU,aAAa;AAAA,MACpC,UAAU,OAAO,YAAY;AAAA,MAC7B,gBAAgB,OAAO;AAAA,IACzB;AAAA,EACF;AAAA,EAEA,MAAc,oBAAoB,QAAgD;AAChF,QAAI,CAAC,OAAO,gBAAiB,QAAO;AAEpC,UAAM,YAAY,MAAM,KAAK,wBAAwB;AAAA,MACnD,OAAO;AAAA,MACP,EAAE,iBAAiB,OAAO,gBAAgB;AAAA,MAC1C,OAAO;AAAA,MACP,OAAO;AAAA,IACT;AACA,WAAQ,UAAU,mBAA8B;AAAA,EAClD;AACF;",
6
6
  "names": []
7
7
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@open-mercato/enterprise",
3
- "version": "0.8.1-develop.7296.1.2111d779db",
3
+ "version": "0.8.1-develop.7441.1.b42958b98c",
4
4
  "license": "SEE LICENSE IN LICENSE.md",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -70,12 +70,12 @@
70
70
  "@dnd-kit/core": "^6.3.1",
71
71
  "@dnd-kit/sortable": "^10.0.0",
72
72
  "@dnd-kit/utilities": "^3.2.2",
73
- "@open-mercato/ai-assistant": "0.8.1-develop.7296.1.2111d779db",
74
- "@open-mercato/core": "0.8.1-develop.7296.1.2111d779db",
75
- "@open-mercato/queue": "0.8.1-develop.7296.1.2111d779db",
76
- "@open-mercato/scheduler": "0.8.1-develop.7296.1.2111d779db",
77
- "@open-mercato/ui": "0.8.1-develop.7296.1.2111d779db",
78
- "@open-mercato/web-research": "0.8.1-develop.7296.1.2111d779db",
73
+ "@open-mercato/ai-assistant": "0.8.1-develop.7441.1.b42958b98c",
74
+ "@open-mercato/core": "0.8.1-develop.7441.1.b42958b98c",
75
+ "@open-mercato/queue": "0.8.1-develop.7441.1.b42958b98c",
76
+ "@open-mercato/scheduler": "0.8.1-develop.7441.1.b42958b98c",
77
+ "@open-mercato/ui": "0.8.1-develop.7441.1.b42958b98c",
78
+ "@open-mercato/web-research": "0.8.1-develop.7441.1.b42958b98c",
79
79
  "@simplewebauthn/browser": "^13.3.0",
80
80
  "@simplewebauthn/server": "^13.3.2",
81
81
  "@simplewebauthn/types": "^12.0.0",
@@ -87,13 +87,13 @@
87
87
  },
88
88
  "peerDependencies": {
89
89
  "@mikro-orm/core": "^7.0.14",
90
- "@open-mercato/shared": "0.8.1-develop.7296.1.2111d779db",
90
+ "@open-mercato/shared": "0.8.1-develop.7441.1.b42958b98c",
91
91
  "react": "^19.0.0",
92
92
  "react-dom": "^19.0.0",
93
93
  "zod": ">=3.23.0"
94
94
  },
95
95
  "devDependencies": {
96
- "@open-mercato/shared": "0.8.1-develop.7296.1.2111d779db",
96
+ "@open-mercato/shared": "0.8.1-develop.7441.1.b42958b98c",
97
97
  "@types/jest": "^30.0.0",
98
98
  "@types/react": "^19.2.18",
99
99
  "@types/react-dom": "^19.2.5",
@@ -4,6 +4,7 @@ import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
4
4
  import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
5
5
  import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
6
6
  import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
7
+ import { resolveSingleOrganizationIdOrDeny } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
7
8
  import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
8
9
  import { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'
9
10
  import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
@@ -69,7 +70,7 @@ export async function POST(req: Request, ctx: RouteContext) {
69
70
  // Fail-closed single-org attribution (same rule as the playground run route):
70
71
  // an execution must land in exactly one organization's ledger/caseload.
71
72
  const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })
72
- const organizationId = scope?.selectedId ?? auth.orgId ?? null
73
+ const organizationId = resolveSingleOrganizationIdOrDeny(scope, auth) ?? null
73
74
  if (!organizationId) {
74
75
  return NextResponse.json(
75
76
  { error: 'Select a single organization before starting a process.' },
@@ -2,6 +2,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
2
2
  import type { AwilixContainer } from 'awilix'
3
3
  import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
4
4
  import { computeEmailHash } from '@open-mercato/core/modules/auth/lib/emailHash'
5
+ import { lockAuthorizationState } from '@open-mercato/core/modules/auth/lib/authorizationStateLocks'
5
6
  import {
6
7
  provisionAgentPrincipalSchema,
7
8
  type ProvisionAgentPrincipalInput,
@@ -100,37 +101,6 @@ export async function provisionAgentPrincipal(
100
101
  await tem.flush()
101
102
  }
102
103
 
103
- // The scoped role's ACL grants the agent's least-privilege features (merged
104
- // idempotently on re-provision), never super-admin.
105
- const existingAcl = await findOneWithDecryption(
106
- tem,
107
- auth.RoleAcl,
108
- { role, tenantId },
109
- {},
110
- { tenantId, organizationId: null },
111
- )
112
- if (!existingAcl) {
113
- tem.persist(
114
- tem.create(auth.RoleAcl, {
115
- role,
116
- tenantId,
117
- featuresJson: parsed.roleFeatures,
118
- isSuperAdmin: false,
119
- organizationsJson: [organizationId],
120
- createdAt: new Date(),
121
- }),
122
- )
123
- await tem.flush()
124
- } else {
125
- const current = Array.isArray(existingAcl.featuresJson) ? existingAcl.featuresJson : []
126
- const merged = Array.from(new Set([...current, ...parsed.roleFeatures]))
127
- if (merged.length !== current.length) {
128
- existingAcl.featuresJson = merged
129
- tem.persist(existingAcl)
130
- await tem.flush()
131
- }
132
- }
133
-
134
104
  // ── Non-interactive agent User (find-or-create, idempotent) ───────────────
135
105
  const agentEmail = buildAgentUserEmail(parsed.agentDefinitionId, organizationId)
136
106
  let user = existingPrincipal
@@ -171,6 +141,42 @@ export async function provisionAgentPrincipal(
171
141
  throw new Error('[internal] resolved a non-agent User for an agent principal')
172
142
  }
173
143
 
144
+ await lockAuthorizationState(tem, {
145
+ userIds: [String(user.id)],
146
+ roleIds: [String(role.id)],
147
+ })
148
+
149
+ // The scoped role's ACL grants the agent's least-privilege features (merged
150
+ // idempotently on re-provision), never super-admin.
151
+ const existingAcl = await findOneWithDecryption(
152
+ tem,
153
+ auth.RoleAcl,
154
+ { role, tenantId },
155
+ {},
156
+ { tenantId, organizationId: null },
157
+ )
158
+ if (!existingAcl) {
159
+ tem.persist(
160
+ tem.create(auth.RoleAcl, {
161
+ role,
162
+ tenantId,
163
+ featuresJson: parsed.roleFeatures,
164
+ isSuperAdmin: false,
165
+ organizationsJson: [organizationId],
166
+ createdAt: new Date(),
167
+ }),
168
+ )
169
+ await tem.flush()
170
+ } else {
171
+ const current = Array.isArray(existingAcl.featuresJson) ? existingAcl.featuresJson : []
172
+ const merged = Array.from(new Set([...current, ...parsed.roleFeatures]))
173
+ if (merged.length !== current.length) {
174
+ existingAcl.featuresJson = merged
175
+ tem.persist(existingAcl)
176
+ await tem.flush()
177
+ }
178
+ }
179
+
174
180
  // Link the agent User to its scoped role (idempotent).
175
181
  const existingLink = await findOneWithDecryption(
176
182
  tem,
@@ -22,6 +22,26 @@ export function isEmailNotVerifiedError(err: unknown): err is EmailNotVerifiedEr
22
22
  return !!err && typeof err === 'object' && (err as Record<symbol, unknown>)[EMAIL_NOT_VERIFIED_ERROR_MARKER] === true
23
23
  }
24
24
 
25
+ const SSO_ROLES_REVOKED_ERROR_MARKER = Symbol.for('@open-mercato/sso/SsoRolesRevokedError')
26
+
27
+ /**
28
+ * Login denial raised after the IdP resolved no mapped roles. The revoked SSO
29
+ * grants are already committed; `userId` lets the caller drop cached RBAC for
30
+ * sessions that still hold the revoked roles.
31
+ */
32
+ export class SsoRolesRevokedError extends Error {
33
+ readonly [SSO_ROLES_REVOKED_ERROR_MARKER] = true
34
+
35
+ constructor(readonly userId: string, message: string) {
36
+ super(message)
37
+ this.name = 'SsoRolesRevokedError'
38
+ }
39
+ }
40
+
41
+ export function isSsoRolesRevokedError(err: unknown): err is SsoRolesRevokedError {
42
+ return !!err && typeof err === 'object' && (err as Record<symbol, unknown>)[SSO_ROLES_REVOKED_ERROR_MARKER] === true
43
+ }
44
+
25
45
  export type SsoCallbackErrorCode = 'sso_email_not_verified' | 'sso_failed'
26
46
 
27
47
  /**
@@ -4,9 +4,11 @@ import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
4
4
  import { computeEmailHash } from '@open-mercato/core/modules/auth/lib/emailHash'
5
5
  import { SsoConfig, SsoIdentity, SsoRoleGrant, ScimToken } from '../data/entities'
6
6
  import { emitSsoEvent } from '../events'
7
- import { EmailNotVerifiedError } from '../lib/errors'
7
+ import { EmailNotVerifiedError, SsoRolesRevokedError } from '../lib/errors'
8
8
  import type { SsoIdentityPayload } from '../lib/types'
9
9
  import { createLogger } from '@open-mercato/shared/lib/logger'
10
+ import { conflict } from '@open-mercato/shared/lib/crud/errors'
11
+ import { lockUserRoleWriterAuthorizationState } from '@open-mercato/core/modules/auth/lib/authorizationStateLocks'
10
12
 
11
13
  const logger = createLogger('sso').child({ component: 'account-linking' })
12
14
 
@@ -193,14 +195,25 @@ export class AccountLinkingService {
193
195
  const hasMappings = config.appRoleMappings && Object.keys(config.appRoleMappings).length > 0
194
196
  if (!hasMappings) return
195
197
 
196
- await this.syncMappedRoles(em, user, config, tenantId, idpGroups)
197
-
198
- const hasAnySsoRole = await em.findOne(SsoRoleGrant, {
199
- userId: user.id,
200
- ssoConfigId: config.id,
201
- })
198
+ const synchronize = async (transactionalEm: EntityManager): Promise<boolean> => {
199
+ const managedUser = typeof transactionalEm.getReference === 'function'
200
+ ? transactionalEm.getReference(User, String(user.id))
201
+ : user
202
+ await this.syncMappedRoles(transactionalEm, managedUser, config, tenantId, idpGroups)
203
+ const remainingGrant = await transactionalEm.findOne(SsoRoleGrant, {
204
+ userId: user.id,
205
+ ssoConfigId: config.id,
206
+ })
207
+ return remainingGrant !== null
208
+ }
209
+ const hasAnySsoRole = typeof em.isInTransaction === 'function' && em.isInTransaction()
210
+ ? await synchronize(em)
211
+ : await em.transactional(synchronize)
202
212
  if (!hasAnySsoRole) {
203
- throw new Error('No roles could be resolved from IdP groups — login denied. Configure role mappings or ensure the IdP sends matching group claims.')
213
+ throw new SsoRolesRevokedError(
214
+ String(user.id),
215
+ 'No roles could be resolved from IdP groups — login denied. Configure role mappings or ensure the IdP sends matching group claims.',
216
+ )
204
217
  }
205
218
  }
206
219
 
@@ -218,31 +231,56 @@ export class AccountLinkingService {
218
231
  const resolvedTenantId = tenantId || user.tenantId || ''
219
232
  if (!resolvedTenantId) return
220
233
 
221
- const allRoles = await em.find(Role, { tenantId: resolvedTenantId, deletedAt: null } as FilterQuery<Role>)
222
- const roleByNormalizedName = new Map<string, Role>()
223
- for (const role of allRoles) {
224
- const normalized = normalizeToken(role.name)
225
- if (normalized) roleByNormalizedName.set(normalized, role)
226
- }
227
-
228
- // Resolve desired role IDs from IdP groups using merged mappings
229
234
  const desiredRoleNames = resolveRoleNamesFromIdpGroups(idpGroups, config.appRoleMappings)
230
- const desiredRoleIds = new Set<string>()
231
- for (const roleName of desiredRoleNames) {
232
- const role = roleByNormalizedName.get(roleName)
233
- if (role) desiredRoleIds.add(role.id)
234
- }
235
+ let allRoles = await em.find(Role, {
236
+ tenantId: resolvedTenantId,
237
+ deletedAt: null,
238
+ } as FilterQuery<Role>)
239
+ let desiredRoleIds = resolveActiveRoleIds(allRoles, desiredRoleNames)
235
240
 
236
241
  // Query current SSO grants for this user+config
237
- const existingGrants = await em.find(SsoRoleGrant, {
242
+ let existingGrants = await em.find(SsoRoleGrant, {
238
243
  userId: user.id,
239
244
  ssoConfigId: config.id,
240
245
  })
246
+ let allUserRoles = await em.find(UserRole, { user: user.id } as FilterQuery<UserRole>)
247
+ const lockedRoleIds = new Set([
248
+ ...desiredRoleIds,
249
+ ...existingGrants.map((grant) => grant.roleId),
250
+ ...allUserRoles
251
+ .filter((userRole) => userRole.deletedAt)
252
+ .map((userRole) => String(userRole.role?.id ?? userRole.role)),
253
+ ])
254
+ await lockUserRoleWriterAuthorizationState(em, {
255
+ userIds: [String(user.id)],
256
+ roleIds: Array.from(lockedRoleIds),
257
+ })
258
+ allRoles = await em.find(Role, {
259
+ tenantId: resolvedTenantId,
260
+ deletedAt: null,
261
+ } as FilterQuery<Role>, { refresh: true })
262
+ existingGrants = await em.find(SsoRoleGrant, {
263
+ userId: user.id,
264
+ ssoConfigId: config.id,
265
+ }, { refresh: true })
266
+ allUserRoles = await em.find(
267
+ UserRole,
268
+ { user: user.id } as FilterQuery<UserRole>,
269
+ { refresh: true },
270
+ )
271
+
272
+ desiredRoleIds = resolveActiveRoleIds(allRoles, desiredRoleNames)
241
273
  const existingGrantedRoleIds = new Set(existingGrants.map((g) => g.roleId))
242
274
 
243
275
  // Compute diff
244
276
  const toAdd = [...desiredRoleIds].filter((id) => !existingGrantedRoleIds.has(id))
245
277
  const toRemove = existingGrants.filter((g) => !desiredRoleIds.has(g.roleId))
278
+ const softDeletedUserRoles = allUserRoles.filter((userRole) => userRole.deletedAt)
279
+ assertRoleMutationFootprintWasLocked([
280
+ ...desiredRoleIds,
281
+ ...toRemove.map((grant) => grant.roleId),
282
+ ...softDeletedUserRoles.map((userRole) => String(userRole.role?.id ?? userRole.role)),
283
+ ], lockedRoleIds)
246
284
 
247
285
  // Add new roles
248
286
  for (const roleId of toAdd) {
@@ -273,14 +311,11 @@ export class AccountLinkingService {
273
311
  }
274
312
 
275
313
  // Clean up orphaned soft-deleted UserRole rows (ghost rows from previous soft-delete logic)
276
- const allUserRoles = await em.find(UserRole, { user: user.id } as FilterQuery<UserRole>)
277
- for (const ur of allUserRoles) {
278
- if (ur.deletedAt) {
279
- em.remove(ur)
280
- }
314
+ for (const userRole of softDeletedUserRoles) {
315
+ em.remove(userRole)
281
316
  }
282
317
 
283
- if (toAdd.length > 0 || toRemove.length > 0 || allUserRoles.some((ur) => ur.deletedAt)) {
318
+ if (toAdd.length > 0 || toRemove.length > 0 || softDeletedUserRoles.length > 0) {
284
319
  await em.flush()
285
320
  }
286
321
  }
@@ -294,8 +329,34 @@ export class AccountLinkingService {
294
329
  if (existingLink) return
295
330
 
296
331
  const userRole = em.create(UserRole, { user, role, createdAt: new Date() })
297
- await em.persist(userRole).flush()
332
+ em.persist(userRole)
333
+ }
334
+ }
335
+
336
+ function assertRoleMutationFootprintWasLocked(
337
+ roleIds: Iterable<string>,
338
+ lockedRoleIds: ReadonlySet<string>,
339
+ ): void {
340
+ for (const roleId of roleIds) {
341
+ if (!lockedRoleIds.has(roleId)) {
342
+ throw conflict('[internal] Authorization state changed while acquiring its lock footprint')
343
+ }
344
+ }
345
+ }
346
+
347
+ function resolveActiveRoleIds(roles: Role[], desiredRoleNames: string[]): Set<string> {
348
+ const roleByNormalizedName = new Map<string, Role>()
349
+ for (const role of roles) {
350
+ const normalized = normalizeToken(role.name)
351
+ if (normalized) roleByNormalizedName.set(normalized, role)
352
+ }
353
+
354
+ const desiredRoleIds = new Set<string>()
355
+ for (const roleName of desiredRoleNames) {
356
+ const role = roleByNormalizedName.get(roleName)
357
+ if (role) desiredRoleIds.add(role.id)
298
358
  }
359
+ return desiredRoleIds
299
360
  }
300
361
 
301
362
  function resolveRoleNamesFromIdpGroups(
@@ -9,6 +9,7 @@ import type { SsoProviderRegistry } from '../lib/registry'
9
9
  import type { AccountLinkingService } from './accountLinkingService'
10
10
  import { encryptStateCookie, decryptStateCookie, createFlowState } from '../lib/state-cookie'
11
11
  import { emitSsoEvent } from '../events'
12
+ import { isSsoRolesRevokedError } from '../lib/errors'
12
13
  import type { TenantDataEncryptionService } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
13
14
  import { createLogger } from '@open-mercato/shared/lib/logger'
14
15
 
@@ -122,7 +123,13 @@ export class SsoService {
122
123
  })
123
124
 
124
125
  const tenantId = config.tenantId ?? ''
125
- const { user } = await this.accountLinkingService.resolveUser(config, idpPayload, tenantId)
126
+ let user: Awaited<ReturnType<AccountLinkingService['resolveUser']>>['user']
127
+ try {
128
+ ;({ user } = await this.accountLinkingService.resolveUser(config, idpPayload, tenantId))
129
+ } catch (err) {
130
+ if (isSsoRolesRevokedError(err)) await this.rbacService.invalidateUserCache(err.userId)
131
+ throw err
132
+ }
126
133
 
127
134
  await this.rbacService.invalidateUserCache(String(user.id))
128
135