@open-mercato/onboarding 0.6.4-develop.4371.1.8f3030407e → 0.6.4

package/src/modules/onboarding/lib/consentClientIp.ts

@@ -0,0 +1,15 @@
+import { getCachedRateLimiterService } from '@open-mercato/core/bootstrap'
+import { getClientIp } from '@open-mercato/shared/lib/ratelimit/helpers'
+
+/**
+ * Resolve the client IP to persist on a legal-consent record, honoring the
+ * deployment-wide reverse-proxy trust depth (`RATE_LIMIT_TRUST_PROXY_DEPTH`)
+ * exposed by the rate limiter service instead of a hardcoded depth. When the
+ * trust depth is unknown, return null so a spoofable `X-Forwarded-For` value is
+ * never signed into the consent integrity hash.
+ */
+export function resolveConsentClientIp(req: Request): string | null {
+  const rateLimiterService = getCachedRateLimiterService()
+  if (!rateLimiterService) return null
+  return getClientIp(req, rateLimiterService.trustProxyDepth) ?? null
+}

package/src/modules/onboarding/lib/ready-email.ts

@@ -4,6 +4,7 @@ import { loadDictionary } from '@open-mercato/shared/lib/i18n/server'
 import { defaultLocale, locales, type Locale } from '@open-mercato/shared/lib/i18n/config'
 import { createFallbackTranslator } from '@open-mercato/shared/lib/i18n/translate'
 import { sendEmail } from '@open-mercato/shared/lib/email/send'
+import { getSecurityEmailBaseUrl } from '@open-mercato/shared/lib/url'
 import { OnboardingService } from '@open-mercato/onboarding/modules/onboarding/lib/service'
 import WorkspaceReadyEmail from '@open-mercato/onboarding/modules/onboarding/emails/WorkspaceReadyEmail'
 
@@ -14,7 +15,6 @@ function resolveLocale(rawLocale: string | null | undefined): Locale {
 
 export async function sendWorkspaceReadyEmail(args: {
   requestId: string
-  baseUrl: string
   tenantId: string
 }) {
   const container = await createRequestContainer()
@@ -25,7 +25,8 @@ export async function sendWorkspaceReadyEmail(args: {
   const locale = resolveLocale(request.locale)
   const dict = await loadDictionary(locale)
   const translate = createFallbackTranslator(dict)
-  const loginUrl = `${args.baseUrl}/login?tenant=${encodeURIComponent(args.tenantId)}`
+  const baseUrl = getSecurityEmailBaseUrl()
+  const loginUrl = `${baseUrl}/login?tenant=${encodeURIComponent(args.tenantId)}`
   const firstName = request.firstName?.trim() || request.organizationName?.trim() || request.email
   const subject = translate('onboarding.readyEmail.subject', 'Your Open Mercato workspace is ready')
   const emailCopy = {

package/src/modules/onboarding/lib/service.ts

@@ -97,16 +97,28 @@ export class OnboardingService {
     )
   }
 
-  async startProcessing(request: OnboardingRequest, startedAt: Date) {
+  async startProcessing(request: OnboardingRequest, startedAt: Date): Promise<boolean> {
+    const claimedRows = await this.em.nativeUpdate(
+      OnboardingRequest,
+      { id: request.id, status: 'pending' },
+      { status: 'processing', processingStartedAt: startedAt, updatedAt: new Date() },
+    )
+    if (claimedRows === 0) return false
     request.status = 'processing'
     request.processingStartedAt = startedAt
-    await this.em.flush()
+    return true
   }
 
-  async resetProcessing(request: OnboardingRequest) {
+  async resetProcessing(request: OnboardingRequest): Promise<boolean> {
+    const revertedRows = await this.em.nativeUpdate(
+      OnboardingRequest,
+      { id: request.id, status: 'processing' },
+      { status: 'pending', processingStartedAt: null, updatedAt: new Date() },
+    )
+    if (revertedRows === 0) return false
     request.status = 'pending'
     request.processingStartedAt = null
-    await this.em.flush()
+    return true
   }
 
   async updateProvisioningIds(request: OnboardingRequest, data: { tenantId: string; organizationId: string; userId: string }) {