eric/gitlab-instance-0a899031_cnomadcna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

's'

Browse Source
This commit is contained in:
eric
2026-03-13 05:51:29 -05:00
parent 8a095f7d45
commit 15dba690d3
9 changed files with 103 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/[locale]/join/page.tsx
View File

@@ -84,12 +84,13 @@ export default function JoinPage() {
checkExisting();
}, []);
// 轮询到支付成功时跳转到 /join/paid，避免在 /join 重复显示成功页
usePayStatusPoll(() => {
// 轮询到支付成功时跳转到 /join/paid，携带 order_id 供 complete-order 使用
usePayStatusPoll((orderId) => {
if (typeof window === "undefined") return;
const path = window.location.pathname;
const paidPath = path.replace(/\/join\/?$/, "") + "/join/paid";
window.location.replace(paidPath);
const url = orderId ? `${paidPath}?order_id=${encodeURIComponent(orderId)}` : paidPath;
window.location.replace(url);
});
useEffect(() => {

18
app/[locale]/join/paid/page.tsx
View File

@@ -53,18 +53,32 @@ export default function JoinPaidPage() {
pbSaveAuth(d.token, d.record);
}
window.dispatchEvent(new CustomEvent("auth:updated"));
setTimeout(() => window.dispatchEvent(new CustomEvent("auth:updated")), 500);
window.dispatchEvent(new CustomEvent("vip:updated"));
setTimeout(() => {
window.dispatchEvent(new CustomEvent("auth:updated"));
window.dispatchEvent(new CustomEvent("vip:updated"));
}, 400);
if (d.is_new) {
await fetch("/api/meetup/set-needs-password-change", { method: "POST", credentials: "include" });
if (!cancelled) {
setNeedPasswordChange(true);
setShowPasswordModal(true);
}
} else {
const needRes = await fetch("/api/meetup/need-password-change", { credentials: "include" });
const needData = await needRes.json().catch(() => ({}));
if (!cancelled && needData?.need === true) {
setNeedPasswordChange(true);
setShowPasswordModal(true);
}
}
return { ok: true };
};
const run = async () => {
const urlOrderId = typeof window !== "undefined"
? new URLSearchParams(window.location.search).get("order_id") || ""
: "";
const cookie = document.cookie.split(";").find((c) => c.trim().startsWith("join_pay_order="));
const rawValue = cookie?.split("=")[1]?.trim();
const storageValue = (() => {
@@ -75,7 +89,7 @@ export default function JoinPaidPage() {
}
})();
const decoded = rawValue ? decodeURIComponent(rawValue) : storageValue;
const orderId = decoded.split("|")[0]?.trim() || "";
const orderId = urlOrderId || decoded.split("|")[0]?.trim() || "";
if (!orderId) {
clearPendingOrder();
window.location.replace(`/${window.location.pathname.split("/")[1] || "zh"}/join`);

18
app/components/HeroSection.tsx
View File

@@ -1,6 +1,6 @@
"use client";
import { useState, useCallback, useEffect } from "react";
import { useState, useCallback, useEffect, useRef } from "react";
import { Link, useLocale } from "@/i18n/navigation";
import { useTranslation } from "@/i18n/navigation";
import JoinModal from "./JoinModal";
@@ -85,6 +85,9 @@ export default function HeroSection() {
return () => window.removeEventListener("auth:updated", onAuth);
}, []);
const checkUserCacheRef = useRef<{ email: string; data: { exists: boolean; vip: boolean }; ts: number } | null>(null);
const CACHE_TTL_MS = 60_000;
const handleCheckAndProceed = useCallback(
async (em: string) => {
if (checking) return;
@@ -96,6 +99,15 @@ export default function HeroSection() {
setError(null);
setChecking(true);
try {
const cached = checkUserCacheRef.current;
if (cached && cached.email === trimmed && Date.now() - cached.ts < CACHE_TTL_MS) {
const { exists, vip } = cached.data;
if (exists) {
setJoinModalVipOnly(!!vip);
setJoinModalOpen(true);
return;
}
}
const checkRes = await fetch("/api/meetup/check-user", {
method: "POST",
headers: { "Content-Type": "application/json" },
@@ -107,6 +119,7 @@ export default function HeroSection() {
throw new Error(checkData?.error || checkData?.detail || (locale === "zh" ? "操作失败" : "Operation failed"));
}
if (checkData.exists) {
checkUserCacheRef.current = { email: trimmed, data: { exists: true, vip: !!checkData.vip }, ts: Date.now() };
if (checkData.vip) {
setJoinModalOpen(true);
setJoinModalVipOnly(true);
@@ -136,6 +149,9 @@ export default function HeroSection() {
(locale === "zh" ? "创建用户失败" : "Failed to create user")
);
}
if (ensureData.is_new) {
await fetch("/api/meetup/set-needs-password-change", { method: "POST", credentials: "include" });
}
user_id = String(ensureData.user_id).trim();
if (ensureData?.token && ensureData?.record) {
await fetch("/api/auth/sync-session", {

3
app/components/JoinModal.tsx
View File

@@ -54,6 +54,9 @@ export default function JoinModal({ isOpen, onClose, initialEmail = "", vipOnly
if (!res.ok || !data?.ok) {
throw new Error(data?.error || (locale === "zh" ? "操作失败" : "Operation failed"));
}
if (data.is_new) {
await fetch("/api/meetup/set-needs-password-change", { method: "POST", credentials: "include" });
}
const { pbSaveAuth } = await import("@/app/lib/pocketbase");
pbSaveAuth(data.token, data.record);
await fetch("/api/auth/sync-session", {

37
app/components/Navbar.tsx
View File

@@ -2,7 +2,7 @@
import { useState, useEffect, useCallback } from "react";
import { Link, useLocale, usePathname, useRouter, useTranslation } from "@/i18n/navigation";
import { getStoredUserEmail, pbLogout } from "@/app/lib/pocketbase";
import { getStoredUserEmail, getStoredUser, getStoredToken, pbLogout } from "@/app/lib/pocketbase";
import { getNavLinks } from "@/config";
import AuthModal from "./AuthModal";
import ThemeToggle from "./ThemeToggle";
@@ -25,8 +25,8 @@ export default function NavbarComponent() {
const fetchAuth = useCallback(async () => {
try {
const res = await fetch("/api/auth/me", { credentials: "include", cache: "no-store" });
const data = await res.json();
let res = await fetch("/api/auth/me", { credentials: "include", cache: "no-store" });
let data = await res.json();
if (data?.user && data?.token) {
const { pbSaveAuth } = await import("@/app/lib/pocketbase");
pbSaveAuth(data.token, { id: data.user.id, email: data.user.email });
@@ -34,6 +34,25 @@ export default function NavbarComponent() {
setUserVip(!!data.user.vip);
return;
}
const token = getStoredToken();
const record = getStoredUser();
if (token && record?.id && record?.email) {
const syncRes = await fetch("/api/auth/sync-session", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ token, record }),
credentials: "include",
});
if (syncRes.ok) {
res = await fetch("/api/auth/me", { credentials: "include", cache: "no-store" });
data = await res.json();
if (data?.user && data?.token) {
setUserEmail(data.user.email);
setUserVip(!!data.user.vip);
return;
}
}
}
} catch {
/* ignore */
}
@@ -47,15 +66,21 @@ export default function NavbarComponent() {
useEffect(() => {
const onAuthUpdated = () => fetchAuth();
const onVipUpdated = () => fetchAuth();
window.addEventListener("auth:updated", onAuthUpdated);
return () => window.removeEventListener("auth:updated", onAuthUpdated);
window.addEventListener("vip:updated", onVipUpdated);
return () => {
window.removeEventListener("auth:updated", onAuthUpdated);
window.removeEventListener("vip:updated", onVipUpdated);
};
}, [fetchAuth]);
const handleLogout = useCallback(async () => {
await pbLogout();
setUserEmail(null);
setUserVip(false);
}, []);
router.replace("/");
}, [router]);
const isActive = useCallback((href: string) => {
if (href.startsWith("/#")) return false;
@@ -124,7 +149,7 @@ export default function NavbarComponent() {
<span className="hidden sm:block max-w-[120px] truncate text-sm text-gray-600 dark:text-gray-400">
{userEmail}
</span>
<UserAvatar email={userEmail} isVip={userVip} onLogout={() => { setUserEmail(null); setUserVip(false); }} />
<UserAvatar email={userEmail} isVip={userVip} onLogout={handleLogout} />
</div>
) : null}
<button

17
app/lib/payment/usePayStatusPoll.ts
View File

@@ -54,18 +54,27 @@ function parsePendingOrder(raw: string | null): [string | null, boolean] {
return [orderId, true];
}
export function usePayStatusPoll(onPaid: () => void): boolean {
export function usePayStatusPoll(onPaid: (orderId: string) => void): boolean {
const [polling, setPolling] = useState(false);
const onPaidRef = useRef(onPaid);
onPaidRef.current = onPaid;
useEffect(() => {
const urlOrderId =
typeof window !== "undefined"
? new URLSearchParams(window.location.search).get("order_id") || ""
: "";
const cookieRaw = getCookie(COOKIE_NAME);
const [cookieOrderId, cookieValid] = parsePendingOrder(cookieRaw);
const storageRaw = getStorage(STORAGE_NAME);
const [storageOrderId, storageValid] = parsePendingOrder(storageRaw);
const orderId = cookieValid ? cookieOrderId : storageValid ? storageOrderId : null;
const activeRaw = cookieValid ? cookieRaw : storageValid ? storageRaw : null;
let orderId = cookieValid ? cookieOrderId : storageValid ? storageOrderId : null;
let activeRaw = cookieValid ? cookieRaw : storageValid ? storageRaw : null;
if (!orderId && urlOrderId.trim()) {
orderId = urlOrderId.trim();
activeRaw = `${orderId}|${Date.now()}`;
persistPendingOrder(activeRaw);
}
if (!orderId) {
if (cookieRaw || storageRaw) {
@@ -120,7 +129,7 @@ export function usePayStatusPoll(onPaid: () => void): boolean {
stop();
clearPendingOrder();
setPolling(false);
onPaidRef.current();
onPaidRef.current(orderId);
return;
}
} catch {

18
app/lib/pocketbase/auth.ts
View File

@@ -67,11 +67,17 @@ export function pbSaveAuth(token: string, record: AuthUser): void {
localStorage.setItem(PB_STORAGE_KEYS.user, JSON.stringify(record));
}
/** 登出 - 清除本地存储和根域 Cookie */
/** 登出 - 清除本地存储、支付订单、根域 Cookie */
export async function pbLogout(): Promise<void> {
if (typeof window === "undefined") return;
localStorage.removeItem(PB_STORAGE_KEYS.token);
localStorage.removeItem(PB_STORAGE_KEYS.user);
localStorage.removeItem("join_pay_order");
try {
document.cookie = "join_pay_order=; path=/; max-age=0";
} catch {
/* ignore */
}
try {
await fetch("/api/auth/logout", { method: "POST", credentials: "include" });
} catch {
@@ -80,18 +86,24 @@ export async function pbLogout(): Promise<void> {
window.dispatchEvent(new CustomEvent("auth:updated"));
}
export function getStoredUserEmail(): string | null {
export function getStoredUser(): AuthUser | null {
if (typeof window === "undefined") return null;
try {
const raw = localStorage.getItem(PB_STORAGE_KEYS.user);
if (!raw) return null;
const user = JSON.parse(raw);
return user?.email ?? null;
if (!user?.id || !user?.email) return null;
return user;
} catch {
return null;
}
}
export function getStoredUserEmail(): string | null {
const user = getStoredUser();
return user?.email ?? null;
}
export function getStoredToken(): string | null {
if (typeof window === "undefined") return null;
return localStorage.getItem(PB_STORAGE_KEYS.token);

1
app/lib/pocketbase/index.ts
View File

@@ -3,6 +3,7 @@ export {
pbRegister,
pbSaveAuth,
pbLogout,
getStoredUser,
getStoredUserEmail,
getStoredToken,
} from "./auth";

6
config/services.config.ts
View File

@@ -44,8 +44,8 @@ const PAYJSAPI_PORT = process.env.PAYJSAPI_PORT || "8007";
/** 站点标识，用于 VIP 按站点隔离 */
export const SITE_ID = process.env.NEXT_PUBLIC_SITE_ID || "meetup";
/** meetup 加入游牧中国 价格（分），测试用1元 */
export const MEETUP_JOIN_AMOUNT = 100;
/** meetup 加入游牧中国 价格（分），88元=8800 */
export const MEETUP_JOIN_AMOUNT = 8800;
export function getApiUrlFromRequest(hostHeader: string | null): string | null {
if (!hostHeader) return null;
@@ -71,7 +71,7 @@ export function getPaymentConfig(): PaymentConfig {
enabled: true,
apiUrl: process.env.PAYMENT_API_URL || DEFAULT_PAYMENT_API_URL,
provider: (process.env.PAYMENT_PROVIDER as "zpay" | "xorpay") || "zpay",
defaultAmount: Number(process.env.PAYMENT_DEFAULT_AMOUNT) || 100,
defaultAmount: Number(process.env.PAYMENT_DEFAULT_AMOUNT) || 8800,
defaultType: process.env.PAYMENT_DEFAULT_TYPE || "meetup",
zpaySubmitUrl: process.env.ZPAY_SUBMIT_URL || "https://zpayz.cn/submit.php",
};