@open-mercato/core 0.6.6-develop.6543.1.49fadb4c31 → 0.6.6

package/dist/modules/attachments/lib/requestScope.js

@@ -1,10 +0,0 @@
-import { resolveOrganizationScopeForRequest } from "@open-mercato/core/modules/directory/utils/organizationScope";
-async function resolveAttachmentOrganizationId(container, auth, request) {
-  if (!auth) return null;
-  const scope = await resolveOrganizationScopeForRequest({ container, auth, request });
-  return scope?.selectedId ?? auth.orgId ?? null;
-}
-export {
-  resolveAttachmentOrganizationId
-};
-//# sourceMappingURL=requestScope.js.map

package/dist/modules/attachments/lib/requestScope.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/modules/attachments/lib/requestScope.ts"],
-  "sourcesContent": ["import type { AwilixContainer } from 'awilix'\nimport type { AuthContext } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\n\n/**\n * Resolve the organization an attachment request should act within.\n *\n * `auth.orgId` alone is NOT selected-organization aware for non-superadmin\n * principals: `applySuperAdminScope` only rewrites `orgId` from the\n * `om_selected_org` cookie for superadmins, so a regular multi-org admin who\n * switches the header organization keeps `auth.orgId` pinned to their own home\n * organization. The CRUD factory and other org-scoped routes derive the active\n * organization via `resolveOrganizationScopeForRequest` (cookie-driven and\n * RBAC-validated for ALL users, falling back to the home org when the selection\n * is absent or inaccessible). Attachments must do the same so uploaded files\n * land under \u2014 and are read back from \u2014 the currently selected organization\n * rather than the uploader's home organization (#3765).\n */\nexport async function resolveAttachmentOrganizationId(\n  container: AwilixContainer,\n  auth: AuthContext,\n  request: Request,\n): Promise<string | null> {\n  if (!auth) return null\n  const scope = await resolveOrganizationScopeForRequest({ container, auth, request })\n  return scope?.selectedId ?? auth.orgId ?? null\n}\n"],
-  "mappings": "AAEA,SAAS,0CAA0C;AAgBnD,eAAsB,gCACpB,WACA,MACA,SACwB;AACxB,MAAI,CAAC,KAAM,QAAO;AAClB,QAAM,QAAQ,MAAM,mCAAmC,EAAE,WAAW,MAAM,QAAQ,CAAC;AACnF,SAAO,OAAO,cAAc,KAAK,SAAS;AAC5C;",
-  "names": []
-}

package/dist/modules/customers/components/detail/useDealsAccess.js

@@ -1,16 +0,0 @@
-"use client";
-import * as React from "react";
-import { useBackendChrome } from "@open-mercato/ui/backend/BackendChromeProvider";
-import { hasFeature } from "@open-mercato/shared/security/features";
-function useDealsAccess() {
-  const { payload, isReady } = useBackendChrome();
-  const canViewDeals = React.useMemo(
-    () => hasFeature(payload?.grantedFeatures ?? [], "customers.deals.view"),
-    [payload?.grantedFeatures]
-  );
-  return { canViewDeals, isReady };
-}
-export {
-  useDealsAccess
-};
-//# sourceMappingURL=useDealsAccess.js.map

package/dist/modules/customers/components/detail/useDealsAccess.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../src/modules/customers/components/detail/useDealsAccess.ts"],
-  "sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport { useBackendChrome } from '@open-mercato/ui/backend/BackendChromeProvider'\nimport { hasFeature } from '@open-mercato/shared/security/features'\n\nexport type DealsAccess = {\n  canViewDeals: boolean\n  isReady: boolean\n}\n\nexport function useDealsAccess(): DealsAccess {\n  const { payload, isReady } = useBackendChrome()\n  const canViewDeals = React.useMemo(\n    () => hasFeature(payload?.grantedFeatures ?? [], 'customers.deals.view'),\n    [payload?.grantedFeatures],\n  )\n  return { canViewDeals, isReady }\n}\n"],
-  "mappings": ";AAEA,YAAY,WAAW;AACvB,SAAS,wBAAwB;AACjC,SAAS,kBAAkB;AAOpB,SAAS,iBAA8B;AAC5C,QAAM,EAAE,SAAS,QAAQ,IAAI,iBAAiB;AAC9C,QAAM,eAAe,MAAM;AAAA,IACzB,MAAM,WAAW,SAAS,mBAAmB,CAAC,GAAG,sBAAsB;AAAA,IACvE,CAAC,SAAS,eAAe;AAAA,EAC3B;AACA,SAAO,EAAE,cAAc,QAAQ;AACjC;",
-  "names": []
-}

package/src/modules/attachments/lib/reconcileOrganization.ts

@@ -1,188 +0,0 @@
-import type { EntityManager } from '@mikro-orm/postgresql'
-import { createLogger } from '@open-mercato/shared/lib/logger'
-import type { QueryEngine } from '@open-mercato/shared/lib/query/types'
-import { Attachment } from '../data/entities'
-
-const logger = createLogger('attachments').child({ component: 'reconcileOrganization' })
-
-/**
- * Virtual entity id for library attachments — these are not attached to a
- * parent record that owns an organization, so there is nothing to reconcile
- * against. They are counted as skipped rather than unresolved.
- */
-const LIBRARY_ENTITY_ID = 'attachments:library'
-
-const DEFAULT_BATCH_SIZE = 500
-
-export type AttachmentOrgReconcileEntityStat = {
-  scanned: number
-  updated: number
-  unresolved: number
-}
-
-export type AttachmentOrgReconcileReport = {
-  scanned: number
-  updated: number
-  unresolved: number
-  skippedVirtual: number
-  byEntity: Record<string, AttachmentOrgReconcileEntityStat>
-}
-
-type AttachmentScanRow = {
-  id: string
-  entity_id: string | null
-  record_id: string | null
-  organization_id: string | null
-}
-
-function readParentOrganizationId(record: Record<string, unknown>): string | null {
-  const raw = record['organization_id'] ?? record['organizationId']
-  if (typeof raw === 'string' && raw.trim().length) return raw.trim()
-  return null
-}
-
-function ensureBucket(
-  report: AttachmentOrgReconcileReport,
-  entityId: string,
-): AttachmentOrgReconcileEntityStat {
-  const existing = report.byEntity[entityId]
-  if (existing) return existing
-  const bucket: AttachmentOrgReconcileEntityStat = { scanned: 0, updated: 0, unresolved: 0 }
-  report.byEntity[entityId] = bucket
-  return bucket
-}
-
-/**
- * Reconcile the `organization_id` of existing attachments to the organization
- * of the record they are attached to.
- *
- * Background (#3765): before the upload route became selected-organization
- * aware, a multi-org admin who switched the header organization uploaded files
- * that were silently stored under their *home* organization instead of the
- * selected one (the organization of the parent record). Those rows are now
- * invisible to org-scoped reads and stay orphaned. This heals them forward.
- *
- * The parent record's organization is the ground truth: an attachment is not
- * distinguishable from a legitimately home-org one by looking at the attachment
- * alone. Parent organizations are resolved generically through the Query Engine
- * by `entityId` (works for both base and custom entities, tenant-scoped and
- * organization-agnostic so the parent's real org is returned regardless of
- * which org the caller sits in) — the same mechanism the attachments module
- * already uses to enrich assignment details.
- *
- * The reconciliation is:
- * - idempotent — rows already matching their parent are left untouched;
- * - conservative — when the parent org cannot be resolved (unregistered
- *   entity id, hard-deleted parent, parent without an org column) the row is
- *   counted as `unresolved` and left as-is rather than guessed at;
- * - tenant-scoped — it reconciles every attachment in the tenant across all
- *   organizations (the whole point is moving rows between orgs).
- *
- * Writes go through the passed `EntityManager` (which the caller runs inside a
- * transaction) so the whole reconciliation commits atomically.
- */
-export async function reconcileAttachmentOrganizations(opts: {
-  em: EntityManager
-  queryEngine: QueryEngine
-  tenantId: string
-  batchSize?: number
-}): Promise<AttachmentOrgReconcileReport> {
-  const { em, queryEngine, tenantId } = opts
-  const batchSize = opts.batchSize && opts.batchSize > 0 ? opts.batchSize : DEFAULT_BATCH_SIZE
-  const report: AttachmentOrgReconcileReport = {
-    scanned: 0,
-    updated: 0,
-    unresolved: 0,
-    skippedVirtual: 0,
-    byEntity: {},
-  }
-
-  const rows = (await em.getConnection().execute(
-    'select id, entity_id, record_id, organization_id from attachments where tenant_id = ?',
-    [tenantId],
-  )) as AttachmentScanRow[]
-  report.scanned = rows.length
-  if (!rows.length) return report
-
-  const groups = new Map<string, AttachmentScanRow[]>()
-  for (const row of rows) {
-    if (!row.id || !row.entity_id || !row.record_id) continue
-    const list = groups.get(row.entity_id) ?? []
-    list.push(row)
-    groups.set(row.entity_id, list)
-  }
-
-  const pendingUpdates: Array<{ id: string; organizationId: string }> = []
-
-  for (const [entityId, group] of groups) {
-    const bucket = ensureBucket(report, entityId)
-    bucket.scanned += group.length
-
-    if (entityId === LIBRARY_ENTITY_ID) {
-      report.skippedVirtual += group.length
-      continue
-    }
-
-    const recordIds = Array.from(
-      new Set(group.map((row) => row.record_id).filter((value): value is string => !!value)),
-    )
-    const parentOrgByRecordId = new Map<string, string | null>()
-    let resolvable = true
-
-    for (let index = 0; index < recordIds.length; index += batchSize) {
-      const chunk = recordIds.slice(index, index + batchSize)
-      try {
-        const result = await queryEngine.query(entityId as any, {
-          fields: ['id', 'organization_id'],
-          filters: { id: chunk.length === 1 ? { $eq: chunk[0] } : { $in: chunk } },
-          tenantId,
-          withDeleted: true,
-          page: { pageSize: Math.max(chunk.length, 1) },
-        })
-        for (const item of result.items ?? []) {
-          const record = item as Record<string, unknown>
-          const recordId = record.id != null ? String(record.id) : null
-          if (!recordId) continue
-          parentOrgByRecordId.set(recordId, readParentOrganizationId(record))
-        }
-      } catch (error) {
-        resolvable = false
-        logger.warn('org reconcile: cannot resolve parent organization for entity', {
-          entityId,
-          error,
-        })
-        break
-      }
-    }
-
-    if (!resolvable) {
-      bucket.unresolved += group.length
-      report.unresolved += group.length
-      continue
-    }
-
-    for (const row of group) {
-      const target = row.record_id ? parentOrgByRecordId.get(row.record_id) : null
-      if (!target) {
-        bucket.unresolved += 1
-        report.unresolved += 1
-        continue
-      }
-      if ((row.organization_id ?? null) === target) continue
-      pendingUpdates.push({ id: row.id, organizationId: target })
-      bucket.updated += 1
-      report.updated += 1
-    }
-  }
-
-  for (let index = 0; index < pendingUpdates.length; index += batchSize) {
-    const chunk = pendingUpdates.slice(index, index + batchSize)
-    for (const update of chunk) {
-      const reference = em.getReference(Attachment, update.id)
-      reference.organizationId = update.organizationId
-    }
-    await em.flush()
-  }
-
-  return report
-}

package/src/modules/attachments/lib/requestScope.ts

@@ -1,27 +0,0 @@
-import type { AwilixContainer } from 'awilix'
-import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
-import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
-
-/**
- * Resolve the organization an attachment request should act within.
- *
- * `auth.orgId` alone is NOT selected-organization aware for non-superadmin
- * principals: `applySuperAdminScope` only rewrites `orgId` from the
- * `om_selected_org` cookie for superadmins, so a regular multi-org admin who
- * switches the header organization keeps `auth.orgId` pinned to their own home
- * organization. The CRUD factory and other org-scoped routes derive the active
- * organization via `resolveOrganizationScopeForRequest` (cookie-driven and
- * RBAC-validated for ALL users, falling back to the home org when the selection
- * is absent or inaccessible). Attachments must do the same so uploaded files
- * land under — and are read back from — the currently selected organization
- * rather than the uploader's home organization (#3765).
- */
-export async function resolveAttachmentOrganizationId(
-  container: AwilixContainer,
-  auth: AuthContext,
-  request: Request,
-): Promise<string | null> {
-  if (!auth) return null
-  const scope = await resolveOrganizationScopeForRequest({ container, auth, request })
-  return scope?.selectedId ?? auth.orgId ?? null
-}

package/src/modules/customers/components/detail/useDealsAccess.ts

@@ -1,19 +0,0 @@
-"use client"
-
-import * as React from 'react'
-import { useBackendChrome } from '@open-mercato/ui/backend/BackendChromeProvider'
-import { hasFeature } from '@open-mercato/shared/security/features'
-
-export type DealsAccess = {
-  canViewDeals: boolean
-  isReady: boolean
-}
-
-export function useDealsAccess(): DealsAccess {
-  const { payload, isReady } = useBackendChrome()
-  const canViewDeals = React.useMemo(
-    () => hasFeature(payload?.grantedFeatures ?? [], 'customers.deals.view'),
-    [payload?.grantedFeatures],
-  )
-  return { canViewDeals, isReady }
-}