回归原项目

This commit is contained in:
wood chen 2025-02-21 13:25:05 +08:00
parent 379fceb26b
commit a85c15381a
2 changed files with 16 additions and 64 deletions

View File

@ -1,5 +1,3 @@
"use server";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import Hex from "crypto-js/enc-hex"; import Hex from "crypto-js/enc-hex";
import hmacSHA256 from "crypto-js/hmac-sha256"; import hmacSHA256 from "crypto-js/hmac-sha256";
@ -11,37 +9,14 @@ const hostUrl = process.env.NEXT_PUBLIC_HOST_URL as string;
const discourseHost = process.env.DISCOURSE_HOST as string; const discourseHost = process.env.DISCOURSE_HOST as string;
const clientSecret = process.env.DISCOURSE_SECRET as string; const clientSecret = process.env.DISCOURSE_SECRET as string;
export async function POST(req: Request) { export async function POST(_req: Request) {
try { const nonce = WordArray.random(16).toString();
const nonce = WordArray.random(16).toString(); const return_url = `${hostUrl}/authorize`;
const url = new URL(req.url); const sso = btoa(`nonce=${nonce}&return_sso_url=${return_url}`);
const sig = hmacSHA256(sso, clientSecret).toString(Hex);
// 从请求中获取原始的 OAuth 参数 cookies().set(AUTH_NONCE, nonce, { maxAge: 60 * 10 });
const searchParams = new URLSearchParams(await req.text()); return Response.json({
const oauth = searchParams.get("oauth") || ""; sso_url: `${discourseHost}/session/sso_provider?sso=${sso}&sig=${sig}`,
});
// 构建回调 URL
const callbackUrl = new URL("/q58/callback", hostUrl);
if (oauth) {
callbackUrl.searchParams.set("oauth", oauth);
}
// 构建 SSO 参数
const ssoParams = new URLSearchParams();
ssoParams.set("nonce", nonce);
ssoParams.set("return_sso_url", callbackUrl.toString());
const sso = btoa(ssoParams.toString());
const sig = hmacSHA256(sso, clientSecret).toString(Hex);
// 设置 nonce cookie
cookies().set(AUTH_NONCE, nonce, { maxAge: 60 * 10 });
return Response.json({
sso_url: `${discourseHost}/session/sso_provider?sso=${sso}&sig=${sig}`,
});
} catch (error) {
console.error("SSO URL generation error:", error);
return Response.json({ error: "Internal server error" }, { status: 500 });
}
} }

View File

@ -1,7 +1,7 @@
"use client"; "use client";
import * as React from "react"; import * as React from "react";
import { useRouter, useSearchParams } from "next/navigation"; import { useRouter } from "next/navigation";
import { Loader2, MessageCircleCode } from "lucide-react"; import { Loader2, MessageCircleCode } from "lucide-react";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
@ -19,43 +19,20 @@ export function UserAuthForm({
const [isLoading, setIsLoading] = React.useState<boolean>(false); const [isLoading, setIsLoading] = React.useState<boolean>(false);
const router = useRouter(); const router = useRouter();
const { toast } = useToast(); const { toast } = useToast();
const searchParams = useSearchParams();
const signIn = () => { const signIn = () => {
React.startTransition(async () => { React.startTransition(async () => {
try { const response = await fetch("/api/auth/q58", { method: "POST" });
// 获取当前的 OAuth 参数 if (!response.ok || response.status !== 200) {
const params = new URLSearchParams();
if (searchParams) {
const keys = Array.from(searchParams.keys());
keys.forEach((key) => {
const value = searchParams.get(key);
if (value) params.set(key, value);
});
}
const response = await fetch("/api/auth/q58", {
method: "POST",
body: params,
});
if (!response.ok) {
throw new Error(response.statusText);
}
const data: DiscourseData = await response.json();
if (data.sso_url) {
router.push(data.sso_url);
} else {
throw new Error("Invalid SSO URL");
}
} catch (error) {
setIsLoading(false); setIsLoading(false);
toast({ toast({
variant: "destructive", variant: "destructive",
title: "内部服务异常", title: "内部服务异常",
description: error instanceof Error ? error.message : "未知错误", description: response.statusText,
}); });
} else {
let data: DiscourseData = await response.json();
router.push(data.sso_url);
} }
}); });
}; };