From a7b12bbf6432bb0c8d09bb2e001a3bc78f1e1f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=93=E9=BC=A0?= <71394853+hamster1963@users.noreply.github.com> Date: Mon, 21 Oct 2024 12:47:23 +0800 Subject: [PATCH 1/4] doc: update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12dc995..8a55a7e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ | 一键部署到 Vercel-推荐 | Docker部署 | Cloudflare部署 | 如何更新？ | | ----------------------------------------------------- | --------------------------------------------------------------- | ----------------------------------------------------------------------- | --------------------------------------------------------- | | [部署简易教程](https://buycoffee.top/blog/tech/nezha) | [Docker 部署教程](https://buycoffee.top/blog/tech/nezha-docker) | [Cloudflare 部署教程](https://buycoffee.top/blog/tech/nezha-cloudflare) | [更新教程](https://buycoffee.top/blog/tech/nezha-upgrade) | -| [Vercel-demo](https://nezha-vercel.buycoffee.top) | [Docker-demo](https://nezha-docker.buycoffee.tech) | [Cloudflare-demo](https://nezha-cloudflare.buycoffee.tech) | +| [Vercel-demo](https://nezha-vercel.buycoffee.top) | [Docker-demo](https://nezha-docker.buycoffee.tech) | [Cloudflare-demo](https://nezha-cloudflare.buycoffee.tech) [密码: nezhadash] | #### 环境变量 From dd05154be2e70a76082f37434c61f31de387fa98 Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Mon, 21 Oct 2024 13:10:59 +0800 Subject: [PATCH 2/4] feat: client side auth --- components/SignIn.tsx | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/components/SignIn.tsx b/components/SignIn.tsx index 31e6913..e49da09 100644 --- a/components/SignIn.tsx +++ b/components/SignIn.tsx @@ -6,6 +6,7 @@ import { useRouter, useSearchParams } from "next/navigation"; import { useEffect, useState } from "react"; import { Loader } from "./loading/Loader"; +import { auth } from "@/auth"; export function SignIn() { const t = useTranslations("SignIn"); @@ -37,20 +38,35 @@ export function SignIn() { e.preventDefault(); setLoading(true); const formData = new FormData(e.currentTarget); - const password = formData.get("password"); - const res = await signIn("credentials", { - password, - redirect: false, + + + // 直接构建 URL 编码的字符串 + const urlEncodedData = [ + `csrfToken=${encodeURIComponent(csrfToken)}`, + `redirect=false`, + `password=${encodeURIComponent(formData.get('password') as string)}`, + ].join('&'); + + await fetch("/api/auth/callback/credentials", { + method: "POST", + headers: { + "Content-Type": "application/x-www-form-urlencoded", + }, + body: urlEncodedData, }); - if (res?.error) { - setErrorState(true); - } else { - setErrorState(false); + + const session = await auth(); + + + if (session) { setSuccessState(true); - router.push("/"); - router.refresh(); + } else { + setErrorState(true); } - setLoading(false); + + setLoading(false) + router.push("/"); + router.refresh(); }; return ( From 117ea33382fac945a25ceee797451b89433798c5 Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Mon, 21 Oct 2024 13:41:23 +0800 Subject: [PATCH 3/4] perf: remove error state --- components/SignIn.tsx | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/components/SignIn.tsx b/components/SignIn.tsx index e49da09..bb69b8d 100644 --- a/components/SignIn.tsx +++ b/components/SignIn.tsx @@ -1,31 +1,20 @@ "use client"; -import { getCsrfToken, signIn } from "next-auth/react"; +import { getCsrfToken } from "next-auth/react"; import { useTranslations } from "next-intl"; -import { useRouter, useSearchParams } from "next/navigation"; +import { useRouter } from "next/navigation"; import { useEffect, useState } from "react"; import { Loader } from "./loading/Loader"; -import { auth } from "@/auth"; export function SignIn() { const t = useTranslations("SignIn"); const [csrfToken, setCsrfToken] = useState(""); - const [errorState, setErrorState] = useState(false); const [loading, setLoading] = useState(false); - const [successState, setSuccessState] = useState(false); - const search = useSearchParams(); - const error = search.get("error"); const router = useRouter(); - useEffect(() => { - if (error) { - setErrorState(true); - } - }, [error]); - useEffect(() => { async function loadProviders() { const csrf = await getCsrfToken(); @@ -54,19 +43,9 @@ export function SignIn() { }, body: urlEncodedData, }); - - const session = await auth(); - - - if (session) { - setSuccessState(true); - } else { - setErrorState(true); - } - - setLoading(false) router.push("/"); router.refresh(); + setLoading(false) }; return ( @@ -77,16 +56,6 @@ export function SignIn() {