refactor(auth): inline NextAuth v4 config and simplify AuthPlatform API
- Inline NextAuth v4 handler directly in `[...nextauth]/route.ts`, removing
the `@/lib/auth/nextauth` abstraction layer
- Add Google/Facebook providers with JWT/session callbacks that expose
`idToken` and `accessToken` on the session for backend exchange
- Refactor `AuthPlatform` from constructor-based to static methods
(`googleSignIn()` / `facebookSignIn()`)
- Update `auth-machine.ts` and layout comment reference to match new structure
- Align with original Dart `nextauth-helpers.{googleLogin, facebookLogin}()`
naming and keep persistence concerns (unstorage, backend, custom cookies)
out of scope for this iteration
This commit is contained in:
@@ -2,12 +2,9 @@
|
||||
/**
|
||||
* AuthPlatform 统一 OAuth 登录入口
|
||||
*
|
||||
* 合并自原 FacebookLogin / GoogleLogin 两个类。
|
||||
* 构造时传入 provider 名,调用 signIn() 触发 NextAuth OAuth 流程。
|
||||
*
|
||||
* 用法:
|
||||
* await new AuthPlatform("facebook").signIn()
|
||||
* await new AuthPlatform("google").signIn()
|
||||
* **两个**独立方法(**不**再依赖构造器):
|
||||
* - `googleSignIn()` → 触发 Google OAuth
|
||||
* - `facebookSignIn()` → 触发 Facebook OAuth
|
||||
*
|
||||
* NextAuth 流程:
|
||||
* 1. NextAuth 重定向到 provider OAuth 授权页
|
||||
@@ -16,16 +13,20 @@
|
||||
* 4. 重定向到 callbackUrl (默认 /chat)
|
||||
*
|
||||
* **不**做任何持久化(不写 unstorage / 不调后端 / 不设自定义 cookie)。
|
||||
* 原始 Dart: nextauth-helpers.{facebookLogin, googleLogin}()
|
||||
* 原始 Dart: nextauth-helpers.{googleLogin, facebookLogin}()
|
||||
*/
|
||||
import { signIn } from "next-auth/react";
|
||||
|
||||
export type AuthProvider = "facebook" | "google";
|
||||
|
||||
export class AuthPlatform {
|
||||
constructor(private readonly provider: AuthProvider) {}
|
||||
/** 触发 Google OAuth 跳转 */
|
||||
static async googleSignIn(): Promise<void> {
|
||||
await signIn("google");
|
||||
}
|
||||
|
||||
async signIn(): Promise<void> {
|
||||
await signIn(this.provider);
|
||||
/** 触发 Facebook OAuth 跳转 */
|
||||
static async facebookSignIn(): Promise<void> {
|
||||
await signIn("facebook");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
/**
|
||||
* NextAuth v4 配置(单一来源)
|
||||
*
|
||||
* 极简模式:参考 `auth.js` 官方示例的**精神**(不做任何持久化),但保留 v4 语法:
|
||||
* - 客户端点击登录按钮 → `new AuthPlatform("google").signIn()` / `new AuthPlatform("facebook").signIn()`
|
||||
* - NextAuth 重定向到 Google / Facebook OAuth
|
||||
* - OAuth 回调 → NextAuth 写 `next-auth.session-token` (httpOnly) cookie
|
||||
* - 重定向到 callbackUrl (默认 /chat)
|
||||
* - 业务 token 持久化(unstorage / 后端 / 自定义 cookie)**全部不在本轮 scope**
|
||||
*
|
||||
* 导出 `GET` / `POST` 给 `src/app/api/auth/[...nextauth]/route.ts` 引用。
|
||||
* 客户端通过 `src/lib/auth/{auth_platform,logout}.ts` 触发。
|
||||
*/
|
||||
import NextAuth from "next-auth";
|
||||
import Google from "next-auth/providers/google";
|
||||
import Facebook from "next-auth/providers/facebook";
|
||||
|
||||
/**
|
||||
* v4 模式:`NextAuth(options)` 返回单个 handler 函数(v5 才返回 `{ handlers, signIn, signOut, auth }`)。
|
||||
* 通过 `export { handler as GET, handler as POST }` 暴露给 Next.js 路由。
|
||||
*/
|
||||
const handler = NextAuth({
|
||||
providers: [
|
||||
Google({
|
||||
clientId: process.env.AUTH_GOOGLE_ID ?? "",
|
||||
clientSecret: process.env.AUTH_GOOGLE_SECRET ?? "",
|
||||
}),
|
||||
Facebook({
|
||||
clientId: process.env.AUTH_FACEBOOK_ID ?? "",
|
||||
clientSecret: process.env.AUTH_FACEBOOK_SECRET ?? "",
|
||||
}),
|
||||
],
|
||||
// 把 OAuth provider 的 token 塞进 NextAuth session,供前端取用:
|
||||
// - Google: account.id_token → 调后端 /api/auth/google-login 换业务 token
|
||||
// - Facebook: account.access_token → 调后端 /api/auth/facebook-login
|
||||
// 仅在**首次 sign-in** 时把 `account` 注入到 JWT;后续请求 account=undefined
|
||||
// (由 NextAuth 控制),所以下面的 `if (account)` 守卫是必要的。
|
||||
callbacks: {
|
||||
async jwt({ token, account }) {
|
||||
if (account) {
|
||||
token.provider = account.provider;
|
||||
token.idToken = account.id_token;
|
||||
token.accessToken = account.access_token;
|
||||
}
|
||||
return token;
|
||||
},
|
||||
async session({ session, token }) {
|
||||
// 暴露给 `useSession()` —— 仅 client-side 派发 sync 事件时使用,不落 localStorage
|
||||
session.provider = (token.provider as "google" | "facebook" | undefined) ?? undefined;
|
||||
session.idToken = (token.idToken as string | undefined) ?? undefined;
|
||||
session.accessToken = (token.accessToken as string | undefined) ?? undefined;
|
||||
return session;
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
export { handler as GET, handler as POST };
|
||||
|
||||
// ============================================================
|
||||
// 客户端登录类(class-oriented 封装)
|
||||
// 每个 class 一个独立文件,详见同目录的子模块。
|
||||
// 这里 re-export 仅为消费者提供 `@/lib/auth/nextauth` 单点导入。
|
||||
// 注:上方 `next-auth` 是 server-only,本文件编译时会被 Next.js 切分到 server bundle;
|
||||
// 客户端 import `AuthPlatform` / `Logout` 时不会拉入。
|
||||
// ============================================================
|
||||
export { AuthPlatform, type AuthProvider } from "./auth_platform";
|
||||
export { Logout } from "./logout";
|
||||
Reference in New Issue
Block a user