wood/Q58Connect
1
0
Fork 0
mirror of https://github.com/woodchen-ink/Q58Connect.git synced 2025-07-18 05:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 增加 OAuth 支持，优化用户授权流程，简化参数处理和错误显示

Browse Source
This commit is contained in:
wood chen 2025-02-21 17:22:56 +08:00
parent 3b47daccee
commit 6c8bda6b32
2 changed files with 77 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/actions/user-authorize.ts
View File

@ -4,10 +4,21 @@ import { redirect } from "next/navigation";
import { signIn as nextSignIn } from "@/auth";
export async function signIn(data: Record<string, any>) {
const { sso, sig } = data;
const { sso, sig, oauth } = data;
// 先进行 SSO 登录
await nextSignIn("credentials", { sso, sig });
// 从 sso 参数中获取 return_sso_url
// 如果有 OAuth 参数，重定向到 OAuth 授权页面
if (oauth) {
const oauthParams = new URLSearchParams(atob(oauth));
if (oauthParams.has("client_id")) {
const authUrl = `/oauth/authorize?${oauthParams.toString()}`;
redirect(authUrl);
}
}
// 如果没有 OAuth 参数，从 SSO 参数中获取 return_sso_url
const params = new URLSearchParams(atob(sso));
const returnUrl = params.get("return_sso_url");

108
src/components/auth/user-authorize.tsx
View File

@ -23,58 +23,78 @@ export function UserAuthorize({
}
setIsLoading(true);
try {
await signIn({ ...data, redirectTo: "/dashboard" });
// 从 URL 中获取 sso 和 sig 参数
const url = new URL(window.location.href);
const sso = url.searchParams.get("sso");
const sig = url.searchParams.get("sig");
if (!sso || !sig) {
throw new Error("缺少必要的认证参数");
}
// 获取原始的 OAuth 参数
const originalOAuthParams = new URLSearchParams(window.location.search);
const oauthData: Record<string, string> = {};
Array.from(originalOAuthParams.entries())
.filter(([key]) => key !== "sso" && key !== "sig")
.forEach(([key, value]) => {
oauthData[key] = value;
});
// 传递 SSO 参数和原始的 OAuth 参数
await signIn({
sso,
sig,
oauth: btoa(originalOAuthParams.toString()),
});
setIsLoading(false);
} catch (error) {
console.error("登录过程出错:", error);
setError(error);
setIsLoading(false);
}
}, []);
}, [isLoading]);
useEffect(() => {
const timer = setTimeout(signInCallback, 5);
return () => {
clearTimeout(timer);
};
}, []);
signInCallback();
}, [signInCallback]);
if (error) {
return (
<Card className="w-full">
<CardHeader className="space-y-4 text-center">
<div className="mx-auto flex h-16 w-16 items-center justify-center rounded-full bg-red-100">
<div className="h-8 w-8 text-red-600">❌</div>
</div>
<CardTitle className="text-2xl font-semibold text-red-600">
授权失败
</CardTitle>
</CardHeader>
<CardContent>
<p className="text-center text-gray-500">
{error instanceof Error
? error.message
: "登录异常，授权失败！请稍后重试。"}
</p>
</CardContent>
</Card>
);
}
return (
<>
{error ? (
<Card className="w-full">
<CardHeader className="space-y-4 text-center">
<div className="mx-auto flex h-16 w-16 items-center justify-center rounded-full bg-red-100">
<div className="h-8 w-8 text-red-600">❌</div>
</div>
<CardTitle className="text-2xl font-semibold text-red-600">
授权失败
</CardTitle>
</CardHeader>
<CardContent>
<p className="text-center text-gray-500">
{error instanceof Error
? error.message
: "登录异常，授权失败！请稍后重试。"}
</p>
</CardContent>
</Card>
) : (
<Card className="w-full">
<CardHeader className="space-y-4 text-center">
<div className="mx-auto flex h-16 w-16 items-center justify-center rounded-full bg-blue-100">
<div className="h-8 w-8 animate-spin rounded-full border-4 border-blue-600 border-t-transparent"></div>
</div>
<CardTitle className="text-2xl font-semibold">
正在处理授权
</CardTitle>
</CardHeader>
<CardContent>
<p className="text-center text-gray-500">
{isLoading ? "请稍候，我们正在处理您的授权请求" : "正在跳转..."}
</p>
</CardContent>
</Card>
)}
</>
<Card className="w-full">
<CardHeader className="space-y-4 text-center">
<div className="mx-auto flex h-16 w-16 items-center justify-center rounded-full bg-blue-100">
<div className="h-8 w-8 animate-spin rounded-full border-4 border-blue-600 border-t-transparent"></div>
</div>
<CardTitle className="text-2xl font-semibold">正在处理授权</CardTitle>
</CardHeader>
<CardContent>
<p className="text-center text-gray-500">
{isLoading ? "请稍候，我们正在处理您的授权请求" : "正在跳转..."}
</p>
</CardContent>
</Card>
);
}