@open-mercato/core 0.7.0 → 0.7.1-develop.7103.1.41ff100d93

package/dist/modules/devices/api/admin/devices/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/modules/devices/api/admin/devices/route.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { isOrganizationReadAccessAllowed } from '@open-mercato/core/modules/directory/utils/organizationScopeGuard'\nimport { User } from '@open-mercato/core/modules/auth/data/entities'\nimport { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { E } from '#generated/entities.ids.generated'\nimport { UserDevice } from '../../../data/entities'\nimport {\n  registerDeviceAdminSchema,\n  registerDeviceCommandSchema,\n  type RegisterDeviceCommandInput,\n} from '../../../data/validators'\nimport { resolveDeviceActorUserId } from '../../auth'\nimport { createDevicesCrudOpenApi, createPagedListResponseSchema } from '../../openapi'\nimport { deviceListSchema, deviceListFields, deviceListSortFieldMap, deviceListItemSchema } from '../../deviceList'\nimport { executeRegister, type DeviceMutationContext } from '../../deviceOps'\n\nconst logger = createLogger('devices')\n\n// Admin device administration: cross-user listing + register-on-behalf-of-user. Gated by devices.admin.\n// Self-serve registration/listing stays on /api/devices (scoped to the acting user).\nconst routeMetadata = {\n  GET: { requireAuth: true, requireFeatures: ['devices.admin'] },\n  POST: { requireAuth: true, requireFeatures: ['devices.admin'] },\n}\n\nexport const metadata = routeMetadata\n\nconst crud = makeCrudRoute({\n  metadata: routeMetadata,\n  orm: {\n    entity: UserDevice,\n    idField: 'id',\n    // organization_id stays nullable, but scoping follows the standard org-scoped pattern: the factory\n    // auto-filters by the caller's organization scope (null-aware in the query engine). Unrestricted\n    // admins see the whole tenant including null-org rows; org-restricted admins see only their orgs.\n    orgField: 'organizationId',\n    tenantField: 'tenantId',\n    softDeleteField: 'deletedAt',\n  },\n  indexer: { entityType: E.devices.user_device },\n  // Same cache resource tag as the self route + commands, so any device write busts both list caches.\n  events: { module: 'devices', entity: 'user_device' },\n  list: {\n    schema: deviceListSchema,\n    entityId: E.devices.user_device,\n    fields: deviceListFields,\n    sortFieldMap: deviceListSortFieldMap,\n    // Tenant + org scope is enforced by the factory (orm.tenantField + orm.orgField); only the optional\n    // userId/platform narrowing is left to do here.\n    buildFilters: async (query) => {\n      const filters: Record<string, unknown> = {}\n      if (query.userId) filters.user_id = { $eq: query.userId }\n      if (query.platform) filters.platform = { $eq: query.platform }\n      return filters\n    },\n  },\n})\n\nexport const GET = crud.GET\n\nexport async function POST(req: Request) {\n  const { translate } = await resolveTranslations()\n  try {\n    const container = await createRequestContainer()\n    const auth = await getAuthFromRequest(req)\n    const actorUserId = resolveDeviceActorUserId(auth)\n    if (!auth || !auth.tenantId || !actorUserId) {\n      return NextResponse.json({ error: translate('devices.errors.unauthorized', 'Unauthorized') }, { status: 401 })\n    }\n\n    const body = registerDeviceAdminSchema.parse(await readJsonSafe(req, {}))\n    const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n    const organizationId = scope?.selectedId ?? auth.orgId ?? null\n\n    // Validate the on-behalf-of target before registering. `body.userId` is caller-supplied, and the\n    // fan-out delivers by `(tenant, org, user)` \u2014 so without this an admin could register their OWN push\n    // token under an arbitrary `userId` (even a non-existent or cross-tenant one) and start receiving that\n    // user's notifications. Require a real, active user in the admin's tenant who is also within the\n    // admin's organization scope (org-restricted admins cannot reach users in orgs they can't access).\n    // Only non-encrypted columns are selected, so no decryption is needed.\n    const em = container.resolve('em') as EntityManager\n    const targetUser = await em.findOne(\n      User,\n      { id: body.userId, tenantId: auth.tenantId, deletedAt: null },\n      { fields: ['id', 'organizationId'] },\n    )\n    if (!targetUser) {\n      return NextResponse.json(\n        { error: translate('devices.errors.user_not_found', 'Target user not found in this tenant') },\n        { status: 400 },\n      )\n    }\n    if (!isOrganizationReadAccessAllowed({ scope, auth, organizationId: targetUser.organizationId ?? null })) {\n      return NextResponse.json({ error: translate('devices.errors.forbidden', 'Access denied') }, { status: 403 })\n    }\n\n    // Register is an idempotent upsert keyed per (tenant, org, user, device). organizationId is the\n    // admin's own resolved scope, so the upsert can only ever touch a row inside an org the admin can\n    // access \u2014 no cross-org guard is needed here.\n    const commandInput = registerDeviceCommandSchema.parse({\n      ...body,\n      tenantId: auth.tenantId,\n      organizationId,\n      userId: body.userId,\n    } satisfies RegisterDeviceCommandInput)\n\n    // actorUserId is the admin (for the mutation guard/audit); the device is owned by body.userId.\n    const mctx: DeviceMutationContext = { container, auth, scope, organizationId, actorUserId, request: req }\n    return await executeRegister(mctx, commandInput)\n  } catch (err) {\n    if (err instanceof z.ZodError) {\n      return NextResponse.json(\n        { error: translate('devices.errors.invalid_payload', 'Invalid device payload'), details: err.flatten() },\n        { status: 400 },\n      )\n    }\n    if (isCrudHttpError(err) && (err.body as { code?: string } | undefined)?.code === 'device_already_registered') {\n      return NextResponse.json(\n        { error: translate('devices.errors.already_registered', 'This device is already registered') },\n        { status: 409 },\n      )\n    }\n    if (isCrudHttpError(err)) {\n      return NextResponse.json(err.body, { status: err.status })\n    }\n    logger.error('devices.admin.POST failed', { err })\n    return NextResponse.json(\n      { error: translate('devices.errors.register_failed', 'Failed to register device') },\n      { status: 500 },\n    )\n  }\n}\n\nconst registerResponseSchema = z.object({\n  id: z.string().uuid(),\n  deviceId: z.string(),\n  revived: z.boolean(),\n})\n\nexport const openApi: OpenApiRouteDoc = createDevicesCrudOpenApi({\n  resourceName: 'Device (admin)',\n  pluralName: 'Devices (admin)',\n  querySchema: deviceListSchema,\n  listResponseSchema: createPagedListResponseSchema(deviceListItemSchema),\n  create: {\n    schema: registerDeviceAdminSchema,\n    responseSchema: registerResponseSchema,\n    description: 'Admin: register (idempotently upsert) a device on behalf of any user in the tenant.',\n  },\n})\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'\nimport { toHeaderLabel } from '@open-mercato/shared/lib/crud/exporters'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { isOrganizationReadAccessAllowed } from '@open-mercato/core/modules/directory/utils/organizationScopeGuard'\nimport { User } from '@open-mercato/core/modules/auth/data/entities'\nimport { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { E } from '#generated/entities.ids.generated'\nimport { UserDevice } from '../../../data/entities'\nimport {\n  registerDeviceAdminSchema,\n  registerDeviceCommandSchema,\n  type RegisterDeviceCommandInput,\n} from '../../../data/validators'\nimport { resolveDeviceActorUserId } from '../../auth'\nimport { createDevicesCrudOpenApi, createPagedListResponseSchema } from '../../openapi'\nimport {\n  deviceListSchema,\n  deviceListFields,\n  deviceListSortFieldMap,\n  deviceListItemSchema,\n  deviceExportColumnFields,\n  transformDeviceListItem,\n} from '../../deviceList'\nimport { executeRegister, type DeviceMutationContext } from '../../deviceOps'\n\nconst logger = createLogger('devices')\n\n// Admin device administration: cross-user listing + register-on-behalf-of-user. Gated by devices.admin.\n// Self-serve registration/listing stays on /api/devices (scoped to the acting user).\nconst routeMetadata = {\n  GET: { requireAuth: true, requireFeatures: ['devices.admin'] },\n  POST: { requireAuth: true, requireFeatures: ['devices.admin'] },\n}\n\nexport const metadata = routeMetadata\n\nconst crud = makeCrudRoute({\n  metadata: routeMetadata,\n  orm: {\n    entity: UserDevice,\n    idField: 'id',\n    // organization_id stays nullable, but scoping follows the standard org-scoped pattern: the factory\n    // auto-filters by the caller's organization scope (null-aware in the query engine). Unrestricted\n    // admins see the whole tenant including null-org rows; org-restricted admins see only their orgs.\n    orgField: 'organizationId',\n    tenantField: 'tenantId',\n    softDeleteField: 'deletedAt',\n  },\n  indexer: { entityType: E.devices.user_device },\n  // Same cache resource tag as the self route + commands, so any device write busts both list caches.\n  events: { module: 'devices', entity: 'user_device' },\n  list: {\n    schema: deviceListSchema,\n    entityId: E.devices.user_device,\n    fields: deviceListFields,\n    sortFieldMap: deviceListSortFieldMap,\n    // The query engine projects raw column names; expose them in camelCase like every other module.\n    transformItem: transformDeviceListItem,\n    // Without an explicit column set the factory's default export spreads each item, so the deprecated\n    // snake_case aliases would double every column in the CSV/JSON/XML export.\n    export: { columns: deviceExportColumnFields.map((field) => ({ field, header: toHeaderLabel(field) })) },\n    // Tenant + org scope is enforced by the factory (orm.tenantField + orm.orgField); only the optional\n    // userId/platform narrowing is left to do here.\n    buildFilters: async (query) => {\n      const filters: Record<string, unknown> = {}\n      if (query.userId) filters.user_id = { $eq: query.userId }\n      if (query.platform) filters.platform = { $eq: query.platform }\n      return filters\n    },\n  },\n})\n\nexport const GET = crud.GET\n\nexport async function POST(req: Request) {\n  const { translate } = await resolveTranslations()\n  try {\n    const container = await createRequestContainer()\n    const auth = await getAuthFromRequest(req)\n    const actorUserId = resolveDeviceActorUserId(auth)\n    if (!auth || !auth.tenantId || !actorUserId) {\n      return NextResponse.json({ error: translate('devices.errors.unauthorized', 'Unauthorized') }, { status: 401 })\n    }\n\n    const body = registerDeviceAdminSchema.parse(await readJsonSafe(req, {}))\n    const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n    const organizationId = scope?.selectedId ?? auth.orgId ?? null\n\n    // Validate the on-behalf-of target before registering. `body.userId` is caller-supplied, and the\n    // fan-out delivers by `(tenant, org, user)` \u2014 so without this an admin could register their OWN push\n    // token under an arbitrary `userId` (even a non-existent or cross-tenant one) and start receiving that\n    // user's notifications. Require a real, active user in the admin's tenant who is also within the\n    // admin's organization scope (org-restricted admins cannot reach users in orgs they can't access).\n    // Only non-encrypted columns are selected, so no decryption is needed.\n    const em = container.resolve('em') as EntityManager\n    const targetUser = await em.findOne(\n      User,\n      { id: body.userId, tenantId: auth.tenantId, deletedAt: null },\n      { fields: ['id', 'organizationId'] },\n    )\n    if (!targetUser) {\n      return NextResponse.json(\n        { error: translate('devices.errors.user_not_found', 'Target user not found in this tenant') },\n        { status: 400 },\n      )\n    }\n    if (!isOrganizationReadAccessAllowed({ scope, auth, organizationId: targetUser.organizationId ?? null })) {\n      return NextResponse.json({ error: translate('devices.errors.forbidden', 'Access denied') }, { status: 403 })\n    }\n\n    // Register is an idempotent upsert keyed per (tenant, org, user, device). organizationId is the\n    // admin's own resolved scope, so the upsert can only ever touch a row inside an org the admin can\n    // access \u2014 no cross-org guard is needed here.\n    const commandInput = registerDeviceCommandSchema.parse({\n      ...body,\n      tenantId: auth.tenantId,\n      organizationId,\n      userId: body.userId,\n    } satisfies RegisterDeviceCommandInput)\n\n    // actorUserId is the admin (for the mutation guard/audit); the device is owned by body.userId.\n    const mctx: DeviceMutationContext = { container, auth, scope, organizationId, actorUserId, request: req }\n    return await executeRegister(mctx, commandInput)\n  } catch (err) {\n    if (err instanceof z.ZodError) {\n      return NextResponse.json(\n        { error: translate('devices.errors.invalid_payload', 'Invalid device payload'), details: err.flatten() },\n        { status: 400 },\n      )\n    }\n    if (isCrudHttpError(err) && (err.body as { code?: string } | undefined)?.code === 'device_already_registered') {\n      return NextResponse.json(\n        { error: translate('devices.errors.already_registered', 'This device is already registered') },\n        { status: 409 },\n      )\n    }\n    if (isCrudHttpError(err)) {\n      return NextResponse.json(err.body, { status: err.status })\n    }\n    logger.error('devices.admin.POST failed', { err })\n    return NextResponse.json(\n      { error: translate('devices.errors.register_failed', 'Failed to register device') },\n      { status: 500 },\n    )\n  }\n}\n\nconst registerResponseSchema = z.object({\n  id: z.string().uuid(),\n  deviceId: z.string(),\n  revived: z.boolean(),\n})\n\nexport const openApi: OpenApiRouteDoc = createDevicesCrudOpenApi({\n  resourceName: 'Device (admin)',\n  pluralName: 'Devices (admin)',\n  querySchema: deviceListSchema,\n  listResponseSchema: createPagedListResponseSchema(deviceListItemSchema),\n  create: {\n    schema: registerDeviceAdminSchema,\n    responseSchema: registerResponseSchema,\n    description: 'Admin: register (idempotently upsert) a device on behalf of any user in the tenant.',\n  },\n})\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/devices/api/deviceList.js

@@ -23,31 +23,118 @@ const deviceListFields = [
   "created_at",
   "updated_at"
 ];
+const deviceExportColumnFields = [
+  "id",
+  "tenantId",
+  "organizationId",
+  "userId",
+  "deviceId",
+  "platform",
+  "clientAppVersion",
+  "osVersion",
+  "locale",
+  "pushProvider",
+  "pushTokenUpdatedAt",
+  "lastSeenAt",
+  "createdAt",
+  "updatedAt"
+];
 const deviceListSortFieldMap = {
   lastSeenAt: "last_seen_at",
   createdAt: "created_at",
   updatedAt: "updated_at"
 };
+function transformDeviceListItem(item) {
+  const record = toRecord(item);
+  if (!Object.keys(record).length) return item;
+  const camel = {
+    id: readString(record, "id", "id"),
+    tenantId: readString(record, "tenant_id", "tenantId"),
+    organizationId: readString(record, "organization_id", "organizationId"),
+    userId: readString(record, "user_id", "userId"),
+    deviceId: readString(record, "device_id", "deviceId"),
+    platform: readString(record, "platform", "platform"),
+    clientAppVersion: readString(record, "client_app_version", "clientAppVersion"),
+    osVersion: readString(record, "os_version", "osVersion"),
+    locale: readString(record, "locale", "locale"),
+    pushProvider: readString(record, "push_provider", "pushProvider"),
+    pushTokenUpdatedAt: toIso(record.push_token_updated_at ?? record.pushTokenUpdatedAt),
+    lastSeenAt: toIso(record.last_seen_at ?? record.lastSeenAt),
+    createdAt: toIso(record.created_at ?? record.createdAt),
+    updatedAt: toIso(record.updated_at ?? record.updatedAt)
+  };
+  return { ...record, ...camel, ...toDeprecatedSnakeCaseAliases(camel) };
+}
+function toDeprecatedSnakeCaseAliases(item) {
+  const aliases = {
+    tenant_id: item.tenantId,
+    organization_id: item.organizationId,
+    user_id: item.userId,
+    device_id: item.deviceId,
+    client_app_version: item.clientAppVersion,
+    os_version: item.osVersion,
+    push_provider: item.pushProvider,
+    push_token_updated_at: item.pushTokenUpdatedAt,
+    last_seen_at: item.lastSeenAt,
+    created_at: item.createdAt,
+    updated_at: item.updatedAt
+  };
+  for (const key of Object.keys(aliases)) {
+    if (aliases[key] === void 0) delete aliases[key];
+  }
+  return aliases;
+}
+function toRecord(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+function readString(record, snakeKey, camelKey) {
+  const value = record[snakeKey] ?? record[camelKey];
+  return typeof value === "string" ? value : null;
+}
+function toIso(value) {
+  if (value instanceof Date) return Number.isNaN(value.getTime()) ? null : value.toISOString();
+  if (typeof value === "string") {
+    const date = new Date(value);
+    return Number.isNaN(date.getTime()) ? value : date.toISOString();
+  }
+  return null;
+}
+const deprecatedAlias = (of) => `Deprecated alias for \`${of}\`; removed in the next minor release.`;
 const deviceListItemSchema = z.object({
   id: z.string().uuid(),
-  tenant_id: z.string().uuid(),
-  organization_id: z.string().uuid().nullable().optional(),
-  user_id: z.string().uuid(),
-  device_id: z.string(),
+  tenantId: z.string().uuid(),
+  organizationId: z.string().uuid().nullable().optional(),
+  userId: z.string().uuid(),
+  deviceId: z.string(),
   platform: z.enum(["ios", "android", "web"]),
-  client_app_version: z.string().nullable().optional(),
-  os_version: z.string().nullable().optional(),
+  clientAppVersion: z.string().nullable().optional(),
+  osVersion: z.string().nullable().optional(),
   locale: z.string().nullable().optional(),
-  push_provider: z.string().nullable().optional(),
-  push_token_updated_at: z.string().nullable().optional(),
-  last_seen_at: z.string().nullable().optional(),
-  created_at: z.string().nullable().optional(),
-  updated_at: z.string().nullable().optional()
+  pushProvider: z.string().nullable().optional(),
+  pushTokenUpdatedAt: z.string().nullable().optional(),
+  lastSeenAt: z.string().nullable().optional(),
+  createdAt: z.string().nullable().optional(),
+  updatedAt: z.string().nullable().optional(),
+  tenant_id: z.string().uuid().describe(deprecatedAlias("tenantId")),
+  organization_id: z.string().uuid().nullable().optional().describe(deprecatedAlias("organizationId")),
+  user_id: z.string().uuid().describe(deprecatedAlias("userId")),
+  device_id: z.string().describe(deprecatedAlias("deviceId")),
+  client_app_version: z.string().nullable().optional().describe(deprecatedAlias("clientAppVersion")),
+  os_version: z.string().nullable().optional().describe(deprecatedAlias("osVersion")),
+  push_provider: z.string().nullable().optional().describe(deprecatedAlias("pushProvider")),
+  push_token_updated_at: z.string().nullable().optional().describe(deprecatedAlias("pushTokenUpdatedAt")),
+  last_seen_at: z.string().nullable().optional().describe(deprecatedAlias("lastSeenAt")),
+  created_at: z.string().nullable().optional().describe(deprecatedAlias("createdAt")),
+  updated_at: z.string().nullable().optional().describe(deprecatedAlias("updatedAt"))
 });
 export {
+  deviceExportColumnFields,
   deviceListFields,
   deviceListItemSchema,
   deviceListSchema,
-  deviceListSortFieldMap
+  deviceListSortFieldMap,
+  toDeprecatedSnakeCaseAliases,
+  toIso,
+  transformDeviceListItem
 };
 //# sourceMappingURL=deviceList.js.map

package/dist/modules/devices/api/deviceList.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/devices/api/deviceList.ts"],
-  "sourcesContent": ["import { z } from 'zod'\n\n// Shared list contract for the self-serve (`/api/devices`) and admin (`/api/devices/admin/devices`)\n// list routes. push_token is a secret and is never part of the exposed field set.\nexport const deviceListSchema = z\n  .object({\n    page: z.coerce.number().min(1).default(1),\n    pageSize: z.coerce.number().min(1).max(100).default(50),\n    platform: z.enum(['ios', 'android', 'web']).optional(),\n    userId: z.string().uuid().optional(),\n    sortField: z.string().optional(),\n    sortDir: z.enum(['asc', 'desc']).optional(),\n  })\n  .passthrough()\n\nexport const deviceListFields: string[] = [\n  'id',\n  'tenant_id',\n  'organization_id',\n  'user_id',\n  'device_id',\n  'platform',\n  'client_app_version',\n  'os_version',\n  'locale',\n  'push_provider',\n  'push_token_updated_at',\n  'last_seen_at',\n  'created_at',\n  'updated_at',\n]\n\nexport const deviceListSortFieldMap: Record<string, string> = {\n  lastSeenAt: 'last_seen_at',\n  createdAt: 'created_at',\n  updatedAt: 'updated_at',\n}\n\nexport const deviceListItemSchema = z.object({\n  id: z.string().uuid(),\n  tenant_id: z.string().uuid(),\n  organization_id: z.string().uuid().nullable().optional(),\n  user_id: z.string().uuid(),\n  device_id: z.string(),\n  platform: z.enum(['ios', 'android', 'web']),\n  client_app_version: z.string().nullable().optional(),\n  os_version: z.string().nullable().optional(),\n  locale: z.string().nullable().optional(),\n  push_provider: z.string().nullable().optional(),\n  push_token_updated_at: z.string().nullable().optional(),\n  last_seen_at: z.string().nullable().optional(),\n  created_at: z.string().nullable().optional(),\n  updated_at: z.string().nullable().optional(),\n})\n"],
-  "mappings": "AAAA,SAAS,SAAS;AAIX,MAAM,mBAAmB,EAC7B,OAAO;AAAA,EACN,MAAM,EAAE,OAAO,OAAO,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC;AAAA,EACxC,UAAU,EAAE,OAAO,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,QAAQ,EAAE;AAAA,EACtD,UAAU,EAAE,KAAK,CAAC,OAAO,WAAW,KAAK,CAAC,EAAE,SAAS;AAAA,EACrD,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS;AAAA,EACnC,WAAW,EAAE,OAAO,EAAE,SAAS;AAAA,EAC/B,SAAS,EAAE,KAAK,CAAC,OAAO,MAAM,CAAC,EAAE,SAAS;AAC5C,CAAC,EACA,YAAY;AAER,MAAM,mBAA6B;AAAA,EACxC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,yBAAiD;AAAA,EAC5D,YAAY;AAAA,EACZ,WAAW;AAAA,EACX,WAAW;AACb;AAEO,MAAM,uBAAuB,EAAE,OAAO;AAAA,EAC3C,IAAI,EAAE,OAAO,EAAE,KAAK;AAAA,EACpB,WAAW,EAAE,OAAO,EAAE,KAAK;AAAA,EAC3B,iBAAiB,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS;AAAA,EACvD,SAAS,EAAE,OAAO,EAAE,KAAK;AAAA,EACzB,WAAW,EAAE,OAAO;AAAA,EACpB,UAAU,EAAE,KAAK,CAAC,OAAO,WAAW,KAAK,CAAC;AAAA,EAC1C,oBAAoB,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAAA,EACnD,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAAA,EAC3C,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAAA,EACvC,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAAA,EAC9C,uBAAuB,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAAA,EACtD,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAAA,EAC7C,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAAA,EAC3C,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AAC7C,CAAC;",
+  "sourcesContent": ["import { z } from 'zod'\n\n// Shared list contract for the self-serve (`/api/devices`) and admin (`/api/devices/admin/devices`)\n// list routes. push_token is a secret and is never part of the exposed field set.\nexport const deviceListSchema = z\n  .object({\n    page: z.coerce.number().min(1).default(1),\n    pageSize: z.coerce.number().min(1).max(100).default(50),\n    platform: z.enum(['ios', 'android', 'web']).optional(),\n    userId: z.string().uuid().optional(),\n    sortField: z.string().optional(),\n    sortDir: z.enum(['asc', 'desc']).optional(),\n  })\n  .passthrough()\n\nexport const deviceListFields: string[] = [\n  'id',\n  'tenant_id',\n  'organization_id',\n  'user_id',\n  'device_id',\n  'platform',\n  'client_app_version',\n  'os_version',\n  'locale',\n  'push_provider',\n  'push_token_updated_at',\n  'last_seen_at',\n  'created_at',\n  'updated_at',\n]\n\n// The admin list enables exports, and the factory's default export derives its columns by spreading\n// each item \u2014 which would emit both spellings of every aliased key. Pin the canonical camelCase set\n// so the export stays single-spelled and does not change shape when the aliases are dropped.\nexport const deviceExportColumnFields: string[] = [\n  'id',\n  'tenantId',\n  'organizationId',\n  'userId',\n  'deviceId',\n  'platform',\n  'clientAppVersion',\n  'osVersion',\n  'locale',\n  'pushProvider',\n  'pushTokenUpdatedAt',\n  'lastSeenAt',\n  'createdAt',\n  'updatedAt',\n]\n\nexport const deviceListSortFieldMap: Record<string, string> = {\n  lastSeenAt: 'last_seen_at',\n  createdAt: 'created_at',\n  updatedAt: 'updated_at',\n}\n\n// The query engine projects the raw column names listed in `deviceListFields`. Every other module\n// serializes its list items in camelCase (`sales/orders` \u2192 `orderNumber`, `warranty_claims` \u2192\n// `claimNumber`), so the list routes run this transform to expose the platform convention (#5513).\n// The snake_case keys stay alongside as deprecated aliases for one minor version, per the\n// deprecation protocol in BACKWARD_COMPATIBILITY.md \u00A7 7 (API Route URLs \u2014 response fields).\nexport function transformDeviceListItem(item: unknown): unknown {\n  const record = toRecord(item)\n  if (!Object.keys(record).length) return item\n  const camel = {\n    id: readString(record, 'id', 'id'),\n    tenantId: readString(record, 'tenant_id', 'tenantId'),\n    organizationId: readString(record, 'organization_id', 'organizationId'),\n    userId: readString(record, 'user_id', 'userId'),\n    deviceId: readString(record, 'device_id', 'deviceId'),\n    platform: readString(record, 'platform', 'platform'),\n    clientAppVersion: readString(record, 'client_app_version', 'clientAppVersion'),\n    osVersion: readString(record, 'os_version', 'osVersion'),\n    locale: readString(record, 'locale', 'locale'),\n    pushProvider: readString(record, 'push_provider', 'pushProvider'),\n    pushTokenUpdatedAt: toIso(record.push_token_updated_at ?? record.pushTokenUpdatedAt),\n    lastSeenAt: toIso(record.last_seen_at ?? record.lastSeenAt),\n    createdAt: toIso(record.created_at ?? record.createdAt),\n    updatedAt: toIso(record.updated_at ?? record.updatedAt),\n  }\n  // Spread the raw record first so anything the projection carries beyond the declared field set\n  // (custom-field keys, future columns) survives; the aliases then restate the snake_case keys with\n  // the same normalized values as their camelCase counterparts.\n  return { ...record, ...camel, ...toDeprecatedSnakeCaseAliases(camel) }\n}\n\n/**\n * @deprecated Snake_case device response keys are superseded by the camelCase keys and are removed in\n * the next minor release. Read `deviceId`, `userId`, `lastSeenAt`, \u2026 instead. See UPGRADE_NOTES.md.\n */\nexport function toDeprecatedSnakeCaseAliases(item: DeviceResponseItem): Record<string, unknown> {\n  const aliases: Record<string, unknown> = {\n    tenant_id: item.tenantId,\n    organization_id: item.organizationId,\n    user_id: item.userId,\n    device_id: item.deviceId,\n    client_app_version: item.clientAppVersion,\n    os_version: item.osVersion,\n    push_provider: item.pushProvider,\n    push_token_updated_at: item.pushTokenUpdatedAt,\n    last_seen_at: item.lastSeenAt,\n    created_at: item.createdAt,\n    updated_at: item.updatedAt,\n  }\n  // The detail response never carried tenant/org, so an absent camelCase source must not grow a new\n  // key here \u2014 only keys the caller actually supplied get an alias.\n  for (const key of Object.keys(aliases)) {\n    if (aliases[key] === undefined) delete aliases[key]\n  }\n  return aliases\n}\n\nexport type DeviceResponseItem = {\n  tenantId?: string | null\n  organizationId?: string | null\n  userId: string | null\n  deviceId: string | null\n  clientAppVersion: string | null\n  osVersion: string | null\n  pushProvider: string | null\n  pushTokenUpdatedAt?: string | null\n  lastSeenAt?: string | null\n  createdAt?: string | null\n  updatedAt: string | null\n}\n\nfunction toRecord(value: unknown): Record<string, unknown> {\n  return value && typeof value === 'object' && !Array.isArray(value) ? (value as Record<string, unknown>) : {}\n}\n\nfunction readString(record: Record<string, unknown>, snakeKey: string, camelKey: string): string | null {\n  const value = record[snakeKey] ?? record[camelKey]\n  return typeof value === 'string' ? value : null\n}\n\nexport function toIso(value: unknown): string | null {\n  if (value instanceof Date) return Number.isNaN(value.getTime()) ? null : value.toISOString()\n  if (typeof value === 'string') {\n    const date = new Date(value)\n    return Number.isNaN(date.getTime()) ? value : date.toISOString()\n  }\n  return null\n}\n\n// In-code contract markers. The shared zodToJsonSchema converter does not currently emit per-property\n// descriptions for object schemas, so the rendered deprecation notice lives on the endpoint description\n// (`DEPRECATED_SNAKE_CASE_NOTICE` in ./openapi); these become visible for free if that changes.\nconst deprecatedAlias = (of: string) => `Deprecated alias for \\`${of}\\`; removed in the next minor release.`\n\nexport const deviceListItemSchema = z.object({\n  id: z.string().uuid(),\n  tenantId: z.string().uuid(),\n  organizationId: z.string().uuid().nullable().optional(),\n  userId: z.string().uuid(),\n  deviceId: z.string(),\n  platform: z.enum(['ios', 'android', 'web']),\n  clientAppVersion: z.string().nullable().optional(),\n  osVersion: z.string().nullable().optional(),\n  locale: z.string().nullable().optional(),\n  pushProvider: z.string().nullable().optional(),\n  pushTokenUpdatedAt: z.string().nullable().optional(),\n  lastSeenAt: z.string().nullable().optional(),\n  createdAt: z.string().nullable().optional(),\n  updatedAt: z.string().nullable().optional(),\n  tenant_id: z.string().uuid().describe(deprecatedAlias('tenantId')),\n  organization_id: z.string().uuid().nullable().optional().describe(deprecatedAlias('organizationId')),\n  user_id: z.string().uuid().describe(deprecatedAlias('userId')),\n  device_id: z.string().describe(deprecatedAlias('deviceId')),\n  client_app_version: z.string().nullable().optional().describe(deprecatedAlias('clientAppVersion')),\n  os_version: z.string().nullable().optional().describe(deprecatedAlias('osVersion')),\n  push_provider: z.string().nullable().optional().describe(deprecatedAlias('pushProvider')),\n  push_token_updated_at: z.string().nullable().optional().describe(deprecatedAlias('pushTokenUpdatedAt')),\n  last_seen_at: z.string().nullable().optional().describe(deprecatedAlias('lastSeenAt')),\n  created_at: z.string().nullable().optional().describe(deprecatedAlias('createdAt')),\n  updated_at: z.string().nullable().optional().describe(deprecatedAlias('updatedAt')),\n})\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/devices/api/deviceSerialization.js

@@ -0,0 +1,46 @@
+import { z } from "zod";
+import { toDeprecatedSnakeCaseAliases, toIso } from "./deviceList.js";
+function serializeDeviceDetail(device) {
+  const camel = {
+    id: device.id,
+    userId: device.userId,
+    deviceId: device.deviceId,
+    platform: device.platform,
+    clientAppVersion: device.clientAppVersion ?? null,
+    osVersion: device.osVersion ?? null,
+    pushProvider: device.pushProvider ?? null,
+    pushTokenUpdatedAt: toIso(device.pushTokenUpdatedAt),
+    lastSeenAt: toIso(device.lastSeenAt),
+    createdAt: toIso(device.createdAt),
+    updatedAt: toIso(device.updatedAt)
+  };
+  return { ...camel, ...toDeprecatedSnakeCaseAliases(camel) };
+}
+const deprecatedAlias = (of) => `Deprecated alias for \`${of}\`; removed in the next minor release.`;
+const deviceDetailItemSchema = z.object({
+  id: z.string().uuid(),
+  userId: z.string().uuid(),
+  deviceId: z.string(),
+  platform: z.enum(["ios", "android", "web"]),
+  clientAppVersion: z.string().nullable(),
+  osVersion: z.string().nullable(),
+  pushProvider: z.string().nullable(),
+  pushTokenUpdatedAt: z.string().nullable(),
+  lastSeenAt: z.string().nullable(),
+  createdAt: z.string().nullable(),
+  updatedAt: z.string().nullable(),
+  user_id: z.string().uuid().describe(deprecatedAlias("userId")),
+  device_id: z.string().describe(deprecatedAlias("deviceId")),
+  client_app_version: z.string().nullable().describe(deprecatedAlias("clientAppVersion")),
+  os_version: z.string().nullable().describe(deprecatedAlias("osVersion")),
+  push_provider: z.string().nullable().describe(deprecatedAlias("pushProvider")),
+  push_token_updated_at: z.string().nullable().describe(deprecatedAlias("pushTokenUpdatedAt")),
+  last_seen_at: z.string().nullable().describe(deprecatedAlias("lastSeenAt")),
+  created_at: z.string().nullable().describe(deprecatedAlias("createdAt")),
+  updated_at: z.string().nullable().describe(deprecatedAlias("updatedAt"))
+});
+export {
+  deviceDetailItemSchema,
+  serializeDeviceDetail
+};
+//# sourceMappingURL=deviceSerialization.js.map

package/dist/modules/devices/api/deviceSerialization.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/devices/api/deviceSerialization.ts"],
+  "sourcesContent": ["import { z } from 'zod'\nimport type { UserDevice } from '../data/entities'\nimport { toDeprecatedSnakeCaseAliases, toIso } from './deviceList'\n\n// Detail contract for `GET /api/devices/admin/devices/:id`. Keys are camelCase like every other\n// module's responses (#5513); the snake_case keys stay alongside as deprecated aliases for one minor\n// version, per the deprecation protocol in BACKWARD_COMPATIBILITY.md \u00A7 7.\n// push_token is a secret and is never returned.\nexport function serializeDeviceDetail(device: UserDevice): Record<string, unknown> {\n  const camel = {\n    id: device.id,\n    userId: device.userId,\n    deviceId: device.deviceId,\n    platform: device.platform,\n    clientAppVersion: device.clientAppVersion ?? null,\n    osVersion: device.osVersion ?? null,\n    pushProvider: device.pushProvider ?? null,\n    pushTokenUpdatedAt: toIso(device.pushTokenUpdatedAt),\n    lastSeenAt: toIso(device.lastSeenAt),\n    createdAt: toIso(device.createdAt),\n    updatedAt: toIso(device.updatedAt),\n  }\n  return { ...camel, ...toDeprecatedSnakeCaseAliases(camel) }\n}\n\n// See the note in ./deviceList \u2014 the rendered deprecation notice lives on the endpoint description.\nconst deprecatedAlias = (of: string) => `Deprecated alias for \\`${of}\\`; removed in the next minor release.`\n\nexport const deviceDetailItemSchema = z.object({\n  id: z.string().uuid(),\n  userId: z.string().uuid(),\n  deviceId: z.string(),\n  platform: z.enum(['ios', 'android', 'web']),\n  clientAppVersion: z.string().nullable(),\n  osVersion: z.string().nullable(),\n  pushProvider: z.string().nullable(),\n  pushTokenUpdatedAt: z.string().nullable(),\n  lastSeenAt: z.string().nullable(),\n  createdAt: z.string().nullable(),\n  updatedAt: z.string().nullable(),\n  user_id: z.string().uuid().describe(deprecatedAlias('userId')),\n  device_id: z.string().describe(deprecatedAlias('deviceId')),\n  client_app_version: z.string().nullable().describe(deprecatedAlias('clientAppVersion')),\n  os_version: z.string().nullable().describe(deprecatedAlias('osVersion')),\n  push_provider: z.string().nullable().describe(deprecatedAlias('pushProvider')),\n  push_token_updated_at: z.string().nullable().describe(deprecatedAlias('pushTokenUpdatedAt')),\n  last_seen_at: z.string().nullable().describe(deprecatedAlias('lastSeenAt')),\n  created_at: z.string().nullable().describe(deprecatedAlias('createdAt')),\n  updated_at: z.string().nullable().describe(deprecatedAlias('updatedAt')),\n})\n"],
+  "mappings": "AAAA,SAAS,SAAS;AAElB,SAAS,8BAA8B,aAAa;AAM7C,SAAS,sBAAsB,QAA6C;AACjF,QAAM,QAAQ;AAAA,IACZ,IAAI,OAAO;AAAA,IACX,QAAQ,OAAO;AAAA,IACf,UAAU,OAAO;AAAA,IACjB,UAAU,OAAO;AAAA,IACjB,kBAAkB,OAAO,oBAAoB;AAAA,IAC7C,WAAW,OAAO,aAAa;AAAA,IAC/B,cAAc,OAAO,gBAAgB;AAAA,IACrC,oBAAoB,MAAM,OAAO,kBAAkB;AAAA,IACnD,YAAY,MAAM,OAAO,UAAU;AAAA,IACnC,WAAW,MAAM,OAAO,SAAS;AAAA,IACjC,WAAW,MAAM,OAAO,SAAS;AAAA,EACnC;AACA,SAAO,EAAE,GAAG,OAAO,GAAG,6BAA6B,KAAK,EAAE;AAC5D;AAGA,MAAM,kBAAkB,CAAC,OAAe,0BAA0B,EAAE;AAE7D,MAAM,yBAAyB,EAAE,OAAO;AAAA,EAC7C,IAAI,EAAE,OAAO,EAAE,KAAK;AAAA,EACpB,QAAQ,EAAE,OAAO,EAAE,KAAK;AAAA,EACxB,UAAU,EAAE,OAAO;AAAA,EACnB,UAAU,EAAE,KAAK,CAAC,OAAO,WAAW,KAAK,CAAC;AAAA,EAC1C,kBAAkB,EAAE,OAAO,EAAE,SAAS;AAAA,EACtC,WAAW,EAAE,OAAO,EAAE,SAAS;AAAA,EAC/B,cAAc,EAAE,OAAO,EAAE,SAAS;AAAA,EAClC,oBAAoB,EAAE,OAAO,EAAE,SAAS;AAAA,EACxC,YAAY,EAAE,OAAO,EAAE,SAAS;AAAA,EAChC,WAAW,EAAE,OAAO,EAAE,SAAS;AAAA,EAC/B,WAAW,EAAE,OAAO,EAAE,SAAS;AAAA,EAC/B,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,gBAAgB,QAAQ,CAAC;AAAA,EAC7D,WAAW,EAAE,OAAO,EAAE,SAAS,gBAAgB,UAAU,CAAC;AAAA,EAC1D,oBAAoB,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,gBAAgB,kBAAkB,CAAC;AAAA,EACtF,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,gBAAgB,WAAW,CAAC;AAAA,EACvE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,gBAAgB,cAAc,CAAC;AAAA,EAC7E,uBAAuB,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,gBAAgB,oBAAoB,CAAC;AAAA,EAC3F,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,gBAAgB,YAAY,CAAC;AAAA,EAC1E,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,gBAAgB,WAAW,CAAC;AAAA,EACvE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,gBAAgB,WAAW,CAAC;AACzE,CAAC;",
+  "names": []
+}

package/dist/modules/devices/api/openapi.js

@@ -5,14 +5,16 @@ import {
 function createPagedListResponseSchema(itemSchema) {
   return createSharedPagedListResponseSchema(itemSchema, { paginationMetaOptional: true });
 }
+const DEPRECATED_SNAKE_CASE_NOTICE = "Response keys are camelCase. The snake_case keys (`user_id`, `device_id`, `last_seen_at`, \u2026) are deprecated aliases of their camelCase counterparts, retained for one minor version and removed in the next; read `userId`, `deviceId`, `lastSeenAt`, \u2026 instead.";
 const buildDevicesCrudOpenApi = createCrudOpenApiFactory({
   defaultTag: "Devices",
-  makeListDescription: ({ pluralLower }) => `Returns the authenticated user's registered ${pluralLower} (admins may list across users).`
+  makeListDescription: ({ pluralLower }) => `Returns the authenticated user's registered ${pluralLower} (admins may list across users). ${DEPRECATED_SNAKE_CASE_NOTICE}`
 });
 function createDevicesCrudOpenApi(options) {
   return buildDevicesCrudOpenApi(options);
 }
 export {
+  DEPRECATED_SNAKE_CASE_NOTICE,
   createDevicesCrudOpenApi,
   createPagedListResponseSchema
 };

package/dist/modules/devices/api/openapi.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/devices/api/openapi.ts"],
-  "sourcesContent": ["import { type ZodTypeAny } from 'zod'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport {\n  createCrudOpenApiFactory,\n  createPagedListResponseSchema as createSharedPagedListResponseSchema,\n  type CrudOpenApiOptions,\n} from '@open-mercato/shared/lib/openapi/crud'\n\nexport function createPagedListResponseSchema(itemSchema: ZodTypeAny) {\n  return createSharedPagedListResponseSchema(itemSchema, { paginationMetaOptional: true })\n}\n\n// createCrudOpenApiFactory already falls back to the shared default create/ok response schemas\n// when omitted, so there is nothing module-specific to re-pass or re-export here.\nconst buildDevicesCrudOpenApi = createCrudOpenApiFactory({\n  defaultTag: 'Devices',\n  makeListDescription: ({ pluralLower }) =>\n    `Returns the authenticated user's registered ${pluralLower} (admins may list across users).`,\n})\n\nexport function createDevicesCrudOpenApi(options: CrudOpenApiOptions): OpenApiRouteDoc {\n  return buildDevicesCrudOpenApi(options)\n}\n"],
-  "mappings": "AAEA;AAAA,EACE;AAAA,EACA,iCAAiC;AAAA,OAE5B;AAEA,SAAS,8BAA8B,YAAwB;AACpE,SAAO,oCAAoC,YAAY,EAAE,wBAAwB,KAAK,CAAC;AACzF;AAIA,MAAM,0BAA0B,yBAAyB;AAAA,EACvD,YAAY;AAAA,EACZ,qBAAqB,CAAC,EAAE,YAAY,MAClC,+CAA+C,WAAW;AAC9D,CAAC;AAEM,SAAS,yBAAyB,SAA8C;AACrF,SAAO,wBAAwB,OAAO;AACxC;",
+  "sourcesContent": ["import { type ZodTypeAny } from 'zod'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport {\n  createCrudOpenApiFactory,\n  createPagedListResponseSchema as createSharedPagedListResponseSchema,\n  type CrudOpenApiOptions,\n} from '@open-mercato/shared/lib/openapi/crud'\n\nexport function createPagedListResponseSchema(itemSchema: ZodTypeAny) {\n  return createSharedPagedListResponseSchema(itemSchema, { paginationMetaOptional: true })\n}\n\n// createCrudOpenApiFactory already falls back to the shared default create/ok response schemas\n// when omitted, so there is nothing module-specific to re-pass or re-export here.\n// The shared zodToJsonSchema converter does not emit per-property descriptions for object schemas, so\n// the `.describe()` markers on the deprecated keys in deviceList.ts never reach the document. State the\n// deprecation in the endpoint description, which does render (#5513).\nexport const DEPRECATED_SNAKE_CASE_NOTICE =\n  'Response keys are camelCase. The snake_case keys (`user_id`, `device_id`, `last_seen_at`, \u2026) are ' +\n  'deprecated aliases of their camelCase counterparts, retained for one minor version and removed in ' +\n  'the next; read `userId`, `deviceId`, `lastSeenAt`, \u2026 instead.'\n\nconst buildDevicesCrudOpenApi = createCrudOpenApiFactory({\n  defaultTag: 'Devices',\n  makeListDescription: ({ pluralLower }) =>\n    `Returns the authenticated user's registered ${pluralLower} (admins may list across users). ${DEPRECATED_SNAKE_CASE_NOTICE}`,\n})\n\nexport function createDevicesCrudOpenApi(options: CrudOpenApiOptions): OpenApiRouteDoc {\n  return buildDevicesCrudOpenApi(options)\n}\n"],
+  "mappings": "AAEA;AAAA,EACE;AAAA,EACA,iCAAiC;AAAA,OAE5B;AAEA,SAAS,8BAA8B,YAAwB;AACpE,SAAO,oCAAoC,YAAY,EAAE,wBAAwB,KAAK,CAAC;AACzF;AAOO,MAAM,+BACX;AAIF,MAAM,0BAA0B,yBAAyB;AAAA,EACvD,YAAY;AAAA,EACZ,qBAAqB,CAAC,EAAE,YAAY,MAClC,+CAA+C,WAAW,oCAAoC,4BAA4B;AAC9H,CAAC;AAEM,SAAS,yBAAyB,SAA8C;AACrF,SAAO,wBAAwB,OAAO;AACxC;",
   "names": []
 }

package/dist/modules/devices/api/route.js

@@ -18,7 +18,13 @@ import {
 } from "../data/validators.js";
 import { resolveDeviceActorUserId } from "./auth.js";
 import { createDevicesCrudOpenApi, createPagedListResponseSchema } from "./openapi.js";
-import { deviceListSchema, deviceListFields, deviceListSortFieldMap, deviceListItemSchema } from "./deviceList.js";
+import {
+  deviceListSchema,
+  deviceListFields,
+  deviceListSortFieldMap,
+  deviceListItemSchema,
+  transformDeviceListItem
+} from "./deviceList.js";
 import { executeRegister } from "./deviceOps.js";
 const logger = createLogger("devices");
 const routeMetadata = {
@@ -52,6 +58,8 @@ const crud = makeCrudRoute({
     // push_token is a secret and is never exposed via the list API.
     fields: deviceListFields,
     sortFieldMap: deviceListSortFieldMap,
+    // The query engine projects raw column names; expose them in camelCase like every other module.
+    transformItem: transformDeviceListItem,
     // Exports are off for the self-serve list. The factory enables them for every list that does not
     // declare `export` (resolveAvailableExportFormats falls back to csv/json/xml/markdown), and its
     // full-export branch replaces the filters with `{}` instead of calling `buildFilters`

package/dist/modules/devices/api/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/devices/api/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'\nimport { consumeAdvancedFilterState, mergeAdvancedFilterTree } from '@open-mercato/shared/lib/crud/advanced-filter-integration'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { resolveLocaleFromAcceptLanguage } from '@open-mercato/shared/lib/i18n/locale'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { E } from '#generated/entities.ids.generated'\nimport { UserDevice } from '../data/entities'\nimport {\n  registerDeviceSchema,\n  registerDeviceCommandSchema,\n  type RegisterDeviceCommandInput,\n} from '../data/validators'\nimport { resolveDeviceActorUserId } from './auth'\nimport { createDevicesCrudOpenApi, createPagedListResponseSchema } from './openapi'\nimport { deviceListSchema, deviceListFields, deviceListSortFieldMap, deviceListItemSchema } from './deviceList'\nimport { executeRegister, type DeviceMutationContext } from './deviceOps'\n\nconst logger = createLogger('devices')\n\nconst routeMetadata = {\n  GET: { requireAuth: true, requireFeatures: ['devices.view'] },\n  POST: { requireAuth: true, requireFeatures: ['devices.manage'] },\n}\n\nexport const metadata = routeMetadata\n\nconst NO_MATCH_USER_ID = '00000000-0000-0000-0000-000000000000'\n\nconst crud = makeCrudRoute({\n  metadata: routeMetadata,\n  orm: {\n    entity: UserDevice,\n    idField: 'id',\n    // organization_id stays nullable, but scoping follows the standard org-scoped pattern (like every\n    // other module): the factory auto-filters by the caller's organization scope. The query engine's\n    // org scope is null-aware \u2014 callers whose scope includes null (or who have no org restriction) also\n    // see null-org rows; a caller pinned to a specific org does not.\n    orgField: 'organizationId',\n    tenantField: 'tenantId',\n    softDeleteField: 'deletedAt',\n  },\n  indexer: { entityType: E.devices.user_device },\n  // Align the CRUD cache resource tag with the command's resourceKind ('devices.user_device') so\n  // writes through the device commands invalidate this list cache. Without this, the factory falls\n  // back to the ORM entity name and the cache is never busted (stale list under ENABLE_CRUD_API_CACHE).\n  // The factory does not own the write methods here (custom POST + command bus), so no events are emitted.\n  events: { module: 'devices', entity: 'user_device' },\n  list: {\n    schema: deviceListSchema,\n    entityId: E.devices.user_device,\n    // push_token is a secret and is never exposed via the list API.\n    fields: deviceListFields,\n    sortFieldMap: deviceListSortFieldMap,\n    // Exports are off for the self-serve list. The factory enables them for every list that does not\n    // declare `export` (resolveAvailableExportFormats falls back to csv/json/xml/markdown), and its\n    // full-export branch replaces the filters with `{}` instead of calling `buildFilters`\n    // (`baseFilters = exportFullRequested ? {} : buildFilters(...)`). On this route `buildFilters` is\n    // the only user-level boundary \u2014 automatic scoping covers tenant and organization, not the acting\n    // user \u2014 so `?format=json&exportScope=full` would return every device in the caller's org scope.\n    // With no available formats, `exportRequested` is never true and that branch is unreachable. Bulk\n    // device data belongs to the admin tree (api/admin/devices), which gates cross-user listing.\n    export: { enabled: false },\n    // Self-serve: always scoped to the acting user. Cross-user listing lives in api/admin/devices.\n    buildFilters: async (query, ctx) => {\n      // Consume the client-supplied advanced filter here (this deletes every `filter[...]` key from\n      // `query`) so the CRUD factory's own merge step becomes a no-op. That step is\n      // `{ ...existingFilters, ...advancedWhere }` (advanced-filter-integration.ts), and condition\n      // field names are never validated \u2014 `filter[conditions][0][field]=user_id` or `=$and` would\n      // otherwise overwrite whatever key this route uses for its scope and widen the listing to other\n      // users. `mergeAdvancedFilterTree` instead AND-combines under `$and: [routeFilters, treeWhere]`,\n      // where the scope sits in its own array element and no client key can reach it. Same pattern as\n      // customers/people, companies and deals.\n      const advancedFilterTree = consumeAdvancedFilterState(query)\n      const filters: Record<string, unknown> = {}\n      const actorUserId = resolveDeviceActorUserId(ctx.auth)\n      // Self-serve visibility is strictly the acting user's own devices; cross-user listing lives in\n      // api/admin/devices. Fail closed when there is no resolvable acting user (e.g. API keys).\n      filters.user_id = { $eq: actorUserId ?? NO_MATCH_USER_ID }\n      if (query.platform) filters.platform = { $eq: query.platform }\n      return mergeAdvancedFilterTree(filters, advancedFilterTree)\n    },\n  },\n})\n\nexport const GET = crud.GET\n\nexport async function POST(req: Request) {\n  const { translate } = await resolveTranslations()\n  try {\n    const container = await createRequestContainer()\n    const auth = await getAuthFromRequest(req)\n    const actorUserId = resolveDeviceActorUserId(auth)\n    if (!auth || !auth.tenantId || !actorUserId) {\n      return NextResponse.json({ error: translate('devices.errors.unauthorized', 'Unauthorized') }, { status: 401 })\n    }\n\n    const body = registerDeviceSchema.parse(await readJsonSafe(req, {}))\n    const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n    const organizationId = scope?.selectedId ?? auth.orgId ?? null\n\n    // When the app doesn't send an explicit per-device locale, fall back to the request's\n    // Accept-Language (the mobile client calls this with its own headers). Only on self-register \u2014\n    // PUT stays tri-state, and admin register uses the admin's browser headers, not the device's.\n    const headerLocale = resolveLocaleFromAcceptLanguage(req.headers.get('accept-language'))\n\n    const commandInput = registerDeviceCommandSchema.parse({\n      ...body,\n      locale: body.locale ?? headerLocale ?? undefined,\n      tenantId: auth.tenantId,\n      organizationId,\n      userId: actorUserId,\n    } satisfies RegisterDeviceCommandInput)\n\n    const mctx: DeviceMutationContext = { container, auth, scope, organizationId, actorUserId, request: req }\n    return await executeRegister(mctx, commandInput)\n  } catch (err) {\n    if (err instanceof z.ZodError) {\n      return NextResponse.json(\n        { error: translate('devices.errors.invalid_payload', 'Invalid device payload'), details: err.flatten() },\n        { status: 400 },\n      )\n    }\n    if (isCrudHttpError(err) && (err.body as { code?: string } | undefined)?.code === 'device_already_registered') {\n      return NextResponse.json(\n        { error: translate('devices.errors.already_registered', 'This device is already registered') },\n        { status: 409 },\n      )\n    }\n    if (isCrudHttpError(err)) {\n      return NextResponse.json(err.body, { status: err.status })\n    }\n    logger.error('devices.POST failed', { err })\n    return NextResponse.json(\n      { error: translate('devices.errors.register_failed', 'Failed to register device') },\n      { status: 500 },\n    )\n  }\n}\n\nconst registerResponseSchema = z.object({\n  id: z.string().uuid(),\n  deviceId: z.string(),\n  revived: z.boolean(),\n})\n\nexport const openApi: OpenApiRouteDoc = createDevicesCrudOpenApi({\n  resourceName: 'Device',\n  pluralName: 'Devices',\n  querySchema: deviceListSchema,\n  listResponseSchema: createPagedListResponseSchema(deviceListItemSchema),\n  create: {\n    schema: registerDeviceSchema,\n    responseSchema: registerResponseSchema,\n    description:\n      'Registers (or idempotently upserts) the current user\\'s device for the given deviceId. May include an initial push token.',\n  },\n})\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'\nimport { consumeAdvancedFilterState, mergeAdvancedFilterTree } from '@open-mercato/shared/lib/crud/advanced-filter-integration'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { resolveLocaleFromAcceptLanguage } from '@open-mercato/shared/lib/i18n/locale'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { E } from '#generated/entities.ids.generated'\nimport { UserDevice } from '../data/entities'\nimport {\n  registerDeviceSchema,\n  registerDeviceCommandSchema,\n  type RegisterDeviceCommandInput,\n} from '../data/validators'\nimport { resolveDeviceActorUserId } from './auth'\nimport { createDevicesCrudOpenApi, createPagedListResponseSchema } from './openapi'\nimport {\n  deviceListSchema,\n  deviceListFields,\n  deviceListSortFieldMap,\n  deviceListItemSchema,\n  transformDeviceListItem,\n} from './deviceList'\nimport { executeRegister, type DeviceMutationContext } from './deviceOps'\n\nconst logger = createLogger('devices')\n\nconst routeMetadata = {\n  GET: { requireAuth: true, requireFeatures: ['devices.view'] },\n  POST: { requireAuth: true, requireFeatures: ['devices.manage'] },\n}\n\nexport const metadata = routeMetadata\n\nconst NO_MATCH_USER_ID = '00000000-0000-0000-0000-000000000000'\n\nconst crud = makeCrudRoute({\n  metadata: routeMetadata,\n  orm: {\n    entity: UserDevice,\n    idField: 'id',\n    // organization_id stays nullable, but scoping follows the standard org-scoped pattern (like every\n    // other module): the factory auto-filters by the caller's organization scope. The query engine's\n    // org scope is null-aware \u2014 callers whose scope includes null (or who have no org restriction) also\n    // see null-org rows; a caller pinned to a specific org does not.\n    orgField: 'organizationId',\n    tenantField: 'tenantId',\n    softDeleteField: 'deletedAt',\n  },\n  indexer: { entityType: E.devices.user_device },\n  // Align the CRUD cache resource tag with the command's resourceKind ('devices.user_device') so\n  // writes through the device commands invalidate this list cache. Without this, the factory falls\n  // back to the ORM entity name and the cache is never busted (stale list under ENABLE_CRUD_API_CACHE).\n  // The factory does not own the write methods here (custom POST + command bus), so no events are emitted.\n  events: { module: 'devices', entity: 'user_device' },\n  list: {\n    schema: deviceListSchema,\n    entityId: E.devices.user_device,\n    // push_token is a secret and is never exposed via the list API.\n    fields: deviceListFields,\n    sortFieldMap: deviceListSortFieldMap,\n    // The query engine projects raw column names; expose them in camelCase like every other module.\n    transformItem: transformDeviceListItem,\n    // Exports are off for the self-serve list. The factory enables them for every list that does not\n    // declare `export` (resolveAvailableExportFormats falls back to csv/json/xml/markdown), and its\n    // full-export branch replaces the filters with `{}` instead of calling `buildFilters`\n    // (`baseFilters = exportFullRequested ? {} : buildFilters(...)`). On this route `buildFilters` is\n    // the only user-level boundary \u2014 automatic scoping covers tenant and organization, not the acting\n    // user \u2014 so `?format=json&exportScope=full` would return every device in the caller's org scope.\n    // With no available formats, `exportRequested` is never true and that branch is unreachable. Bulk\n    // device data belongs to the admin tree (api/admin/devices), which gates cross-user listing.\n    export: { enabled: false },\n    // Self-serve: always scoped to the acting user. Cross-user listing lives in api/admin/devices.\n    buildFilters: async (query, ctx) => {\n      // Consume the client-supplied advanced filter here (this deletes every `filter[...]` key from\n      // `query`) so the CRUD factory's own merge step becomes a no-op. That step is\n      // `{ ...existingFilters, ...advancedWhere }` (advanced-filter-integration.ts), and condition\n      // field names are never validated \u2014 `filter[conditions][0][field]=user_id` or `=$and` would\n      // otherwise overwrite whatever key this route uses for its scope and widen the listing to other\n      // users. `mergeAdvancedFilterTree` instead AND-combines under `$and: [routeFilters, treeWhere]`,\n      // where the scope sits in its own array element and no client key can reach it. Same pattern as\n      // customers/people, companies and deals.\n      const advancedFilterTree = consumeAdvancedFilterState(query)\n      const filters: Record<string, unknown> = {}\n      const actorUserId = resolveDeviceActorUserId(ctx.auth)\n      // Self-serve visibility is strictly the acting user's own devices; cross-user listing lives in\n      // api/admin/devices. Fail closed when there is no resolvable acting user (e.g. API keys).\n      filters.user_id = { $eq: actorUserId ?? NO_MATCH_USER_ID }\n      if (query.platform) filters.platform = { $eq: query.platform }\n      return mergeAdvancedFilterTree(filters, advancedFilterTree)\n    },\n  },\n})\n\nexport const GET = crud.GET\n\nexport async function POST(req: Request) {\n  const { translate } = await resolveTranslations()\n  try {\n    const container = await createRequestContainer()\n    const auth = await getAuthFromRequest(req)\n    const actorUserId = resolveDeviceActorUserId(auth)\n    if (!auth || !auth.tenantId || !actorUserId) {\n      return NextResponse.json({ error: translate('devices.errors.unauthorized', 'Unauthorized') }, { status: 401 })\n    }\n\n    const body = registerDeviceSchema.parse(await readJsonSafe(req, {}))\n    const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n    const organizationId = scope?.selectedId ?? auth.orgId ?? null\n\n    // When the app doesn't send an explicit per-device locale, fall back to the request's\n    // Accept-Language (the mobile client calls this with its own headers). Only on self-register \u2014\n    // PUT stays tri-state, and admin register uses the admin's browser headers, not the device's.\n    const headerLocale = resolveLocaleFromAcceptLanguage(req.headers.get('accept-language'))\n\n    const commandInput = registerDeviceCommandSchema.parse({\n      ...body,\n      locale: body.locale ?? headerLocale ?? undefined,\n      tenantId: auth.tenantId,\n      organizationId,\n      userId: actorUserId,\n    } satisfies RegisterDeviceCommandInput)\n\n    const mctx: DeviceMutationContext = { container, auth, scope, organizationId, actorUserId, request: req }\n    return await executeRegister(mctx, commandInput)\n  } catch (err) {\n    if (err instanceof z.ZodError) {\n      return NextResponse.json(\n        { error: translate('devices.errors.invalid_payload', 'Invalid device payload'), details: err.flatten() },\n        { status: 400 },\n      )\n    }\n    if (isCrudHttpError(err) && (err.body as { code?: string } | undefined)?.code === 'device_already_registered') {\n      return NextResponse.json(\n        { error: translate('devices.errors.already_registered', 'This device is already registered') },\n        { status: 409 },\n      )\n    }\n    if (isCrudHttpError(err)) {\n      return NextResponse.json(err.body, { status: err.status })\n    }\n    logger.error('devices.POST failed', { err })\n    return NextResponse.json(\n      { error: translate('devices.errors.register_failed', 'Failed to register device') },\n      { status: 500 },\n    )\n  }\n}\n\nconst registerResponseSchema = z.object({\n  id: z.string().uuid(),\n  deviceId: z.string(),\n  revived: z.boolean(),\n})\n\nexport const openApi: OpenApiRouteDoc = createDevicesCrudOpenApi({\n  resourceName: 'Device',\n  pluralName: 'Devices',\n  querySchema: deviceListSchema,\n  listResponseSchema: createPagedListResponseSchema(deviceListItemSchema),\n  create: {\n    schema: registerDeviceSchema,\n    responseSchema: registerResponseSchema,\n    description:\n      'Registers (or idempotently upserts) the current user\\'s device for the given deviceId. May include an initial push token.',\n  },\n})\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/devices/backend/devices/[id]/page.js

@@ -10,6 +10,7 @@ import { apiCall } from "@open-mercato/ui/backend/utils/apiCall";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
 import { LoadingMessage, ErrorMessage, RecordNotFoundState } from "@open-mercato/ui/backend/detail";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
+import { useDeviceUserLabels } from "../useDeviceUserLabels.js";
 function DeviceAdminEditPage({ params }) {
   const router = useRouter();
   const t = useT();
@@ -18,7 +19,6 @@ function DeviceAdminEditPage({ params }) {
   const [isLoading, setIsLoading] = React.useState(true);
   const [error, setError] = React.useState(null);
   const [notFound, setNotFound] = React.useState(false);
-  const [userLabel, setUserLabel] = React.useState(null);
   React.useEffect(() => {
     let cancelled = false;
     async function load() {
@@ -45,25 +45,9 @@ function DeviceAdminEditPage({ params }) {
       cancelled = true;
     };
   }, [id, t]);
-  React.useEffect(() => {
-    const userId = device?.user_id;
-    if (!userId) return;
-    let cancelled = false;
-    void (async () => {
-      const call = await apiCall(
-        `/api/auth/users?id=${encodeURIComponent(userId)}`,
-        { headers: { "x-om-forbidden-redirect": "0" } },
-        { fallback: null }
-      ).catch(() => null);
-      if (cancelled || !call || !call.ok) return;
-      const found = call.result?.items?.find((u) => u.id === userId);
-      const label = found?.name?.trim() || found?.email?.trim() || null;
-      if (label) setUserLabel(label);
-    })();
-    return () => {
-      cancelled = true;
-    };
-  }, [device?.user_id]);
+  const ownerIds = React.useMemo(() => [device?.userId], [device?.userId]);
+  const userLabels = useDeviceUserLabels(ownerIds);
+  const userLabel = device?.userId ? userLabels[device.userId] ?? null : null;
   const fields = React.useMemo(() => [
     { id: "clientAppVersion", label: t("devices.form.appVersion"), type: "text" },
     { id: "osVersion", label: t("devices.form.osVersion"), type: "text" },
@@ -96,7 +80,7 @@ function DeviceAdminEditPage({ params }) {
       contentHeader: /* @__PURE__ */ jsxs("dl", { className: "grid grid-cols-1 gap-3 rounded-md border bg-muted p-4 text-sm sm:grid-cols-3", children: [
         /* @__PURE__ */ jsxs("div", { children: [
           /* @__PURE__ */ jsx("dt", { className: "text-xs font-medium text-muted-foreground", children: t("devices.form.deviceId") }),
-          /* @__PURE__ */ jsx("dd", { className: "mt-1", children: /* @__PURE__ */ jsx("code", { className: "text-xs", children: device.device_id }) })
+          /* @__PURE__ */ jsx("dd", { className: "mt-1", children: /* @__PURE__ */ jsx("code", { className: "text-xs", children: device.deviceId }) })
         ] }),
         /* @__PURE__ */ jsxs("div", { children: [
           /* @__PURE__ */ jsx("dt", { className: "text-xs font-medium text-muted-foreground", children: t("devices.form.platform") }),
@@ -104,16 +88,16 @@ function DeviceAdminEditPage({ params }) {
         ] }),
         /* @__PURE__ */ jsxs("div", { children: [
           /* @__PURE__ */ jsx("dt", { className: "text-xs font-medium text-muted-foreground", children: t("devices.form.userId") }),
-          /* @__PURE__ */ jsx("dd", { className: "mt-1", children: userLabel ? /* @__PURE__ */ jsx(Link, { href: `/backend/users/${encodeURIComponent(device.user_id)}/edit`, className: "text-primary hover:underline", children: userLabel }) : /* @__PURE__ */ jsx("code", { className: "text-xs", children: device.user_id }) })
+          /* @__PURE__ */ jsx("dd", { className: "mt-1", children: userLabel ? /* @__PURE__ */ jsx(Link, { href: `/backend/users/${encodeURIComponent(device.userId)}/edit`, className: "text-primary hover:underline", children: userLabel }) : /* @__PURE__ */ jsx("code", { className: "text-xs", children: device.userId }) })
         ] })
       ] }),
       fields,
       groups,
-      optimisticLockUpdatedAt: device.updated_at,
+      optimisticLockUpdatedAt: device.updatedAt,
       initialValues: {
-        clientAppVersion: device.client_app_version ?? "",
-        osVersion: device.os_version ?? "",
-        pushProvider: device.push_provider ?? ""
+        clientAppVersion: device.clientAppVersion ?? "",
+        osVersion: device.osVersion ?? "",
+        pushProvider: device.pushProvider ?? ""
       },
       submitLabel: t("common.save"),
       cancelHref: "/backend/devices",

package/dist/modules/devices/backend/devices/[id]/page.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/modules/devices/backend/devices/%5Bid%5D/page.tsx"],
-  "sourcesContent": ["\"use client\"\nimport * as React from 'react'\nimport Link from 'next/link'\nimport { useRouter } from 'next/navigation'\nimport { Page, PageBody } from '@open-mercato/ui/backend/Page'\nimport { CrudForm, type CrudField, type CrudFormGroup } from '@open-mercato/ui/backend/CrudForm'\nimport { updateCrud } from '@open-mercato/ui/backend/utils/crud'\nimport { apiCall } from '@open-mercato/ui/backend/utils/apiCall'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { LoadingMessage, ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\n\ntype DeviceDetail = {\n  id: string\n  user_id: string\n  device_id: string\n  platform: string\n  client_app_version: string | null\n  os_version: string | null\n  push_provider: string | null\n  updated_at: string | null\n}\n\ntype FormValues = {\n  clientAppVersion: string\n  osVersion: string\n  pushProvider: string\n}\n\nexport default function DeviceAdminEditPage({ params }: { params?: { id?: string } }) {\n  const router = useRouter()\n  const t = useT()\n  const id = typeof params?.id === 'string' ? params.id : ''\n  const [device, setDevice] = React.useState<DeviceDetail | null>(null)\n  const [isLoading, setIsLoading] = React.useState(true)\n  const [error, setError] = React.useState<string | null>(null)\n  const [notFound, setNotFound] = React.useState(false)\n  const [userLabel, setUserLabel] = React.useState<string | null>(null)\n\n  React.useEffect(() => {\n    let cancelled = false\n    async function load() {\n      setIsLoading(true)\n      setError(null)\n      setNotFound(false)\n      const call = await apiCall<{ item?: DeviceDetail }>(\n        `/api/devices/admin/devices/${encodeURIComponent(id)}`,\n        undefined,\n        { fallback: null },\n      )\n      if (cancelled) return\n      if (call.ok && call.result?.item) {\n        setDevice(call.result.item)\n      } else if (call.status === 404 || (call.ok && !call.result?.item)) {\n        setNotFound(true)\n      } else {\n        setError(t('devices.form.error.loadFailed'))\n      }\n      setIsLoading(false)\n    }\n    if (id) load()\n    return () => { cancelled = true }\n  }, [id, t])\n\n  // Resolve the owner's display name for a link to their profile. Devices admins may not hold\n  // auth.users.list, so fall back to the raw id (rendered without a link) instead of redirecting.\n  React.useEffect(() => {\n    const userId = device?.user_id\n    if (!userId) return\n    let cancelled = false\n    void (async () => {\n      const call = await apiCall<{ items?: { id: string; name?: string | null; email?: string | null }[] }>(\n        `/api/auth/users?id=${encodeURIComponent(userId)}`,\n        { headers: { 'x-om-forbidden-redirect': '0' } },\n        { fallback: null },\n      ).catch(() => null)\n      if (cancelled || !call || !call.ok) return\n      const found = call.result?.items?.find((u) => u.id === userId)\n      const label = found?.name?.trim() || found?.email?.trim() || null\n      if (label) setUserLabel(label)\n    })()\n    return () => { cancelled = true }\n  }, [device?.user_id])\n\n  const fields = React.useMemo<CrudField[]>(() => [\n    { id: 'clientAppVersion', label: t('devices.form.appVersion'), type: 'text' },\n    { id: 'osVersion', label: t('devices.form.osVersion'), type: 'text' },\n    { id: 'pushProvider', label: t('devices.form.pushProvider'), type: 'text' },\n  ], [t])\n\n  const groups = React.useMemo<CrudFormGroup[]>(() => ([\n    { id: 'details', title: t('devices.form.details'), column: 1, fields: ['clientAppVersion', 'osVersion', 'pushProvider'] },\n  ]), [t])\n\n  if (isLoading) {\n    return <Page><PageBody><LoadingMessage label={t('common.loading')} /></PageBody></Page>\n  }\n  if (notFound) {\n    return (\n      <Page>\n        <PageBody>\n          <RecordNotFoundState\n            label={t('devices.errors.not_found')}\n            backHref=\"/backend/devices\"\n            backLabel={t('devices.list.title')}\n          />\n        </PageBody>\n      </Page>\n    )\n  }\n  if (error || !device) {\n    return <Page><PageBody><ErrorMessage label={error ?? t('devices.form.error.loadFailed')} /></PageBody></Page>\n  }\n\n  return (\n    <Page>\n      <PageBody>\n        <CrudForm<FormValues>\n          title={t('devices.form.editTitle')}\n          backHref=\"/backend/devices\"\n          contentHeader={(\n            <dl className=\"grid grid-cols-1 gap-3 rounded-md border bg-muted p-4 text-sm sm:grid-cols-3\">\n              <div>\n                <dt className=\"text-xs font-medium text-muted-foreground\">{t('devices.form.deviceId')}</dt>\n                <dd className=\"mt-1\"><code className=\"text-xs\">{device.device_id}</code></dd>\n              </div>\n              <div>\n                <dt className=\"text-xs font-medium text-muted-foreground\">{t('devices.form.platform')}</dt>\n                <dd className=\"mt-1\">{device.platform}</dd>\n              </div>\n              <div>\n                <dt className=\"text-xs font-medium text-muted-foreground\">{t('devices.form.userId')}</dt>\n                <dd className=\"mt-1\">{userLabel ? (\n                  <Link href={`/backend/users/${encodeURIComponent(device.user_id)}/edit`} className=\"text-primary hover:underline\">{userLabel}</Link>\n                ) : (\n                  <code className=\"text-xs\">{device.user_id}</code>\n                )}</dd>\n              </div>\n            </dl>\n          )}\n          fields={fields}\n          groups={groups}\n          optimisticLockUpdatedAt={device.updated_at}\n          initialValues={{\n            clientAppVersion: device.client_app_version ?? '',\n            osVersion: device.os_version ?? '',\n            pushProvider: device.push_provider ?? '',\n          }}\n          submitLabel={t('common.save')}\n          cancelHref=\"/backend/devices\"\n          onSubmit={async (values) => {\n            await updateCrud(`devices/admin/devices/${encodeURIComponent(id)}`, {\n              clientAppVersion: values.clientAppVersion.trim() || null,\n              osVersion: values.osVersion.trim() || null,\n              pushProvider: values.pushProvider.trim() || null,\n            })\n            flash(t('devices.form.success.updated'), 'success')\n            router.push('/backend/devices')\n          }}\n        />\n      </PageBody>\n    </Page>\n  )\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["\"use client\"\nimport * as React from 'react'\nimport Link from 'next/link'\nimport { useRouter } from 'next/navigation'\nimport { Page, PageBody } from '@open-mercato/ui/backend/Page'\nimport { CrudForm, type CrudField, type CrudFormGroup } from '@open-mercato/ui/backend/CrudForm'\nimport { updateCrud } from '@open-mercato/ui/backend/utils/crud'\nimport { apiCall } from '@open-mercato/ui/backend/utils/apiCall'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { LoadingMessage, ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { useDeviceUserLabels } from '../useDeviceUserLabels'\n\ntype DeviceDetail = {\n  id: string\n  userId: string\n  deviceId: string\n  platform: string\n  clientAppVersion: string | null\n  osVersion: string | null\n  pushProvider: string | null\n  updatedAt: string | null\n}\n\ntype FormValues = {\n  clientAppVersion: string\n  osVersion: string\n  pushProvider: string\n}\n\nexport default function DeviceAdminEditPage({ params }: { params?: { id?: string } }) {\n  const router = useRouter()\n  const t = useT()\n  const id = typeof params?.id === 'string' ? params.id : ''\n  const [device, setDevice] = React.useState<DeviceDetail | null>(null)\n  const [isLoading, setIsLoading] = React.useState(true)\n  const [error, setError] = React.useState<string | null>(null)\n  const [notFound, setNotFound] = React.useState(false)\n\n  React.useEffect(() => {\n    let cancelled = false\n    async function load() {\n      setIsLoading(true)\n      setError(null)\n      setNotFound(false)\n      const call = await apiCall<{ item?: DeviceDetail }>(\n        `/api/devices/admin/devices/${encodeURIComponent(id)}`,\n        undefined,\n        { fallback: null },\n      )\n      if (cancelled) return\n      if (call.ok && call.result?.item) {\n        setDevice(call.result.item)\n      } else if (call.status === 404 || (call.ok && !call.result?.item)) {\n        setNotFound(true)\n      } else {\n        setError(t('devices.form.error.loadFailed'))\n      }\n      setIsLoading(false)\n    }\n    if (id) load()\n    return () => { cancelled = true }\n  }, [id, t])\n\n  // Resolve the owner's display name for a link to their profile. Devices admins may not hold\n  // auth.users.list, so this falls back to the raw id (rendered without a link) instead of redirecting.\n  const ownerIds = React.useMemo(() => [device?.userId], [device?.userId])\n  const userLabels = useDeviceUserLabels(ownerIds)\n  const userLabel = device?.userId ? userLabels[device.userId] ?? null : null\n\n  const fields = React.useMemo<CrudField[]>(() => [\n    { id: 'clientAppVersion', label: t('devices.form.appVersion'), type: 'text' },\n    { id: 'osVersion', label: t('devices.form.osVersion'), type: 'text' },\n    { id: 'pushProvider', label: t('devices.form.pushProvider'), type: 'text' },\n  ], [t])\n\n  const groups = React.useMemo<CrudFormGroup[]>(() => ([\n    { id: 'details', title: t('devices.form.details'), column: 1, fields: ['clientAppVersion', 'osVersion', 'pushProvider'] },\n  ]), [t])\n\n  if (isLoading) {\n    return <Page><PageBody><LoadingMessage label={t('common.loading')} /></PageBody></Page>\n  }\n  if (notFound) {\n    return (\n      <Page>\n        <PageBody>\n          <RecordNotFoundState\n            label={t('devices.errors.not_found')}\n            backHref=\"/backend/devices\"\n            backLabel={t('devices.list.title')}\n          />\n        </PageBody>\n      </Page>\n    )\n  }\n  if (error || !device) {\n    return <Page><PageBody><ErrorMessage label={error ?? t('devices.form.error.loadFailed')} /></PageBody></Page>\n  }\n\n  return (\n    <Page>\n      <PageBody>\n        <CrudForm<FormValues>\n          title={t('devices.form.editTitle')}\n          backHref=\"/backend/devices\"\n          contentHeader={(\n            <dl className=\"grid grid-cols-1 gap-3 rounded-md border bg-muted p-4 text-sm sm:grid-cols-3\">\n              <div>\n                <dt className=\"text-xs font-medium text-muted-foreground\">{t('devices.form.deviceId')}</dt>\n                <dd className=\"mt-1\"><code className=\"text-xs\">{device.deviceId}</code></dd>\n              </div>\n              <div>\n                <dt className=\"text-xs font-medium text-muted-foreground\">{t('devices.form.platform')}</dt>\n                <dd className=\"mt-1\">{device.platform}</dd>\n              </div>\n              <div>\n                <dt className=\"text-xs font-medium text-muted-foreground\">{t('devices.form.userId')}</dt>\n                <dd className=\"mt-1\">{userLabel ? (\n                  <Link href={`/backend/users/${encodeURIComponent(device.userId)}/edit`} className=\"text-primary hover:underline\">{userLabel}</Link>\n                ) : (\n                  <code className=\"text-xs\">{device.userId}</code>\n                )}</dd>\n              </div>\n            </dl>\n          )}\n          fields={fields}\n          groups={groups}\n          optimisticLockUpdatedAt={device.updatedAt}\n          initialValues={{\n            clientAppVersion: device.clientAppVersion ?? '',\n            osVersion: device.osVersion ?? '',\n            pushProvider: device.pushProvider ?? '',\n          }}\n          submitLabel={t('common.save')}\n          cancelHref=\"/backend/devices\"\n          onSubmit={async (values) => {\n            await updateCrud(`devices/admin/devices/${encodeURIComponent(id)}`, {\n              clientAppVersion: values.clientAppVersion.trim() || null,\n              osVersion: values.osVersion.trim() || null,\n              pushProvider: values.pushProvider.trim() || null,\n            })\n            flash(t('devices.form.success.updated'), 'success')\n            router.push('/backend/devices')\n          }}\n        />\n      </PageBody>\n    </Page>\n  )\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/devices/backend/devices/create/page.js

@@ -7,6 +7,7 @@ import { CrudForm } from "@open-mercato/ui/backend/CrudForm";
 import { createCrud } from "@open-mercato/ui/backend/utils/crud";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
+import { loadDeviceUserOptions } from "../userOptions.js";
 function trimmedOrUndefined(value) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : void 0;
@@ -15,7 +16,22 @@ function DeviceAdminCreatePage() {
   const router = useRouter();
   const t = useT();
   const fields = React.useMemo(() => [
-    { id: "userId", label: t("devices.form.userId"), type: "text", required: true, description: t("devices.form.userIdHint") },
+    {
+      id: "userId",
+      label: t("devices.form.userId"),
+      type: "combobox",
+      required: true,
+      description: t("devices.form.userIdHint"),
+      placeholder: t("devices.form.userIdPlaceholder"),
+      loadOptions: loadDeviceUserOptions,
+      // The owner must resolve to a real directory entry: `ComboboxInput` reverts anything that is
+      // not a known option on blur, so free text and an id belonging to nobody never reach submit.
+      // (A raw id that IS a known option still resolves — `findOptionForInput` matches on value, and
+      // `CrudForm` keeps the unfiltered first page as suggestions — which is a real user either way.)
+      // `devices.admin` declares `dependsOn: ['auth.users.list']` in `acl.ts`, so a role that can
+      // reach this form can also search the directory that fills the picker.
+      allowCustomValues: false
+    },
     { id: "deviceId", label: t("devices.form.deviceId"), type: "text", required: true },
     {
       id: "platform",