fix: avatar 以及 auth 重构

frontend_nuxt/utils/auth.js

@@ -1,33 +1,28 @@
 import { reactive } from 'vue'
 
 const TOKEN_KEY = 'token'
-const USER_ID_KEY = 'userId'
-const USERNAME_KEY = 'username'
-const ROLE_KEY = 'role'
 
 export const authState = reactive({
   loggedIn: false,
   userId: null,
   username: null,
   role: null,
+  avatar: null,
 })
 
 if (import.meta.client) {
   authState.loggedIn =
     localStorage.getItem(TOKEN_KEY) !== null && localStorage.getItem(TOKEN_KEY) !== ''
-  authState.userId = localStorage.getItem(USER_ID_KEY)
-  authState.username = localStorage.getItem(USERNAME_KEY)
-  authState.role = localStorage.getItem(ROLE_KEY)
 }
 
 export function getToken() {
   return import.meta.client ? localStorage.getItem(TOKEN_KEY) : null
 }
 
-export function setToken(token) {
+export async function setToken(token) {
   if (import.meta.client) {
     localStorage.setItem(TOKEN_KEY, token)
-    authState.loggedIn = true
+    await loadCurrentUser()
   }
 }
 
@@ -39,26 +34,20 @@ export function clearToken() {
   }
 }
 
-export function setUserInfo({ id, username }) {
+export function setUserInfo(user) {
   if (import.meta.client) {
-    authState.userId = id
-    authState.username = username
-    if (arguments[0] && arguments[0].role) {
-      authState.role = arguments[0].role
-      localStorage.setItem(ROLE_KEY, arguments[0].role)
-    }
-    if (id !== undefined && id !== null) localStorage.setItem(USER_ID_KEY, id)
-    if (username) localStorage.setItem(USERNAME_KEY, username)
+    authState.userId = user.id
+    authState.username = user.username
+    authState.avatar = user.avatar
+    authState.role = user.role
   }
 }
 
 export function clearUserInfo() {
   if (import.meta.client) {
-    localStorage.removeItem(USER_ID_KEY)
-    localStorage.removeItem(USERNAME_KEY)
-    localStorage.removeItem(ROLE_KEY)
     authState.userId = null
     authState.username = null
+    authState.avatar = null
     authState.role = null
   }
 }
@@ -82,9 +71,11 @@ export async function fetchCurrentUser() {
 export async function loadCurrentUser() {
   const user = await fetchCurrentUser()
   if (user) {
-    setUserInfo({ id: user.id, username: user.username, role: user.role })
+    setUserInfo(user)
+  } else {
+    clearUserInfo()
   }
-  return user
+  authState.loggedIn = user !== null
 }
 
 export function isLogin() {
@@ -100,10 +91,12 @@ export async function checkToken() {
     const res = await fetch(`${API_BASE_URL}/api/auth/check`, {
       headers: { Authorization: `Bearer ${token}` },
     })
-    authState.loggedIn = res.ok
-    return res.ok
+    if (res.ok) {
+      await setToken(token)
+    } else {
+      clearToken()
+    }
   } catch (e) {
-    authState.loggedIn = false
-    return false
+    clearToken()
   }
 }

frontend_nuxt/utils/discord.js

@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 export function discordAuthorize(inviteToken = '') {
@@ -47,7 +47,6 @@ export async function discordExchange(code, inviteToken = '', reason = '') {
 
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush?.()
       return { success: true, needReason: false }

frontend_nuxt/utils/github.js

@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 export function githubAuthorize(inviteToken = '') {
@@ -45,7 +45,6 @@ export async function githubExchange(code, inviteToken = '', reason = '') {
 
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush?.()
       return { success: true, needReason: false }

frontend_nuxt/utils/google.js

@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 export async function googleGetIdToken() {
@@ -79,7 +79,6 @@ export async function googleAuthWithToken(
 
     if (res.ok && data && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush?.()
       if (typeof redirect_success === 'function') redirect_success()

frontend_nuxt/utils/telegram.js

@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 export function telegramAuthorize(inviteToken = '') {
@@ -34,7 +34,6 @@ export async function telegramExchange(authData, inviteToken = '', reason = '')
     const data = await res.json()
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush?.()
       return { success: true, needReason: false }

frontend_nuxt/utils/twitter.js

@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 function generateCodeVerifier() {
@@ -99,7 +99,6 @@ export async function twitterExchange(code, state, reason) {
     const data = await res.json()
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush()
       return { success: true, needReason: false }