@open-mercato/core 0.10.1-develop.7669.1.120a2cf7f1 → 0.10.1-develop.7670.1.7b5ad74924

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
-[build:core] found 5991 entry points
+[build:core] found 5992 entry points
 [build:core] built successfully
 [build:core:generated] found 266 entry points
 [build:core:generated] built successfully

package/dist/modules/customers/commands/interactions.js

@@ -40,7 +40,8 @@ import {
   INTERACTION_STATUS_COMPLETED,
   INTERACTION_STATUS_PLANNED
 } from "../lib/interactionStatus.js";
-import { canChangeEmailVisibility } from "../lib/visibilityFilter.js";
+import { canChangeEmailVisibility, isEmailHiddenFrom } from "../lib/visibilityFilter.js";
+import { listGrantsForViewerOnPerson, listSharedChannelIds } from "../lib/conversationShares.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
 import { loadCustomFieldDefinitionIndex } from "@open-mercato/shared/lib/crud/custom-fields";
 import { resolveCatalogEventType, resolveScopedCalendarEventTypes } from "../lib/calendar/eventTypeResolver.js";
@@ -73,9 +74,56 @@ const interactionCrudEvents = {
 const INTERACTION_UNDO_DATE_OPTIONS = {
   datePaths: ["before.interaction.scheduledAt", "before.interaction.occurredAt", "before.interaction.recurrenceEnd"]
 };
-async function loadInteractionSnapshot(em, id) {
+async function ensureInteractionMutationAccess(ctx, em, interaction) {
+  ensureTenantScope(ctx, interaction.tenantId);
+  ensureOrganizationScope(ctx, interaction.organizationId);
+  const currentUserId = ctx.auth?.isApiKey ? null : ctx.auth?.sub ?? null;
+  const personEntityId = "entityId" in interaction ? interaction.entityId : typeof interaction.entity === "string" ? interaction.entity : interaction.entity.id;
+  const visibility = {
+    interactionType: interaction.interactionType,
+    visibility: interaction.visibility,
+    authorUserId: interaction.authorUserId,
+    currentUserId,
+    personEntityId,
+    channelId: interaction.channelId
+  };
+  if (!isEmailHiddenFrom(visibility)) return;
+  const scope = { tenantId: interaction.tenantId, organizationId: interaction.organizationId };
+  const sharedConversations = await listGrantsForViewerOnPerson(em, scope, currentUserId, personEntityId);
+  const sharedChannelIds = await listSharedChannelIds(em, scope, currentUserId);
+  if (isEmailHiddenFrom({ ...visibility, sharedConversations, sharedChannelIds })) {
+    const { translate } = await resolveTranslations();
+    throw notFound(translate("customers.errors.entity_not_found", "Entity not found"));
+  }
+}
+async function ensureInteractionPrivacyChangeAccess(ctx, interaction, next) {
+  if (interaction.interactionType !== "email") return;
+  const actorUserId = ctx.auth?.isApiKey ? null : ctx.auth?.sub ?? null;
+  const changesOwnership = next.authorUserId !== void 0 && (next.authorUserId ?? null) !== (interaction.authorUserId ?? null);
+  const changesType = next.interactionType !== void 0 && next.interactionType !== interaction.interactionType;
+  if ((changesOwnership || changesType) && (!actorUserId || actorUserId !== interaction.authorUserId) || next.visibility !== void 0 && !canChangeEmailVisibility({
+    interactionType: interaction.interactionType,
+    currentVisibility: interaction.visibility,
+    nextVisibility: next.visibility,
+    authorUserId: interaction.authorUserId,
+    actorUserId,
+    userFeatures: void 0
+  })) {
+    const { translate } = await resolveTranslations();
+    throw notFound(translate("customers.errors.entity_not_found", "Entity not found"));
+  }
+}
+async function ensureInteractionRestoreAccess(ctx, em, current, restored) {
+  if (current) {
+    await ensureInteractionMutationAccess(ctx, em, current);
+    await ensureInteractionPrivacyChangeAccess(ctx, current, { ...restored, visibility: restored.visibility ?? null });
+  }
+  await ensureInteractionMutationAccess(ctx, em, { ...restored, channelId: current?.channelId });
+}
+async function loadInteractionSnapshot(em, id, ctx) {
   const interaction = await findOneWithDecryption(em, CustomerInteraction, { id }, { populate: ["entity"] });
   if (!interaction) return null;
+  if (ctx) await ensureInteractionMutationAccess(ctx, em, interaction);
   const custom = await loadCustomFieldSnapshot(em, {
     entityId: INTERACTION_ENTITY_ID,
     recordId: interaction.id,
@@ -422,6 +470,7 @@ const createInteractionCommand = {
     const result = await runInTransaction(em, async (trx) => {
       const record = await findOneWithDecryption(trx, CustomerInteraction, { id: interactionId });
       if (!record) return null;
+      await ensureInteractionMutationAccess(ctx, trx, record);
       const entityId = typeof record.entity === "string" ? record.entity : record.entity.id;
       trx.remove(record);
       await trx.flush();
@@ -451,6 +500,7 @@ const createInteractionCommand = {
     const { interaction, nextInteractionId } = await runInTransaction(em, async (trx) => {
       const entity = await requireTimelineParentEntity(trx, after.interaction.entityId, { tenantId: after.interaction.tenantId, organizationId: after.interaction.organizationId });
       let interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: after.interaction.id });
+      await ensureInteractionRestoreAccess(ctx, trx, interaction2, after.interaction);
       if (!interaction2) {
         interaction2 = buildInteractionGraph(trx, {
           id: after.interaction.id,
@@ -555,7 +605,7 @@ const createInteractionCommand = {
 async function prepareUpdateInteractionSnapshot(rawInput, ctx) {
   const { parsed } = parseWithCustomFields(interactionUpdateSchema, rawInput);
   const em = ctx.transactionalEm ?? ctx.container.resolve("em").fork();
-  const snapshot = await loadInteractionSnapshot(em, parsed.id);
+  const snapshot = await loadInteractionSnapshot(em, parsed.id, ctx);
   return snapshot ? { before: snapshot } : {};
 }
 const updateInteractionCommand = {
@@ -573,12 +623,14 @@ const updateInteractionCommand = {
       }
       ensureTenantScope(ctx, interaction2.tenantId);
       ensureOrganizationScope(ctx, interaction2.organizationId);
+      await ensureInteractionMutationAccess(ctx, trx, interaction2);
       await enforceCommandOptimisticLockWithGuards(ctx.container, {
         resourceKind: "customers.interaction",
         resourceId: interaction2.id,
         current: interaction2.updatedAt,
         request: ctx.request ?? null
       });
+      await ensureInteractionPrivacyChangeAccess(ctx, interaction2, parsed);
       const nextType = parsed.interactionType ?? interaction2.interactionType;
       const changingType = nextType !== interaction2.interactionType;
       const enforceSelectableType = requestsSelectableTypeEnforcement(rawInput);
@@ -637,21 +689,6 @@ const updateInteractionCommand = {
         ignoreHiddenClears: enforceSelectableType
       });
       const sameTypeCustom = changingType || !customKeys || !enforceSelectableType ? custom : Object.fromEntries(Object.entries(custom).filter(([key]) => !customKeys.defined.has(key.toLowerCase()) || customKeys.allowed.has(key.toLowerCase())));
-      if (parsed.visibility !== void 0 && interaction2.interactionType === "email" && (parsed.visibility ?? null) !== (interaction2.visibility ?? null)) {
-        const actorUserId = ctx.auth?.sub ?? null;
-        if (!canChangeEmailVisibility({
-          interactionType: interaction2.interactionType,
-          currentVisibility: interaction2.visibility,
-          nextVisibility: parsed.visibility,
-          authorUserId: interaction2.authorUserId,
-          actorUserId,
-          // v1 strict owner-only: only the author may flip visibility; no admin
-          // bypass (canChangeEmailVisibility ignores caller features in v1).
-          userFeatures: void 0
-        })) {
-          throw notFound("Email not found");
-        }
-      }
       const previousEntityId = typeof interaction2.entity === "string" ? interaction2.entity : interaction2.entity.id;
       const nextEntity = parsed.entityId !== void 0 && parsed.entityId !== previousEntityId ? await requireTimelineParentEntity(trx, parsed.entityId, {
         tenantId: interaction2.tenantId,
@@ -773,6 +810,7 @@ const updateInteractionCommand = {
     const em = ctx.container.resolve("em").fork();
     const { interaction, projections } = await runInTransaction(em, async (trx) => {
       let interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
+      await ensureInteractionRestoreAccess(ctx, trx, interaction2, before.interaction);
       const entity = await requireTimelineParentEntity(trx, before.interaction.entityId, { tenantId: before.interaction.tenantId, organizationId: before.interaction.organizationId });
       if (!interaction2) {
         interaction2 = trx.create(CustomerInteraction, {
@@ -890,7 +928,7 @@ const completeInteractionCommand = {
   async prepare(rawInput, ctx) {
     const parsed = interactionCompleteSchema.parse(rawInput);
     const em = ctx.container.resolve("em").fork();
-    const snapshot = await loadInteractionSnapshot(em, parsed.id);
+    const snapshot = await loadInteractionSnapshot(em, parsed.id, ctx);
     return snapshot ? { before: snapshot } : {};
   },
   async execute(rawInput, ctx) {
@@ -904,6 +942,7 @@ const completeInteractionCommand = {
       }
       ensureTenantScope(ctx, interaction2.tenantId);
       ensureOrganizationScope(ctx, interaction2.organizationId);
+      await ensureInteractionMutationAccess(ctx, trx, interaction2);
       await enforceCommandOptimisticLockWithGuards(ctx.container, {
         resourceKind: "customers.interaction",
         resourceId: interaction2.id,
@@ -979,6 +1018,7 @@ const completeInteractionCommand = {
     const result = await runInTransaction(em, async (trx) => {
       const interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
       if (!interaction) return null;
+      await ensureInteractionMutationAccess(ctx, trx, interaction);
       interaction.status = before.interaction.status;
       interaction.occurredAt = before.interaction.occurredAt;
       await trx.flush();
@@ -1019,7 +1059,7 @@ const cancelInteractionCommand = {
   async prepare(rawInput, ctx) {
     const parsed = interactionCancelSchema.parse(rawInput);
     const em = ctx.container.resolve("em").fork();
-    const snapshot = await loadInteractionSnapshot(em, parsed.id);
+    const snapshot = await loadInteractionSnapshot(em, parsed.id, ctx);
     return snapshot ? { before: snapshot } : {};
   },
   async execute(rawInput, ctx) {
@@ -1033,6 +1073,7 @@ const cancelInteractionCommand = {
       }
       ensureTenantScope(ctx, interaction2.tenantId);
       ensureOrganizationScope(ctx, interaction2.organizationId);
+      await ensureInteractionMutationAccess(ctx, trx, interaction2);
       await enforceCommandOptimisticLockWithGuards(ctx.container, {
         resourceKind: "customers.interaction",
         resourceId: interaction2.id,
@@ -1106,6 +1147,7 @@ const cancelInteractionCommand = {
     const result = await runInTransaction(em, async (trx) => {
       const interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
       if (!interaction) return null;
+      await ensureInteractionMutationAccess(ctx, trx, interaction);
       interaction.status = before.interaction.status;
       await trx.flush();
       const projection = await recomputeNextInteraction(trx, before.interaction.entityId);
@@ -1145,7 +1187,7 @@ const deleteInteractionCommand = {
   async prepare(input, ctx) {
     const id = requireId(input, "Interaction id required");
     const em = ctx.container.resolve("em").fork();
-    const snapshot = await loadInteractionSnapshot(em, id);
+    const snapshot = await loadInteractionSnapshot(em, id, ctx);
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
@@ -1159,6 +1201,7 @@ const deleteInteractionCommand = {
       }
       ensureTenantScope(ctx, interaction2.tenantId);
       ensureOrganizationScope(ctx, interaction2.organizationId);
+      await ensureInteractionMutationAccess(ctx, trx, interaction2);
       await enforceCommandOptimisticLockWithGuards(ctx.container, {
         resourceKind: "customers.interaction",
         resourceId: interaction2.id,
@@ -1220,6 +1263,7 @@ const deleteInteractionCommand = {
     const { interaction, nextInteractionId } = await runInTransaction(em, async (trx) => {
       const entity = await requireTimelineParentEntity(trx, before.interaction.entityId, { tenantId: before.interaction.tenantId, organizationId: before.interaction.organizationId });
       let interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
+      await ensureInteractionRestoreAccess(ctx, trx, interaction2, before.interaction);
       if (!interaction2) {
         interaction2 = trx.create(CustomerInteraction, {
           id: before.interaction.id,