's'

2026-03-12 19:52:34 -05:00
parent 4a223cd788
commit e5d080c202
18 changed files with 635 additions and 158 deletions
--- a/app/api/auth/link-email/route.ts
+++ b/app/api/auth/link-email/route.ts
@@ -0,0 +1,148 @@
+import { NextRequest, NextResponse } from "next/server";
+import { getPocketBaseConfig, SITE_ID } from "@/config/services.config";
+
+async function getAdminToken(): Promise<string | null> {
+  const email = process.env.POCKETBASE_EMAIL;
+  const password = process.env.POCKETBASE_PASSWORD;
+  if (!email || !password) return null;
+  const pb = getPocketBaseConfig();
+  const res = await fetch(`${pb.url}/api/admins/auth-with-password`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ identity: email, password }),
+  });
+  if (!res.ok) return null;
+  const data = await res.json();
+  return data?.token ?? null;
+}
+
+/** 将匿名 user_id 的支付记录关联到新创建的 PB 用户 */
+async function linkPaymentsToUser(
+  adminToken: string,
+  fromUserId: string,
+  toUserId: string
+): Promise<void> {
+  const pb = getPocketBaseConfig();
+  const filter = `user_id = "${fromUserId}"`;
+  const res = await fetch(
+    `${pb.url}/api/collections/payments/records?filter=${encodeURIComponent(filter)}&perPage=500`,
+    { headers: { Authorization: `Bearer ${adminToken}` } }
+  );
+  if (!res.ok) return;
+  const data = await res.json();
+  const items = data?.items ?? [];
+  for (const item of items) {
+    await fetch(`${pb.url}/api/collections/payments/records/${item.id}`, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${adminToken}`,
+      },
+      body: JSON.stringify({ user_id: toUserId }),
+    });
+  }
+}
+
+async function linkSiteVipToUser(
+  adminToken: string,
+  fromUserId: string,
+  toUserId: string
+): Promise<void> {
+  const pb = getPocketBaseConfig();
+  const filter = `user_id = "${fromUserId}" && site_id = "${SITE_ID}"`;
+  const res = await fetch(
+    `${pb.url}/api/collections/site_vip/records?filter=${encodeURIComponent(filter)}&perPage=500`,
+    { headers: { Authorization: `Bearer ${adminToken}` } }
+  );
+  if (!res.ok) return;
+  const data = await res.json();
+  const items = data?.items ?? [];
+  for (const item of items) {
+    await fetch(`${pb.url}/api/collections/site_vip/records/${item.id}`, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${adminToken}`,
+      },
+      body: JSON.stringify({ user_id: toUserId }),
+    });
+  }
+}
+
+export async function POST(request: NextRequest) {
+  const body = await request.json().catch(() => ({}));
+  const email = String(body?.email ?? "").trim();
+  const password = String(body?.password ?? "").trim();
+  const anonymousUserId = String(body?.anonymousUserId ?? "").trim();
+
+  if (!email || !password) {
+    return NextResponse.json({ ok: false, error: "请填写邮箱和密码" }, { status: 400 });
+  }
+  if (!anonymousUserId || !anonymousUserId.startsWith("user")) {
+    return NextResponse.json({ ok: false, error: "无效的匿名用户ID" }, { status: 400 });
+  }
+  if (password.length < 8) {
+    return NextResponse.json({ ok: false, error: "密码至少 8 位" }, { status: 400 });
+  }
+
+  const pb = getPocketBaseConfig();
+
+  // 1. 尝试注册，若已存在则登录
+  let token: string;
+  let record: { id: string; email?: string };
+  try {
+    const registerRes = await fetch(`${pb.url}/api/collections/users/records`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ email, password, passwordConfirm: password }),
+    });
+    if (registerRes.ok) {
+      const regData = await registerRes.json();
+      const loginRes = await fetch(`${pb.url}/api/collections/users/auth-with-password`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ identity: email, password }),
+      });
+      if (!loginRes.ok) throw new Error("登录失败");
+      const loginData = await loginRes.json();
+      token = loginData.token;
+      record = loginData.record;
+    } else {
+      const loginRes = await fetch(`${pb.url}/api/collections/users/auth-with-password`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ identity: email, password }),
+      });
+      if (!loginRes.ok) {
+        const err = await loginRes.json().catch(() => ({}));
+        return NextResponse.json(
+          { ok: false, error: err?.message || "邮箱或密码错误" },
+          { status: 401 }
+        );
+      }
+      const loginData = await loginRes.json();
+      token = loginData.token;
+      record = loginData.record;
+    }
+  } catch (e) {
+    return NextResponse.json(
+      { ok: false, error: e instanceof Error ? e.message : "注册/登录失败" },
+      { status: 500 }
+    );
+  }
+
+  const newUserId = record.id;
+
+  // 2. 用管理员 token 将 payments、site_vip 的 user_id 从匿名改为新用户
+  const adminToken = await getAdminToken();
+  if (adminToken) {
+    await linkPaymentsToUser(adminToken, anonymousUserId, newUserId);
+    await linkSiteVipToUser(adminToken, anonymousUserId, newUserId);
+  }
+
+  return NextResponse.json({
+    ok: true,
+    token,
+    record: { id: record.id, email: record.email },
+  });
+}
--- a/app/api/auth/logout/route.ts
+++ b/app/api/auth/logout/route.ts
@@ -1,15 +1,8 @@
 import { NextRequest, NextResponse } from "next/server";
-import { getAuthCookieDomain } from "@/app/lib/auth-cookie-domain";
-
-const COOKIE_NAME = "pb_session";
+import { COOKIE_NAME, getCookieOptions, getHostFromRequest } from "@/app/lib/auth-cookie";

 export async function POST(request: NextRequest) {
-  const domain = getAuthCookieDomain(request);
  const res = NextResponse.json({ ok: true });
-  res.cookies.set(COOKIE_NAME, "", {
-    ...(domain && { domain }),
-    path: "/",
-    maxAge: 0,
-  });
+  res.cookies.set(COOKIE_NAME, "", getCookieOptions(true, getHostFromRequest(request)) as Record<string, string | number | boolean>);
  return res;
 }
--- a/app/api/auth/me/route.ts
+++ b/app/api/auth/me/route.ts
@@ -1,13 +1,9 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getPocketBaseConfig } from "@/config/services.config";
-import { getAuthCookieDomain } from "@/app/lib/auth-cookie-domain";
-
-const COOKIE_NAME = "pb_session";
-const COOKIE_MAX_AGE = 60 * 60 * 24 * 365;
+import { COOKIE_NAME, getCookieOptions, getHostFromRequest } from "@/app/lib/auth-cookie";

 export async function GET(request: NextRequest) {
  const cookie = request.cookies.get(COOKIE_NAME)?.value;
-  const domain = getAuthCookieDomain(request);
  if (!cookie) {
    return NextResponse.json({ ok: true, user: null });
  }
@@ -17,12 +13,13 @@ export async function GET(request: NextRequest) {
    if (!token || !userId) return NextResponse.json({ ok: true, user: null });

    const pb = getPocketBaseConfig();
-    const res = await fetch(`${pb.url}/api/users/refresh`, {
+    const res = await fetch(`${pb.url}/api/collections/users/auth-refresh`, {
+      method: "POST",
      headers: { Authorization: `Bearer ${token}` },
    });
    if (!res.ok) {
      const r = NextResponse.json({ ok: true, user: null });
-      r.cookies.set(COOKIE_NAME, "", { ...(domain && { domain }), path: "/", maxAge: 0 });
+      r.cookies.set(COOKIE_NAME, "", getCookieOptions(true, getHostFromRequest(request)) as Record<string, string | number | boolean>);
      return r;
    }
    const data = await res.json();
@@ -40,14 +37,7 @@ export async function GET(request: NextRequest) {
        user: { id: newRecord.id, email: newRecord.email ?? email },
        token: newToken,
      });
-      r.cookies.set(COOKIE_NAME, encoded, {
-        ...(domain && { domain }),
-        path: "/",
-        maxAge: COOKIE_MAX_AGE,
-        secure: process.env.NODE_ENV === "production",
-        sameSite: "lax",
-        httpOnly: true,
-      });
+      r.cookies.set(COOKIE_NAME, encoded, getCookieOptions(false, getHostFromRequest(request)) as Record<string, string | number | boolean>);
      return r;
    }
    return NextResponse.json({
--- a/app/api/auth/sync-session/route.ts
+++ b/app/api/auth/sync-session/route.ts
@@ -1,8 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { getAuthCookieDomain } from "@/app/lib/auth-cookie-domain";
-
-const COOKIE_NAME = "pb_session";
-const COOKIE_MAX_AGE = 60 * 60 * 24 * 365; // 365 天，登录态持续有效直至用户主动退出
+import { COOKIE_NAME, getCookieOptions, getHostFromRequest } from "@/app/lib/auth-cookie";

 export async function POST(request: NextRequest) {
  const body = await request.json().catch(() => ({}));
@@ -19,15 +16,7 @@ export async function POST(request: NextRequest) {
  });
  const encoded = Buffer.from(payload, "utf-8").toString("base64url");

-  const domain = getAuthCookieDomain(request);
  const res = NextResponse.json({ ok: true });
-  res.cookies.set(COOKIE_NAME, encoded, {
-    ...(domain && { domain }),
-    path: "/",
-    maxAge: COOKIE_MAX_AGE,
-    secure: process.env.NODE_ENV === "production",
-    sameSite: "lax",
-    httpOnly: true,
-  });
+  res.cookies.set(COOKIE_NAME, encoded, getCookieOptions(false, getHostFromRequest(request)) as Record<string, string | number | boolean>);
  return res;
 }
--- a/app/api/pay/route.ts
+++ b/app/api/pay/route.ts
@@ -3,7 +3,7 @@
 * PC: 二维码 | H5: 302 跳转 | 微信内: 收银台表单
 */
 import { NextRequest, NextResponse } from "next/server";
-import { getPaymentConfig } from "@/config/services.config";
+import { getPaymentConfig, getApiUrlFromRequest } from "@/config/services.config";

 const ZPAY_REQUIRED = ["pid", "type", "out_trade_no", "notify_url", "return_url", "name", "money", "sign", "sign_type"];

@@ -68,7 +68,7 @@ async function createPayOrder(
    ...(provider && { provider }),
  };
  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), 15000);
+  const timeout = setTimeout(() => controller.abort(), 30000);
  const res = await fetch(`${apiUrl}/nomadvip/payh5`, {
    method: "POST",
    headers: { "Content-Type": "application/json" },
@@ -104,7 +104,8 @@ export async function POST(request: NextRequest) {
    }

    const payConfig = getPaymentConfig();
-    const apiUrl = payConfig.apiUrl.replace(/\/$/, "");
+    const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host");
+    const apiUrl = (getApiUrlFromRequest(hostHeader) || payConfig.apiUrl).replace(/\/$/, "");
    let user_id = String(body?.user_id || "").trim();
    if (user_id.startsWith("{") && user_id.includes("data")) {
      try {