fix(ui/sidebar): disable admin password check dialog in sidebar

ArtalkJS · Aug 28, 2024 · f1a86d5 · f1a86d5
1 parent adcb75a
commit f1a86d5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/ui/artalk-sidebar/src/App.vue b/ui/artalk-sidebar/src/App.vue
@@ -48,6 +48,21 @@ function syncArtalk(artalk: Artalk) {
   const artalkUser = artalk.ctx.get('user')
   const artalkUserData = artalkUser.getData()
 
+  const logout = () => {
+    user.logout()
+    nextTick(() => {
+      router.replace('/login')
+    })
+  }
+
+  // Remove login failed dialog if sidebar
+  artalk.ctx.getApiHandlers().remove('need_login')
+  artalk.ctx.getApiHandlers().add('need_login', async () => {
+    logout()
+    throw new Error('Need login')
+  })
+
+  // Check user status
   artalk.ctx
     .getApi()
     .user.getUserStatus({
@@ -56,10 +71,7 @@ function syncArtalk(artalk: Artalk) {
     })
     .then((res) => {
       if (res.data.is_admin && !res.data.is_login) {
-        user.logout()
-        nextTick(() => {
-          router.replace('/login')
-        })
+        logout()
       } else {
         // 将全部通知标记为已读
         artalk.ctx.getApi().notifies.markAllNotifyRead({

diff --git a/ui/artalk/src/api/handler.ts b/ui/artalk/src/api/handler.ts
@@ -16,6 +16,7 @@ export interface ApiHandlers {
     action: T,
     handler: (data: ApiHandlerPayload[T]) => Promise<void>,
   ) => void
+  remove: (action: PayloadKey) => void
   get: () => ApiHandler[]
 }
 
@@ -25,6 +26,10 @@ export function createApiHandlers(): ApiHandlers {
     add: (action, handler) => {
       handlers.push({ action, handler })
     },
+    remove: (action) => {
+      const index = handlers.findIndex((h) => h.action === action)
+      if (index !== -1) handlers.splice(index, 1)
+    },
     get: () => handlers,
   }
 }