重构认证逻辑,优化登录和用户信息获取流程,新增全局缓存支持
This commit is contained in:
@@ -10,12 +10,6 @@ import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs'
|
||||
export type DashboardPageProps = {}
|
||||
|
||||
export default async function DashboardPage(props: DashboardPageProps) {
|
||||
|
||||
const profile = await getProfile()
|
||||
if (!profile) {
|
||||
return redirect('/login')
|
||||
}
|
||||
|
||||
return (
|
||||
<Page className={`flex-auto grid grid-cols-4 grid-rows-[150px_minmax(200px,1fr)_minmax(200px,1fr)_minmax(200px,1fr)]`}>
|
||||
{/* banner */}
|
||||
|
||||
@@ -1,17 +1,33 @@
|
||||
import {cookies} from 'next/headers'
|
||||
'use client'
|
||||
import {Button} from '@/components/ui/button'
|
||||
import {logout} from '@/actions/auth/auth'
|
||||
import {useProfileStore} from '@/components/providers/StoreProvider'
|
||||
import {useRouter} from 'next/navigation'
|
||||
import {toast} from 'sonner'
|
||||
|
||||
export type ProfileProps = {}
|
||||
|
||||
export default async function Profile(props: ProfileProps) {
|
||||
const store = await cookies()
|
||||
const info = store.get('auth_info')?.value
|
||||
const data = info ? JSON.parse(info) : undefined
|
||||
export default function Profile(props: ProfileProps) {
|
||||
const refreshProfile = useProfileStore(store => store.refreshProfile)
|
||||
const router = useRouter()
|
||||
const doLogout = async () => {
|
||||
try {
|
||||
const resp = await logout()
|
||||
if (resp.success) {
|
||||
await refreshProfile()
|
||||
router.push('/')
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
toast.error('退出登录失败', {
|
||||
description: (e as Error).message,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex gap-2 items-center">
|
||||
<span>下午好,{data?.payload.name}</span>
|
||||
<Button theme={`error`} onClick={logout}>
|
||||
<Button theme={`error`} onClick={doLogout}>
|
||||
退出登录
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -68,6 +68,8 @@ export default function BillsPage(props: BillsPageProps) {
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
console.log('init bill list')
|
||||
refresh(1, 10).then()
|
||||
refresh(1, 10).then()
|
||||
}, [])
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ import {Identify} from '@/actions/auth/identify'
|
||||
import {toast} from 'sonner'
|
||||
import {useContext, useEffect, useRef, useState} from 'react'
|
||||
import * as qrcode from 'qrcode'
|
||||
import {AuthContext} from '@/components/providers/AuthProvider'
|
||||
import {StoreContext, useProfileStore} from '@/components/providers/StoreProvider'
|
||||
|
||||
export type IdentifyPageProps = {}
|
||||
|
||||
@@ -90,8 +90,8 @@ export default function IdentifyPage(props: IdentifyPageProps) {
|
||||
// 用户数据
|
||||
// ======================
|
||||
|
||||
const ctx = useContext(AuthContext)
|
||||
console.log('render identify page')
|
||||
const profile = useProfileStore(store => store.profile)
|
||||
const refreshProfile = useProfileStore(store => store.refreshProfile)
|
||||
|
||||
// ======================
|
||||
// render
|
||||
@@ -116,7 +116,7 @@ export default function IdentifyPage(props: IdentifyPageProps) {
|
||||
<h3 className={`text-center text-lg font-bold`}>个人认证</h3>
|
||||
<p className={`text-sm text-gray-600`}>平台授权支付宝安全认证,不会泄露您的认证信息</p>
|
||||
</div>
|
||||
{ctx.profile?.id_token ? (
|
||||
{profile?.id_token ? (
|
||||
<div className={`flex flex-col gap-4`}>
|
||||
<p className={`text-sm text-gray-600`}>已完成实名认证</p>
|
||||
</div>
|
||||
@@ -162,7 +162,7 @@ export default function IdentifyPage(props: IdentifyPageProps) {
|
||||
<canvas ref={canvas} width={256} height={256}/>
|
||||
<p className={`text-sm text-gray-600`}>请扫码完成认证</p>
|
||||
<Button onClick={async () => {
|
||||
await ctx.refreshProfile()
|
||||
await refreshProfile()
|
||||
setOpenDialog(false)
|
||||
}}>
|
||||
已完成认证
|
||||
|
||||
@@ -4,8 +4,8 @@ import logo from '@/assets/logo.webp'
|
||||
import Profile from '@/app/admin/_server/profile'
|
||||
import {merge} from '@/lib/utils'
|
||||
import Link from 'next/link'
|
||||
import {getProfile} from '@/actions/auth/auth'
|
||||
import {redirect} from 'next/navigation'
|
||||
import {getProfile} from '@/actions/auth/auth'
|
||||
|
||||
export type DashboardLayoutProps = {
|
||||
children: ReactNode
|
||||
@@ -13,9 +13,9 @@ export type DashboardLayoutProps = {
|
||||
|
||||
export default async function DashboardLayout(props: DashboardLayoutProps) {
|
||||
|
||||
const profile = await getProfile()
|
||||
if (!profile) {
|
||||
return redirect('/login')
|
||||
const user = await getProfile()
|
||||
if (!user) {
|
||||
return redirect(`/login?redirect=${encodeURIComponent('/admin')}`)
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -9,7 +9,7 @@ import {Input} from '@/components/ui/input'
|
||||
import {useForm} from 'react-hook-form'
|
||||
import {zodResolver} from '@hookform/resolvers/zod'
|
||||
import * as z from 'zod'
|
||||
import {AuthContext} from '@/components/providers/AuthProvider'
|
||||
import {StoreContext, useProfileStore} from '@/components/providers/StoreProvider'
|
||||
import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger} from '@/components/ui/dialog'
|
||||
import {toast} from 'sonner'
|
||||
import {Alert, AlertDescription, AlertTitle} from '@/components/ui/alert'
|
||||
@@ -22,8 +22,8 @@ import {User} from '@/lib/models'
|
||||
export type ProfilePageProps = {}
|
||||
|
||||
export default function ProfilePage(props: ProfilePageProps) {
|
||||
const authCtx = useContext(AuthContext)
|
||||
const profile = authCtx.profile
|
||||
const profile = useProfileStore(store => store.profile)
|
||||
const refreshProfile = useProfileStore(store => store.refreshProfile)
|
||||
|
||||
// 默认选中的Tab
|
||||
const [activeTab, setActiveTab] = useState('basic')
|
||||
@@ -55,19 +55,19 @@ export default function ProfilePage(props: ProfilePageProps) {
|
||||
</TabsList>
|
||||
|
||||
<TabsContent value="basic">
|
||||
<BasicInfoTab profile={profile} refreshProfile={authCtx.refreshProfile}/>
|
||||
<BasicInfoTab profile={profile} refreshProfile={refreshProfile}/>
|
||||
</TabsContent>
|
||||
|
||||
<TabsContent value="security">
|
||||
<SecurityTab profile={profile} refreshProfile={authCtx.refreshProfile}/>
|
||||
<SecurityTab profile={profile} refreshProfile={refreshProfile}/>
|
||||
</TabsContent>
|
||||
|
||||
<TabsContent value="balance">
|
||||
<BalanceTab profile={profile} refreshProfile={authCtx.refreshProfile}/>
|
||||
<BalanceTab profile={profile} refreshProfile={refreshProfile}/>
|
||||
</TabsContent>
|
||||
|
||||
<TabsContent value="identify">
|
||||
<IdentifyTab profile={profile} refreshProfile={authCtx.refreshProfile}/>
|
||||
<IdentifyTab profile={profile} refreshProfile={refreshProfile}/>
|
||||
</TabsContent>
|
||||
</Tabs>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user