Serve the app on app.qrmaster.net, marketing on www

Splits the two hostnames across one deployment. No files move: the Next app still
serves every route on both hosts, and the middleware decides per host which paths it
owns and 301s the rest. /login and /signup stay on www - all 82 marketing CTAs point
at /signup, which carries a hard canonical to www plus ad traffic.

src/lib/hosts.ts is the single source of truth for the boundary (APP_PATH_PREFIXES,
isAppPath, wwwUrl, appUrl, urlForPath). The middleware and every absolute-URL builder
read from it so they cannot drift apart.

- Split the overloaded NEXT_PUBLIC_APP_URL into a www and an app origin. It previously
  fed both public URLs and in-app URLs, so any single value was wrong somewhere. Most
  important: QRCodeCard encodes this origin into the QR code the user downloads and
  prints, so it must stay on www.
- Route Stripe return URLs, email links and OAuth redirects per path rather than
  against one origin, so /dashboard lands on app and /pricing on www.
- Cross the host boundary once, after a successful login: the router cannot push across
  origins, so that jump needs a full load. The user arrives signed in because the
  session cookie is scoped to COOKIE_DOMAIN.
- Keep the app host out of search indexes: X-Robots-Tag on every response plus a
  Disallow-all robots.txt via rewrite, and /sitemap.xml redirects to www.
- Point the TikTok callback fallback at www explicitly. It used to read
  NEXT_PUBLIC_APP_URL, whose meaning changed here, and only the apex domain is
  verified with TikTok.

Host splitting is inert while both origins are equal, so development is unaffected.

Verified: tsc clean, production build succeeds including the Edge middleware bundle,
and the path-to-host mapping is unit-checked (prefix traps like /created and
/settings-guide stay on www, query strings do not break matching).

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
2026-08-12 19:44:08 +02:00
parent 35ea8cc3e9
commit 53ef4b3b91
22 changed files with 383 additions and 63 deletions

View File

@@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from 'next/server';
import { stripe } from '@/lib/stripe';
import { db } from '@/lib/db';
import { cookies } from 'next/headers';
import { appUrl, wwwUrl } from '@/lib/hosts';
export async function POST(request: NextRequest) {
try {
@@ -53,15 +54,16 @@ export async function POST(request: NextRequest) {
customer: customerId,
mode: 'subscription',
payment_method_types: ['card'],
allow_promotion_codes: true,
allow_promotion_codes: true,
line_items: [
{
price: priceId,
quantity: 1,
},
],
success_url: `${process.env.NEXT_PUBLIC_APP_URL}/dashboard?success=true`,
cancel_url: `${process.env.NEXT_PUBLIC_APP_URL}/pricing?canceled=true`,
// /dashboard is on the app host, /pricing on the marketing host.
success_url: appUrl('/dashboard?success=true'),
cancel_url: wwwUrl('/pricing?canceled=true'),
metadata: {
userId: user.id,
plan,

View File

@@ -3,6 +3,7 @@ import { stripe, STRIPE_PLANS } from '@/lib/stripe';
import { db } from '@/lib/db';
import { getSessionUserId } from '@/lib/session';
import { rateLimit, getClientIdentifier, RateLimits } from '@/lib/rateLimit';
import { urlForPath } from '@/lib/hosts';
export async function POST(request: NextRequest) {
try {
@@ -109,7 +110,11 @@ export async function POST(request: NextRequest) {
});
}
const appUrl = process.env.NEXT_PUBLIC_APP_URL || request.nextUrl.origin;
// Resolved per path rather than against a single origin: safeReturnPath comes from an
// in-app page (/dashboard, /upgrade, ...) and belongs on the app host, while the
// default cancel target /pricing belongs on the marketing host.
const withParam = (path: string, param: string) =>
`${path}${path.includes('?') ? '&' : '?'}${param}`;
// Create Stripe Checkout Session
const checkoutSession = await stripe.checkout.sessions.create({
@@ -123,12 +128,13 @@ export async function POST(request: NextRequest) {
quantity: 1,
},
],
success_url: safeReturnPath
? `${appUrl}${safeReturnPath}${safeReturnPath.includes('?') ? '&' : '?'}success=true&session_id={CHECKOUT_SESSION_ID}`
: `${appUrl}/dashboard?success=true&session_id={CHECKOUT_SESSION_ID}`,
cancel_url: safeReturnPath
? `${appUrl}${safeReturnPath}${safeReturnPath.includes('?') ? '&' : '?'}canceled=true`
: `${appUrl}/pricing?canceled=true`,
success_url: urlForPath(
withParam(
safeReturnPath || '/dashboard',
'success=true&session_id={CHECKOUT_SESSION_ID}'
)
),
cancel_url: urlForPath(withParam(safeReturnPath || '/pricing', 'canceled=true')),
metadata: {
userId: user.id,
plan,

View File

@@ -3,6 +3,7 @@ import { getSessionUserId } from '@/lib/session';
import { stripe } from '@/lib/stripe';
import { db } from '@/lib/db';
import { rateLimit, getClientIdentifier, RateLimits } from '@/lib/rateLimit';
import { appUrl } from '@/lib/hosts';
export async function POST(request: NextRequest) {
try {
@@ -56,7 +57,7 @@ export async function POST(request: NextRequest) {
// Create Stripe Customer Portal session
const portalSession = await stripe.billingPortal.sessions.create({
customer: user.stripeCustomerId,
return_url: `${process.env.NEXT_PUBLIC_APP_URL || 'http://localhost:3000'}/settings`,
return_url: appUrl('/settings'),
});
return NextResponse.json({ url: portalSession.url });