feat(auth): add Google OAuth support

This commit is contained in:
beilunyang
2025-12-07 17:50:27 +08:00
parent 3ad30301a9
commit dd109a464a
13 changed files with 162 additions and 36 deletions

View File

@@ -200,6 +200,10 @@ export function LoginForm({ turnstile }: LoginFormProps) {
signIn("github", { callbackUrl: "/" })
}
const handleGoogleLogin = () => {
signIn("google", { callbackUrl: "/" })
}
return (
<Card className="w-[95%] max-w-lg border-2 border-primary/20">
<CardHeader className="space-y-2">
@@ -297,6 +301,32 @@ export function LoginForm({ turnstile }: LoginFormProps) {
<Github className="mr-2 h-4 w-4" />
{t("actions.githubLogin")}
</Button>
<Button
variant="outline"
className="w-full"
onClick={handleGoogleLogin}
>
<svg className="mr-2 h-4 w-4" viewBox="0 0 24 24">
<path
fill="currentColor"
d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
/>
<path
fill="currentColor"
d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
/>
<path
fill="currentColor"
d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
/>
<path
fill="currentColor"
d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
/>
</svg>
{t("actions.googleLogin")}
</Button>
</div>
</TabsContent>
<TabsContent value="register" className="space-y-4 mt-0">

View File

@@ -26,6 +26,38 @@ const roleConfigs = {
civilian: { key: 'CIVILIAN', icon: User2 },
} as const
const providerConfigs = {
google: {
label: "Google",
className: "text-red-500 bg-red-500/10",
icon: (props: any) => (
<svg viewBox="0 0 24 24" {...props}>
<path
fill="currentColor"
d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
/>
<path
fill="currentColor"
d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
/>
<path
fill="currentColor"
d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
/>
<path
fill="currentColor"
d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
/>
</svg>
),
},
github: {
label: "GitHub",
className: "text-primary bg-primary/10",
icon: Github,
},
} as const
export function ProfileCard({ user }: ProfileCardProps) {
const t = useTranslations("profile.card")
const tAuth = useTranslations("auth.signButton")
@@ -56,15 +88,24 @@ export function ProfileCard({ user }: ProfileCardProps) {
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2">
<h2 className="text-xl font-bold truncate">{user.name}</h2>
{
user.email && (
// 先简单实现,后续再完善
<div className="flex items-center gap-1 text-xs text-primary bg-primary/10 px-2 py-0.5 rounded-full flex-shrink-0">
<Github className="w-3 h-3" />
{tAuth("linked")}
</div>
)
}
{!!user?.providers?.length && (
<div className="flex gap-2">
{user.providers.map((provider) => {
const config = providerConfigs[provider as keyof typeof providerConfigs]
if (!config) return null
const Icon = config.icon
return (
<div
key={provider}
className={`flex items-center gap-1 text-xs px-2 py-0.5 rounded-full flex-shrink-0 ${config.className}`}
>
<Icon className="w-3 h-3" />
{config.label}
</div>
)
})}
</div>
)}
</div>
<p className="text-sm text-muted-foreground truncate mt-1">
{
@@ -78,7 +119,7 @@ export function ProfileCard({ user }: ProfileCardProps) {
const Icon = roleConfig.icon
const roleName = t(`roles.${roleConfig.key}` as any)
return (
<div
<div
key={name}
className="flex items-center gap-1 text-xs bg-primary/10 text-primary px-2 py-0.5 rounded"
title={roleName}
@@ -110,15 +151,15 @@ export function ProfileCard({ user }: ProfileCardProps) {
{canManageWebhook && <ApiKeyPanel />}
<div className="flex flex-col sm:flex-row gap-4 px-1">
<Button
<Button
onClick={() => router.push(`/${locale}/moe`)}
className="gap-2 flex-1"
>
<Mail className="w-4 h-4" />
{tNav("backToMailbox")}
</Button>
<Button
variant="outline"
<Button
variant="outline"
onClick={() => signOut({ callbackUrl: `/${locale}` })}
className="flex-1"
>

View File

@@ -21,7 +21,8 @@
"login": "Login",
"register": "Sign Up",
"or": "OR",
"githubLogin": "Login with GitHub"
"githubLogin": "Login with GitHub",
"googleLogin": "Login with Google"
},
"errors": {
"usernameRequired": "Please enter username",

View File

@@ -21,7 +21,8 @@
"login": "ログイン",
"register": "登録",
"or": "または",
"githubLogin": "GitHub アカウントでログイン"
"githubLogin": "GitHub アカウントでログイン",
"googleLogin": "Google アカウントでログイン"
},
"errors": {
"usernameRequired": "ユーザー名を入力してください",

View File

@@ -21,7 +21,8 @@
"login": "로그인",
"register": "회원가입",
"or": "또는",
"githubLogin": "GitHub로 로그인"
"githubLogin": "GitHub로 로그인",
"googleLogin": "Google로 로그인"
},
"errors": {
"usernameRequired": "사용자 이름을 입력해주세요",

View File

@@ -21,7 +21,8 @@
"login": "登录",
"register": "注册",
"or": "或者",
"githubLogin": "使用 GitHub 账号登录"
"githubLogin": "使用 GitHub 账号登录",
"googleLogin": "使用 Google 账号登录"
},
"errors": {
"usernameRequired": "请输入用户名",

View File

@@ -21,7 +21,8 @@
"login": "登入",
"register": "註冊",
"or": "或者",
"githubLogin": "使用 GitHub 帳號登入"
"githubLogin": "使用 GitHub 帳號登入",
"googleLogin": "使用 Google 帳號登入"
},
"errors": {
"usernameRequired": "請輸入使用者名稱",

View File

@@ -1,5 +1,6 @@
import NextAuth from "next-auth"
import GitHub from "next-auth/providers/github"
import Google from "next-auth/providers/google"
import { DrizzleAdapter } from "@auth/drizzle-adapter"
import { createDb, Db } from "./db"
import { accounts, users, roles, userRoles } from "./schema"
@@ -30,7 +31,7 @@ const getDefaultRole = async (): Promise<Role> => {
) {
return defaultRole as Role
}
return ROLES.CIVILIAN
}
@@ -102,6 +103,12 @@ export const {
GitHub({
clientId: process.env.AUTH_GITHUB_ID,
clientSecret: process.env.AUTH_GITHUB_SECRET,
allowDangerousEmailAccountLinking: true,
}),
Google({
clientId: process.env.AUTH_GOOGLE_ID,
clientSecret: process.env.AUTH_GOOGLE_SECRET,
allowDangerousEmailAccountLinking: true,
}),
CredentialsProvider({
name: "Credentials",
@@ -119,7 +126,7 @@ export const {
let parsedCredentials: AuthSchema
try {
parsedCredentials = authSchema.parse({ username, password, turnstileToken })
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (error) {
throw new Error("输入格式不正确")
}
@@ -196,7 +203,7 @@ export const {
where: eq(userRoles.userId, session.user.id),
with: { role: true },
})
if (!userRoleRecords.length) {
const defaultRole = await getDefaultRole()
const role = await findOrCreateRole(db, defaultRole)
@@ -208,10 +215,16 @@ export const {
role: role
}]
}
session.user.roles = userRoleRecords.map(ur => ({
name: ur.role.name,
}))
const userAccounts = await db.query.accounts.findMany({
where: eq(accounts.userId, session.user.id),
})
session.user.providers = userAccounts.map(account => account.provider)
}
return session
@@ -224,7 +237,7 @@ export const {
export async function register(username: string, password: string) {
const db = createDb()
const existing = await db.query.users.findFirst({
where: eq(users.username, username)
})
@@ -234,7 +247,7 @@ export async function register(username: string, password: string) {
}
const hashedPassword = await hashPassword(password)
const [user] = await db.insert(users)
.values({
username,