@@ -42,7 +42,7 @@ export default function DashboardPage() {
)
}
- if (status === 'unauthenticated') {
+ if (!session) {
redirect('/auth/signin')
}
diff --git a/apps/web/src/app/[locale]/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(dashboard)/layout.tsx
index 9db3a21..08d3b9c 100644
--- a/apps/web/src/app/[locale]/(dashboard)/layout.tsx
+++ b/apps/web/src/app/[locale]/(dashboard)/layout.tsx
@@ -1,4 +1,5 @@
-import { authOptions } from '@/lib/auth'
+import { auth } from '@/lib/auth'
+import { headers } from 'next/headers'
import { redirect } from '@/i18n/navigation'
import { ReactNode } from 'react'
import { Navbar } from '@/components/organisms'
@@ -12,7 +13,9 @@ interface Iprops {
export default async function DashboardLayout({ children, params }: Iprops) {
const { locale } = await params
- const session = await authOptions
+ const session = await auth.api.getSession({
+ headers: await headers(),
+ })
if (!session) {
redirect({ href: '/auth/signin', locale })
diff --git a/apps/web/src/app/[locale]/(dashboard)/profile/page.tsx b/apps/web/src/app/[locale]/(dashboard)/profile/page.tsx
index d6a7a52..cceea8a 100644
--- a/apps/web/src/app/[locale]/(dashboard)/profile/page.tsx
+++ b/apps/web/src/app/[locale]/(dashboard)/profile/page.tsx
@@ -1,6 +1,6 @@
'use client'
-import { useSession } from 'next-auth/react'
+import { authClient } from '@/lib/auth-client'
import { useTranslations } from 'next-intl'
import {
Card,
@@ -20,9 +20,9 @@ import { CustomLink } from '@/components/molecules'
import { redirect } from 'next/navigation'
export default function ProfilePage() {
- const { data: session, status } = useSession()
+ const { data: session, isPending } = authClient.useSession()
- if (status === 'loading') {
+ if (isPending) {
return (
@@ -35,7 +35,7 @@ export default function ProfilePage() {
)
}
- if (status === 'unauthenticated') {
+ if (!session) {
redirect('/auth/signin')
}
diff --git a/apps/web/src/app/[locale]/(dashboard)/settings/page.tsx b/apps/web/src/app/[locale]/(dashboard)/settings/page.tsx
index bd49c63..f62f54e 100644
--- a/apps/web/src/app/[locale]/(dashboard)/settings/page.tsx
+++ b/apps/web/src/app/[locale]/(dashboard)/settings/page.tsx
@@ -1,6 +1,6 @@
'use client'
-import { useSession } from 'next-auth/react'
+import { authClient } from '@/lib/auth-client'
import { useTranslations } from 'next-intl'
import {
Card,
@@ -26,13 +26,13 @@ import { redirect } from 'next/navigation'
import { useState } from 'react'
export default function SettingsPage() {
- const { data: session, status } = useSession()
+ const { data: session, isPending } = authClient.useSession()
const [notifications, setNotifications] = useState(true)
const [darkMode, setDarkMode] = useState(false)
const [emailUpdates, setEmailUpdates] = useState(true)
- if (status === 'loading') {
+ if (isPending) {
return (
@@ -45,7 +45,7 @@ export default function SettingsPage() {
)
}
- if (status === 'unauthenticated') {
+ if (!session) {
redirect('/auth/signin')
}
diff --git a/apps/web/src/app/[locale]/(dashboard)/workflows/page.tsx b/apps/web/src/app/[locale]/(dashboard)/workflows/page.tsx
index de7ec9a..288643d 100644
--- a/apps/web/src/app/[locale]/(dashboard)/workflows/page.tsx
+++ b/apps/web/src/app/[locale]/(dashboard)/workflows/page.tsx
@@ -1,6 +1,6 @@
'use client'
-import { useSession } from 'next-auth/react'
+import { authClient } from '@/lib/auth-client'
import { useTranslations } from 'next-intl'
import { useState, useMemo } from 'react'
import {
@@ -27,7 +27,7 @@ import { redirect } from 'next/navigation'
export default function WorkflowsPage() {
const t = useTranslations('Workflows')
- const { data: session, status } = useSession()
+ const { data: session, isPending } = authClient.useSession()
// 模拟工作流数据
const workflows = useMemo(
@@ -72,7 +72,7 @@ export default function WorkflowsPage() {
[t]
)
- if (status === 'loading') {
+ if (isPending) {
return (
@@ -85,7 +85,7 @@ export default function WorkflowsPage() {
)
}
- if (status === 'unauthenticated') {
+ if (!session) {
redirect('/auth/signin')
}
diff --git a/apps/web/src/app/[locale]/(default-layout)/auth/signin/page.tsx b/apps/web/src/app/[locale]/(default-layout)/auth/signin/page.tsx
index b2f7261..b3f4451 100644
--- a/apps/web/src/app/[locale]/(default-layout)/auth/signin/page.tsx
+++ b/apps/web/src/app/[locale]/(default-layout)/auth/signin/page.tsx
@@ -1,6 +1,6 @@
'use client'
-import { signIn, useSession } from 'next-auth/react'
+import { authClient } from '@/lib/auth-client'
import { useSearchParams, useRouter } from 'next/navigation'
import { useState, useEffect } from 'react'
import { useTranslations } from 'next-intl'
@@ -18,8 +18,7 @@ import { CustomLink } from '@/components/molecules'
export default function SignInPage() {
const searchParams = useSearchParams()
const router = useRouter()
- const { data: session, status } = useSession()
- const callbackUrl = searchParams.get('callbackUrl') || '/'
+ const { data: session, isPending } = authClient.useSession()
const error = searchParams.get('error')
const t = useTranslations('Auth.signIn')
const tError = useTranslations('Auth.error')
@@ -27,29 +26,33 @@ export default function SignInPage() {
const [isLoading, setIsLoading] = useState(false)
const [loadingProvider, setLoadingProvider] = useState
(null)
+ const callbackUrl = searchParams.get('callbackUrl') || '/dashboard'
+
// 如果用户已经登录，直接跳转到目标页面
useEffect(() => {
- if (status === 'authenticated' && session) {
+ if (session && !isPending) {
router.push(callbackUrl)
}
- }, [status, session, callbackUrl, router])
+ }, [session, isPending, callbackUrl, router])
const handleSignIn = async (provider: string) => {
setIsLoading(true)
setLoadingProvider(provider)
try {
- // signIn 会触发页面跳转，所以不需要重置loading状态
- await signIn(provider, { callbackUrl })
+ // Better-Auth social signIn
+ await authClient.signIn.social({
+ provider: provider as 'github',
+ callbackURL: callbackUrl,
+ })
} catch (error) {
console.error(`${provider} 登录失败:`, error)
- // 只有发生错误时才重置loading状态
setIsLoading(false)
setLoadingProvider(null)
}
}
return (
-
+
{t('title')}
diff --git a/apps/web/src/app/api/auth/[...all]/route.ts b/apps/web/src/app/api/auth/[...all]/route.ts
new file mode 100644
index 0000000..5d94414
--- /dev/null
+++ b/apps/web/src/app/api/auth/[...all]/route.ts
@@ -0,0 +1,4 @@
+import { auth } from '@/lib/auth'
+import { toNextJsHandler } from 'better-auth/next-js'
+
+export const { GET, POST } = toNextJsHandler(auth)
diff --git a/apps/web/src/app/api/auth/[...nextauth]/route.ts b/apps/web/src/app/api/auth/[...nextauth]/route.ts
deleted file mode 100644
index e10628f..0000000
--- a/apps/web/src/app/api/auth/[...nextauth]/route.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import NextAuth from 'next-auth'
-import { authOptions } from '@/lib/auth'
-
-const handler = NextAuth(authOptions)
-
-export { handler as GET, handler as POST }
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index d0a13d5..a991c9f 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -11,7 +11,7 @@ import '@/styles/globals.css'
import NextTopLoader from 'nextjs-toploader'
import { headers } from 'next/headers'
import appConfig from '@/appConfig'
-import { ThemeProvider, SessionProvider } from '@/components/providers'
+import { ThemeProvider } from '@/components/providers'
const geistSans = Geist({
variable: '--font-geist-sans',
@@ -89,16 +89,14 @@ export default async function RootLayout({ children }: Iprops) {
className={`${geistSans.variable} ${geistMono.variable} ${inter.variable} ${playfairDisplay.variable} ${jetbrainsMono.variable} ${poppins.variable} antialiased`}
>
-
-
- {children}
-
-
+
+ {children}
+