Daily RC

editor/app/(api)/(public)/v1/session/[session]/field/[field]/challenge/email/start/route.ts

@@ -8,6 +8,7 @@ import TenantCIAMEmailVerification, {
 import { otp6 } from "@/lib/crypto/otp";
 import { service_role } from "@/lib/supabase/server";
 import { select_lang } from "@/i18n/utils";
+import { getLocale } from "@/i18n/server";
 import {
   challengeEmailStateKey,
   loadChallengeEmailContext,
@@ -153,12 +154,14 @@ export async function POST(
       : undefined;
   const brand_support_contact = publisher.includes("@") ? publisher : undefined;
 
-  const langCandidate =
-    www && typeof www.lang === "string" && www.lang ? www.lang : formDoc.lang;
-  const emailLang: CIAMVerificationEmailLang = select_lang(
-    langCandidate,
-    supported_languages,
-    "en"
+  // Prefer the per-form document language when set; otherwise fall back to tenant/published `www.lang`.
+  // (Treat empty strings as "unset".)
+  const langCandidate = formDoc.lang?.trim() || www?.lang?.trim() || null;
+  // Prefer the visitor's device language. If unsupported, fall back to the form/tenant default.
+  const fallback_lang = select_lang(langCandidate, supported_languages, "en");
+  const emailLang: CIAMVerificationEmailLang = await getLocale(
+    [...supported_languages],
+    fallback_lang
   );
   const { error: resend_err } = await resend.emails.send({
     from: `${brand_name} <[email protected]>`,

editor/app/(api)/(public)/v1/submit/[id]/route.ts

@@ -128,6 +128,15 @@ async function submit({
   formdata: FormData | URLSearchParams | Map<string, string>;
   meta: SessionMeta;
 }) {
+  function isRecord(v: unknown): v is Record<string, unknown> {
+    return typeof v === "object" && v !== null;
+  }
+
+  function readStringProp(obj: unknown, key: string): string | null {
+    if (!isRecord(obj)) return null;
+    const v = obj[key];
+    return typeof v === "string" && v ? v : null;
+  }
   // console.log("form_id", form_id);
 
   // check for mandatory meta
@@ -204,6 +213,54 @@ async function submit({
     : null;
 
   // customer handling
+  // NOTE: challenge_email can bind a verified customer to the response_session.
+  // When that happens, we must reuse that customer instead of creating a new
+  // fingerprint-based customer (which causes duplicate customers for one respondent).
+
+  const challenge_email_fields = fields.filter(
+    (f) => f.type === "challenge_email"
+  );
+
+  // These are also used later for persistence/binding.
+  let session_raw: Record<string, unknown> | null = null;
+  let session_customer_id: string | null = null;
+  let verified_customer_id: string | null = null;
+
+  if (challenge_email_fields.length > 0 && meta.session) {
+    const { data: response_session, error: response_session_err } =
+      await service_role.forms
+        .from("response_session")
+        .select("id, raw, customer_id")
+        .eq("id", meta.session)
+        .eq("form_id", form_id)
+        .single();
+
+    if (response_session_err || !response_session) {
+      console.error("submit/err/session", response_session_err);
+      return error(ERR.SERVICE_ERROR.code, { form_id }, meta);
+    }
+
+    session_raw =
+      (response_session.raw as Record<string, unknown> | null) ?? null;
+    session_customer_id = response_session.customer_id ?? null;
+
+    // If verification succeeded, the challenge state stores `customer_uid`.
+    // Use it as an authoritative identity fallback (even when response_session.customer_id
+    // wasn't bound due to stricter binding rules).
+    for (const f of challenge_email_fields) {
+      const key = `__challenge_email__${f.id}`;
+      const obj = session_raw?.[key];
+      const state = readStringProp(obj, "state");
+      const customer_uid = readStringProp(obj, "customer_uid");
+      if (state === "challenge-success" && customer_uid) {
+        verified_customer_id = customer_uid;
+        break;
+      }
+    }
+  }
+
+  const effective_session_customer_id =
+    session_customer_id ?? verified_customer_id ?? null;
 
   const _gf_customer_uuid: string | null = qval(
     formdata.get(SYSTEM_GF_CUSTOMER_UUID_KEY) as string
@@ -227,16 +284,50 @@ async function submit({
 
   // console.log("/submit::_gf_customer_uuid:", _gf_customer_uuid);
 
-  const customer = await upsert_customer_with({
-    project_id: form_reference.project_id,
-    uuid: _gf_customer_uuid,
-    hints: {
-      _fp_fingerprintjs_visitorid,
-      email: _gf_customer_email || undefined,
-      phone: _gf_customer_phone || undefined,
-      name: _gf_customer_name || undefined,
-    },
-  });
+  // Only create/upsert a customer when we do not already have a trusted customer id.
+  // This prevents duplicate customer rows for challenge_email flows.
+  const customer = effective_session_customer_id
+    ? null
+    : await upsert_customer_with({
+        project_id: form_reference.project_id,
+        uuid: _gf_customer_uuid,
+        hints: {
+          _fp_fingerprintjs_visitorid,
+          email: _gf_customer_email || undefined,
+          phone: _gf_customer_phone || undefined,
+          name: _gf_customer_name || undefined,
+        },
+      });
+
+  // Best-effort: if we have a verified/session customer, enrich it with submitted hints.
+  // Avoid writing empty values; keep this non-blocking.
+  if (effective_session_customer_id) {
+    const patch: {
+      last_seen_at: string;
+      email?: string;
+      phone?: string;
+      name?: string;
+    } = { last_seen_at: new Date().toISOString() };
+    if (_gf_customer_email) patch.email = _gf_customer_email;
+    if (_gf_customer_phone) patch.phone = _gf_customer_phone;
+    if (_gf_customer_name) patch.name = _gf_customer_name;
+
+    try {
+      const { error: cus_update_err } = await service_role.workspace
+        .from("customer")
+        .update(patch)
+        .eq("uid", effective_session_customer_id)
+        .eq("project_id", form_reference.project_id);
+      if (cus_update_err) {
+        console.error(
+          "customer::session_customer_update_error:",
+          cus_update_err
+        );
+      }
+    } catch (e) {
+      console.error("customer::session_customer_update_unexpected_error:", e);
+    }
+  }
 
   // console.log("/submit::customer:", customer);
 
@@ -285,7 +376,7 @@ async function submit({
   // TODO: this also needs to be migrated to db constraints
   const max_access_by_customer_error = await validate_max_access_by_customer({
     form_id,
-    customer_id: customer?.uid,
+    customer_id: effective_session_customer_id ?? customer?.uid ?? null,
     is_max_form_responses_by_customer_enabled,
     max_form_responses_by_customer,
   });
@@ -325,36 +416,10 @@ async function submit({
   // ==================================================
   // challenge_email gating (session-scoped verification)
   // ==================================================
-  const challenge_email_fields = fields.filter(
-    (f) => f.type === "challenge_email"
-  );
   const required_challenge_email_fields = challenge_email_fields.filter(
     (f) => f.required
   );
 
-  // These are also used later for persistence/binding.
-  let session_raw: Record<string, unknown> | null = null;
-  let session_customer_id: string | null = null;
-
-  if (challenge_email_fields.length > 0 && meta.session) {
-    const { data: response_session, error: response_session_err } =
-      await service_role.forms
-        .from("response_session")
-        .select("id, raw, customer_id")
-        .eq("id", meta.session)
-        .eq("form_id", form_id)
-        .single();
-
-    if (response_session_err || !response_session) {
-      console.error("submit/err/session", response_session_err);
-      return error(ERR.SERVICE_ERROR.code, { form_id }, meta);
-    }
-
-    session_raw =
-      (response_session.raw as Record<string, unknown> | null) ?? null;
-    session_customer_id = response_session.customer_id ?? null;
-  }
-
   if (required_challenge_email_fields.length > 0) {
     if (!meta.session || !session_raw) {
       return error(ERR.CHALLENGE_EMAIL_NOT_VERIFIED.code, { form_id }, meta);
@@ -508,7 +573,8 @@ async function submit({
         ip: meta.ip,
         // Prefer explicit customer from the submit payload; otherwise use session binding
         // (set only by trusted verification flows).
-        customer_id: customer?.uid ?? session_customer_id,
+        customer_id:
+          effective_session_customer_id ?? customer?.uid ?? session_customer_id,
         x_referer: meta.referer,
         x_useragent: meta.useragent,
         x_ipinfo: ipinfo_data as {},
@@ -545,7 +611,8 @@ async function submit({
             form_id,
             ...({
               fingerprint: _fp_fingerprintjs_visitorid,
-              customer_id: customer?.uid,
+              customer_id:
+                effective_session_customer_id ?? customer?.uid ?? undefined,
               session_id: meta.session || undefined,
             } satisfies FormLinkURLParams["alreadyresponded"]),
           },

editor/app/(api)/private/editor/[form_id]/fields/route.ts

@@ -65,7 +65,7 @@ export async function POST(
       autocomplete: init.autocomplete,
       data: safe_data_field({
         type: init.type,
-        data: init.data as any,
+        data: init.data,
       }) as any,
       accept: init.accept,
       multiple: init.multiple,
@@ -323,9 +323,16 @@ function safe_data_field({
   data,
 }: {
   type: FormInputType;
-  data?: FormFieldDataSchema;
+  data?: FormFieldDataSchema | null;
 }): FormFieldDataSchema | undefined | null {
   switch (type) {
+    case "tel": {
+      // Keep `data` as an object (if provided) so we can safely persist tel configs
+      // such as `default_country` without losing shape.
+      if (!data) return data;
+      if (typeof data === "object") return data;
+      return {};
+    }
     case "payment": {
       // TODO: enhance the schema validation with external libraries
       if (!data || !(data as PaymentFieldData).type) {

editor/app/(tenant)/~/[tenant]/(p)/p/login/page.tsx

@@ -1,15 +1,66 @@
 import React from "react";
 import PortalLogin from "./login";
 import { getLocale } from "@/i18n/server";
+import Link from "next/link";
+import { createWWWClient } from "@/lib/supabase/server";
+import type { Database } from "@app/database";
 
-export default async function CustomerPortalLoginPage() {
+type Params = {
+  tenant: string;
+};
+
+type WwwPublicRow = Database["grida_www"]["Views"]["www_public"]["Row"];
+
+async function fetchPortalTitle(tenant: string) {
+  const client = await createWWWClient();
+
+  const { data: wwwPublic } = await client
+    .from("www_public")
+    .select("title")
+    .eq("name", tenant)
+    .single()
+    .returns<Pick<WwwPublicRow, "title">>();
+
+  const title =
+    typeof wwwPublic?.title === "string" && wwwPublic.title.trim()
+      ? wwwPublic.title
+      : "Customer Portal";
+
+  return title;
+}
+
+export default async function CustomerPortalLoginPage({
+  params,
+}: {
+  params: Promise<Params>;
+}) {
+  const { tenant } = await params;
   const locale = await getLocale(["en", "ko"]);
+  const title = await fetchPortalTitle(tenant);
 
   return (
-    <div className="flex min-h-svh flex-col items-center justify-center gap-6 bg-background p-6 md:p-10">
-      <div className="w-full max-w-sm">
-        <PortalLogin locale={locale} />
-      </div>
+    <div className="min-h-svh bg-background flex flex-col">
+      <header className="h-14 border-b" data-testid="portal-login-navbar">
+        <div className="mx-auto h-full w-full max-w-screen-sm px-6 flex items-center">
+          <Link
+            href="#"
+            className="flex items-center gap-2 min-w-0"
+            data-testid="portal-login-navbar-brand-link"
+          >
+            <span
+              className="font-semibold truncate"
+              data-testid="portal-login-navbar-title"
+            >
+              {title}
+            </span>
+          </Link>
+        </div>
+      </header>
+      <main className="flex-1 flex items-center justify-center p-6 md:p-10">
+        <div className="w-full max-w-sm">
+          <PortalLogin locale={locale} />
+        </div>
+      </main>
     </div>
   );
 }

editor/app/(tenant)/~/[tenant]/(p)/p/session/[token]/page.tsx

@@ -7,6 +7,12 @@ import type { Database } from "@app/database";
 import type { PostgrestError } from "@supabase/supabase-js";
 import CampaignReferrerCard from "../west-campaign-referrer-card";
 
+// TODO(portal): The portal session page is not design-complete yet, but is used in production.
+// Today enterprise customers typically only have one active campaign, so we temporarily redirect
+// directly to the campaign page when there's only a single campaign in the portal session.
+// Remove this once the session page UX is finalized and multi-campaign is common.
+const TMP_SHOULD_REDIRECT_WHEN_SINGLE = true;
+
 type Params = {
   token: string;
 };
@@ -124,6 +130,20 @@ export default async function CustomerPortalSessionPage({
     console.error("[ciam]/referrer error", referrer_err);
   }
 
+  if (
+    TMP_SHOULD_REDIRECT_WHEN_SINGLE &&
+    iam_referrers &&
+    iam_referrers.length === 1
+  ) {
+    const r = iam_referrers[0];
+    const path = r?.campaign?.www_route_path;
+    const code = r?.code;
+    if (typeof path === "string" && path && typeof code === "string" && code) {
+      // FIXME: tenant url
+      return redirect(`${path}/t/${code}`);
+    }
+  }
+
   console.info("[ciam]/portal session redeemed", {
     tokenPreview,
     tokenLength: token.length,

editor/app/(tenant)/~/[tenant]/api/ciam/auth/challenge/with-email/route.ts

@@ -8,6 +8,7 @@ import TenantCIAMEmailVerification, {
 } from "@/theme/templates-email/ciam-verifiaction/default";
 import { otp6 } from "@/lib/crypto/otp";
 import { select_lang } from "@/i18n/utils";
+import { getLocale } from "@/i18n/server";
 
 /**
  * POST /api/ciam/auth/challenge/with-email
@@ -118,10 +119,11 @@ export async function POST(
       ? publisher
       : undefined;
 
-    const emailLang: CIAMVerificationEmailLang = select_lang(
-      www.lang,
-      supported_languages,
-      "en"
+    // Prefer the visitor's device language. If unsupported, fall back to the tenant default.
+    const fallback_lang = select_lang(www.lang, supported_languages, "en");
+    const emailLang: CIAMVerificationEmailLang = await getLocale(
+      [...supported_languages],
+      fallback_lang
     );
     const { error: resend_err } = await resend.emails.send({
       from: `${brand_name} <[email protected]>`,