From 072e5362f555daa939e5702565ddddca937dd111 Mon Sep 17 00:00:00 2001 From: adilallo <39313955+adilallo@users.noreply.github.com> Date: Fri, 20 Nov 2026 15:36:06 -0700 Subject: [PATCH] Hold /privacy behind a flag until counsel reads it, and fix leftover legal and email copy. --- .env.example | 8 +- app/(admin)/layout.tsx | 3 +- app/(app)/layout.tsx | 3 +- app/(app)/login/LoginPageClient.tsx | 72 ++++++++++++ app/(app)/login/page.tsx | 64 +---------- app/(dev)/layout.tsx | 3 +- .../_components/LegalDocumentPage.tsx | 5 +- app/(marketing)/layout.tsx | 3 +- app/(marketing)/privacy/page.tsx | 4 + app/(marketing-case-study)/layout.tsx | 3 +- app/api/organizer-inquiry/route.ts | 7 +- app/api/user/email-change/request/route.ts | 2 +- app/components/modals/Login/LoginForm.tsx | 21 ++-- app/components/navigation/Footer.tsx | 16 ++- .../navigation/FooterWithOrigin.tsx | 8 +- app/contexts/AuthModalContext.tsx | 9 +- docs/guides/ops-backend-deploy.md | 13 ++- docs/guides/ops-runbook.md | 5 +- docs/privacy-policy-facts.md | 7 +- lib/privacyPolicyEnabled.ts | 17 +++ lib/publicSitemap.ts | 5 +- lib/server/magicLinkMail.ts | 105 +++++++++++++----- lib/server/mail.ts | 29 +++-- lib/server/mailLegalFooter.ts | 30 +++++ lib/server/ruleFollowUpMail.ts | 16 +-- lib/server/ruleStakeholderInviteMail.ts | 18 +-- lib/useCaseTemplateDuplicate.ts | 2 +- messages/en/metadata.json | 20 ++-- messages/en/pages/cookies.json | 13 ++- messages/en/pages/monitor.json | 2 +- messages/en/pages/privacy.json | 6 +- tests/components/Footer.test.tsx | 12 +- tests/components/LoginForm.test.tsx | 16 ++- tests/mocks/navigation.ts | 3 + tests/pages/legal.test.tsx | 60 ++++++++-- tests/unit/magicLinkMail.test.ts | 47 +++++++- tests/unit/mail.test.ts | 14 ++- tests/unit/organizerInquiryPostRoute.test.ts | 2 + tests/unit/privacyPolicyEnabled.test.ts | 40 +++++++ tests/unit/publicSitemap.test.ts | 20 ++++ tests/unit/useCaseTemplateDuplicate.test.ts | 2 +- .../unit/userEmailChangeRequestRoute.test.ts | 1 + vitest.setup.ts | 3 + 43 files changed, 548 insertions(+), 191 deletions(-) create mode 100644 app/(app)/login/LoginPageClient.tsx create mode 100644 lib/privacyPolicyEnabled.ts create mode 100644 lib/server/mailLegalFooter.ts create mode 100644 tests/unit/privacyPolicyEnabled.test.ts diff --git a/.env.example b/.env.example index 60f8c28..8d6f17e 100644 --- a/.env.example +++ b/.env.example @@ -13,7 +13,13 @@ SESSION_SECRET="dev-only-change-me-16chars-min" # CLOUDRON_MAIL_SMTP_PASSWORD= # Leave mail vars unset in dev to log the magic-link verify URL to the server console instead of sending email. -SMTP_FROM="Community Rule " +SMTP_FROM="CommunityRule " + +# /privacy. Unset or any value other than `true` is off (404, no footer/login/email links). +# Staging: `true`. Production stays off until university counsel has read the policy. +# ENABLE_PRIVACY_POLICY is the Cloudron runtime switch. The NEXT_PUBLIC_ alias bakes at image build. +# ENABLE_PRIVACY_POLICY=true +# NEXT_PUBLIC_ENABLE_PRIVACY_POLICY=true # CR-107: inbox for Ask an organizer form submissions (requires CLOUDRON_MAIL_SMTP_* in production). ORGANIZER_INQUIRY_TO= diff --git a/app/(admin)/layout.tsx b/app/(admin)/layout.tsx index bac82f4..a506100 100644 --- a/app/(admin)/layout.tsx +++ b/app/(admin)/layout.tsx @@ -6,6 +6,7 @@ import { MessagesProvider } from "../contexts/MessagesContext"; import { AuthModalProvider } from "../contexts/AuthModalContext"; import messages from "../../messages/en/index"; import { MAIN_CONTENT_ID } from "../../lib/mainContent"; +import { isPrivacyPolicyEnabled } from "../../lib/privacyPolicyEnabled"; import { NO_INDEX_ROBOTS } from "../../lib/siteMetadata"; export const metadata: Metadata = { @@ -21,7 +22,7 @@ export const metadata: Metadata = { export default function AdminLayout({ children }: { children: ReactNode }) { return ( - + diff --git a/app/(app)/layout.tsx b/app/(app)/layout.tsx index 56d66c1..a10002a 100644 --- a/app/(app)/layout.tsx +++ b/app/(app)/layout.tsx @@ -6,6 +6,7 @@ import { MessagesProvider } from "../contexts/MessagesContext"; import { AuthModalProvider } from "../contexts/AuthModalContext"; import messages from "../../messages/en/index"; import { MAIN_CONTENT_ID } from "../../lib/mainContent"; +import { isPrivacyPolicyEnabled } from "../../lib/privacyPolicyEnabled"; import { NO_INDEX_ROBOTS } from "../../lib/siteMetadata"; export const metadata: Metadata = { @@ -28,7 +29,7 @@ export const metadata: Metadata = { export default function AppLayout({ children }: { children: ReactNode }) { return ( - + diff --git a/app/(app)/login/LoginPageClient.tsx b/app/(app)/login/LoginPageClient.tsx new file mode 100644 index 0000000..d2459e7 --- /dev/null +++ b/app/(app)/login/LoginPageClient.tsx @@ -0,0 +1,72 @@ +"use client"; + +import { Suspense } from "react"; +import Link from "next/link"; +import { useRouter } from "next/navigation"; +import { useTranslation } from "../../contexts/MessagesContext"; +import Login from "../../components/modals/Login"; +import LoginForm from "../../components/modals/Login/LoginForm"; + +const loginPageBgClass = + "min-h-[100dvh] bg-[var(--color-surface-invert-brand-primary)]"; + +function LoginLoadingFallback() { + const t = useTranslation("pages.login"); + return ( +
+

+ {t("loadingFallback")} +

+
+ ); +} + +function LoginWithSearchParams({ + privacyEnabled, +}: { + privacyEnabled: boolean; +}) { + const router = useRouter(); + const t = useTranslation("pages.login"); + const closeToHome = () => { + router.push("/"); + }; + + return ( +
+ + {t("backToHome")} + + } + > + + +
+ ); +} + +/** + * Full-page login shell for magic-link **error redirects** (`?error=*`) and direct `/login` visits. + * Header **Log in** uses `AuthModalProvider` instead; this route stays for verify failures and bookmarks. + */ +export default function LoginPageClient({ + privacyEnabled, +}: { + privacyEnabled: boolean; +}) { + return ( + }> + + + ); +} diff --git a/app/(app)/login/page.tsx b/app/(app)/login/page.tsx index d9f0241..72bebdc 100644 --- a/app/(app)/login/page.tsx +++ b/app/(app)/login/page.tsx @@ -1,64 +1,6 @@ -"use client"; - -import { Suspense } from "react"; -import Link from "next/link"; -import { useRouter } from "next/navigation"; -import { useTranslation } from "../../contexts/MessagesContext"; -import Login from "../../components/modals/Login"; -import LoginForm from "../../components/modals/Login/LoginForm"; - -const loginPageBgClass = - "min-h-[100dvh] bg-[var(--color-surface-invert-brand-primary)]"; - -function LoginLoadingFallback() { - const t = useTranslation("pages.login"); - return ( -
-

- {t("loadingFallback")} -

-
- ); -} - -/** - * Full-page login shell for magic-link **error redirects** (`?error=*`) and direct `/login` visits. - * Header **Log in** uses `AuthModalProvider` instead; this route stays for verify failures and bookmarks. - */ -function LoginWithSearchParams() { - const router = useRouter(); - const t = useTranslation("pages.login"); - const closeToHome = () => { - router.push("/"); - }; - - return ( -
- - {t("backToHome")} - - } - > - - -
- ); -} +import { isPrivacyPolicyEnabled } from "../../../lib/privacyPolicyEnabled"; +import LoginPageClient from "./LoginPageClient"; export default function LoginPage() { - return ( - }> - - - ); + return ; } diff --git a/app/(dev)/layout.tsx b/app/(dev)/layout.tsx index 7383768..d71bee0 100644 --- a/app/(dev)/layout.tsx +++ b/app/(dev)/layout.tsx @@ -5,6 +5,7 @@ import { MessagesProvider } from "../contexts/MessagesContext"; import { AuthModalProvider } from "../contexts/AuthModalContext"; import messages from "../../messages/en/index"; import { MAIN_CONTENT_ID } from "../../lib/mainContent"; +import { isPrivacyPolicyEnabled } from "../../lib/privacyPolicyEnabled"; import { NO_INDEX_ROBOTS } from "../../lib/siteMetadata"; export const metadata: Metadata = { @@ -18,7 +19,7 @@ export default function DevLayout({ children }: { children: ReactNode }) { } return ( - +
- + {/* * Same session-aware shell as `(app)` / `(admin)`: `ConditionalNavigation` * reads the cookie behind Suspense so the static page shell can prerender diff --git a/app/(marketing)/privacy/page.tsx b/app/(marketing)/privacy/page.tsx index 35efafc..11e2b86 100644 --- a/app/(marketing)/privacy/page.tsx +++ b/app/(marketing)/privacy/page.tsx @@ -3,8 +3,10 @@ * https://www.figma.com/design/agv0VBLiBlcnSAaiAORgPR/Community-Rule-System?node-id=19003-23305 */ import type { Metadata } from "next"; +import { notFound } from "next/navigation"; import messages from "../../../messages/en/index"; import { legalPathForSlug } from "../../../lib/legalSyntheticPost"; +import { isPrivacyPolicyEnabled } from "../../../lib/privacyPolicyEnabled"; import { routeMetadata } from "../../../lib/siteMetadata"; import LegalDocumentPage, { legalPageMetadata, @@ -14,6 +16,7 @@ const SLUG = "privacy" as const; const PATH = legalPathForSlug(SLUG); export function generateMetadata(): Metadata { + if (!isPrivacyPolicyEnabled()) notFound(); return routeMetadata( PATH, legalPageMetadata(messages.metadata.privacy, messages.pages.privacy), @@ -21,6 +24,7 @@ export function generateMetadata(): Metadata { } export default function PrivacyPage() { + if (!isPrivacyPolicyEnabled()) notFound(); return ( - +
void; /** Sent-state Close, and the dialog chrome close. */ @@ -120,6 +122,7 @@ export type LoginFormProps = { export default function LoginForm({ variant = "default", magicLinkNextPath, + privacyEnabled = false, onDismiss, onClose, }: LoginFormProps) { @@ -365,13 +368,17 @@ export default function LoginForm({ > {tFooter("legal.termsOfService")} - {t("legalAnd")} - - {tFooter("legal.privacyPolicy")} - + {privacyEnabled ? ( + <> + {t("legalAnd")} + + {tFooter("legal.privacyPolicy")} + + + ) : null} {t("legalSuffix")}

diff --git a/app/components/navigation/Footer.tsx b/app/components/navigation/Footer.tsx index 0fa2402..4ac9bc3 100644 --- a/app/components/navigation/Footer.tsx +++ b/app/components/navigation/Footer.tsx @@ -13,7 +13,13 @@ import { PRODUCTION_SITE_ORIGIN } from "../../../lib/siteMetadata"; * Tiers: smallest viewports (below `md`), `md` through `lg`, `lg` and up. * Matches `--breakpoint-md: 640px`, `--breakpoint-lg: 1024px` in `app/tailwind.css`. */ -const Footer = memo(({ siteOrigin = PRODUCTION_SITE_ORIGIN }: { siteOrigin?: string }) => { +const Footer = memo(({ + siteOrigin = PRODUCTION_SITE_ORIGIN, + privacyEnabled = false, +}: { + siteOrigin?: string; + privacyEnabled?: boolean; +}) => { const t = useTranslation("footer"); const tChrome = useTranslation("controlsChrome"); @@ -213,9 +219,11 @@ const Footer = memo(({ siteOrigin = PRODUCTION_SITE_ORIGIN }: { siteOrigin?: str {t("takeaway")} - - {t("legal.privacyPolicy")} - + {privacyEnabled ? ( + + {t("legal.privacyPolicy")} + + ) : null} {t("legal.termsOfService")} diff --git a/app/components/navigation/FooterWithOrigin.tsx b/app/components/navigation/FooterWithOrigin.tsx index bdb94a9..46175d0 100644 --- a/app/components/navigation/FooterWithOrigin.tsx +++ b/app/components/navigation/FooterWithOrigin.tsx @@ -1,8 +1,14 @@ import Footer from "./Footer"; +import { isPrivacyPolicyEnabled } from "../../../lib/privacyPolicyEnabled"; import { getRequestSiteOrigin } from "../../../lib/requestSiteOrigin"; /** Footer JSON-LD uses the request origin, same host as the page canonical. */ export default async function FooterWithOrigin() { const siteOrigin = await getRequestSiteOrigin(); - return