保留登录前的反馈详情地址

This commit is contained in:
WuYongJie 2026-11-18 18:49:54 +08:00
parent 53b376c739
commit a13a6cc180
2 changed files with 32 additions and 29 deletions

View File

@ -23,6 +23,21 @@ import { AntigravityBackground } from "@/components/antigravity-background";
import { createClientLogger } from "@/lib/observability/client-logger"; import { createClientLogger } from "@/lib/observability/client-logger";
const logger = createClientLogger("auth-login"); const logger = createClientLogger("auth-login");
function getSafeLoginCallbackUrl() {
const { origin, search } = window.location;
const callbackUrl = new URLSearchParams(search).get("callbackUrl");
if (!callbackUrl?.startsWith("/")) return "/";
try {
const { origin: targetOrigin, pathname, search, hash } = new URL(callbackUrl, origin);
if (targetOrigin !== origin || pathname.startsWith("//")) return "/";
return pathname + search + hash;
} catch {
return "/";
}
}
export default function Page() { export default function Page() {
const [email, setEmail] = useState(""); const [email, setEmail] = useState("");
const [isSuccessful, setIsSuccessful] = useState(false); const [isSuccessful, setIsSuccessful] = useState(false);
@ -70,7 +85,7 @@ export default function Page() {
.then((data) => { .then((data) => {
if (cancelled) return; if (cancelled) return;
if (data?.valid === true && data?.userType !== "guest") { if (data?.valid === true && data?.userType !== "guest") {
window.location.replace("/"); window.location.replace(getSafeLoginCallbackUrl());
return; return;
} }
setIsCheckingExistingSession(false); setIsCheckingExistingSession(false);
@ -90,6 +105,7 @@ export default function Page() {
const completeDingTalkLogin = useCallback(async (token: string) => { const completeDingTalkLogin = useCallback(async (token: string) => {
logger.debug("[DingTalk] Completing login with token", { hasToken: Boolean(token) }); logger.debug("[DingTalk] Completing login with token", { hasToken: Boolean(token) });
setIsHandlingToken(true); setIsHandlingToken(true);
const callbackUrl = getSafeLoginCallbackUrl();
try { try {
// 获取 CSRF token // 获取 CSRF token
@ -106,7 +122,7 @@ export default function Page() {
body: new URLSearchParams({ body: new URLSearchParams({
csrfToken, csrfToken,
token, token,
callbackUrl: "/", callbackUrl,
}), }),
credentials: "include", // 重要:确保 cookie 被发送和接收 credentials: "include", // 重要:确保 cookie 被发送和接收
}); });
@ -134,12 +150,12 @@ export default function Page() {
}); });
if (session && session.user) { if (session && session.user) {
logger.debug("[DingTalk] Session validated, redirecting to home..."); logger.debug("[DingTalk] Session validated, redirecting...");
setIsSuccessful(true); setIsSuccessful(true);
// 使用 replace 而不是 href,避免在历史记录中留下登录页 // 使用 replace 而不是 href,避免在历史记录中留下登录页
// 增加短暂延迟确保 cookie 完全同步 // 增加短暂延迟确保 cookie 完全同步
setTimeout(() => { setTimeout(() => {
window.location.replace("/"); window.location.replace(callbackUrl);
}, 200); }, 200);
} else { } else {
logger.error("[DingTalk] Session not created after login"); logger.error("[DingTalk] Session not created after login");
@ -174,7 +190,7 @@ export default function Page() {
// 使用 replace 而不是 href,避免在历史记录中留下登录页 // 使用 replace 而不是 href,避免在历史记录中留下登录页
// 增加短暂延迟确保 cookie 完全同步 // 增加短暂延迟确保 cookie 完全同步
setTimeout(() => { setTimeout(() => {
window.location.replace(result.url || "/"); window.location.replace(callbackUrl);
}, 200); }, 200);
} else { } else {
logger.error("[DingTalk] Session not created"); logger.error("[DingTalk] Session not created");
@ -298,7 +314,7 @@ export default function Page() {
return; return;
} }
await signIn("google", { callbackUrl: "/" }); await signIn("google", { redirectTo: getSafeLoginCallbackUrl() });
}; };
// 检查 URL 中是否有钉钉 Token(页面加载时自动登录) // 检查 URL 中是否有钉钉 Token(页面加载时自动登录)
@ -365,13 +381,14 @@ export default function Page() {
description: "提交的信息校验失败", description: "提交的信息校验失败",
}); });
} else if (state.status === "success") { } else if (state.status === "success") {
toast({ type: "success", description: "登录成功,正在进入首页" }); const callbackUrl = getSafeLoginCallbackUrl();
toast({ type: "success", description: "登录成功,正在跳转" });
setIsSuccessful(true); setIsSuccessful(true);
loginRedirectTimerRef.current = window.setTimeout(() => { loginRedirectTimerRef.current = window.setTimeout(() => {
window.location.replace("/"); window.location.replace(callbackUrl);
}, 120); }, 120);
loginRedirectFallbackTimerRef.current = window.setTimeout(() => { loginRedirectFallbackTimerRef.current = window.setTimeout(() => {
window.location.assign("/"); window.location.assign(callbackUrl);
}, 1600); }, 1600);
} }
}, [state.status]); }, [state.status]);
@ -393,23 +410,6 @@ export default function Page() {
}; };
}, []); }, []);
const getSafeLoginCallbackUrl = () => {
if (typeof window === "undefined") return "/";
const callbackUrl = new URLSearchParams(window.location.search).get(
"callbackUrl",
);
if (
callbackUrl &&
callbackUrl.startsWith("/") &&
!callbackUrl.startsWith("//")
) {
return callbackUrl;
}
return "/";
};
const buildDingTalkLoginUrl = (orgName?: string) => { const buildDingTalkLoginUrl = (orgName?: string) => {
const params = new URLSearchParams(); const params = new URLSearchParams();
if (orgName) params.set("org", orgName); if (orgName) params.set("org", orgName);

View File

@ -7,10 +7,13 @@ import { formatFeedbackTime } from "@/lib/canvas/feedback-contract";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
export default async function CanvasFeedbackPage({ params }: { params: Promise<{ id: string }> }) { export default async function CanvasFeedbackPage({ params }: { params: Promise<{ id: string }> }) {
const session = await auth(); const { id } = await params;
if (!session?.user?.id) redirect("/login");
const id = (await params).id;
if (!z.string().uuid().safeParse(id).success) notFound(); if (!z.string().uuid().safeParse(id).success) notFound();
const session = await auth();
if (!session?.user?.id || session.user.type === "guest") {
const query = new URLSearchParams({ callbackUrl: `/feedback/${id}` });
redirect(`/login?${query}`);
}
const feedback = await findCanvasFeedback(id); const feedback = await findCanvasFeedback(id);
if (!feedback || (feedback.userId !== session.user.id && session.user.type !== "admin")) if (!feedback || (feedback.userId !== session.user.id && session.user.type !== "admin"))
notFound(); notFound();