fix(webui): better authorization redirection

koishijs · Apr 3, 2021 · 7237377 · 7237377
1 parent 22988d5
commit 7237377
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/packages/plugin-webui/client/components/button.vue b/packages/plugin-webui/client/components/button.vue
@@ -3,7 +3,6 @@
     :title="disabled ? '' : title"
     :class="['k-button', type, { solid, round, frameless }]"
     :disabled="disabled"
-    @click.stop="$emit('click')"
   >
     <slot/>
   </button>

diff --git a/packages/plugin-webui/client/main.ts b/packages/plugin-webui/client/main.ts
@@ -81,7 +81,7 @@ receive('expire', () => {
 
 router.beforeEach((route) => {
   if (route.meta.authority && !user.value) {
-    return '/login'
+    return history.state.forward === '/login' ? '/' : '/login'
   }
 })
 

diff --git a/packages/plugin-webui/client/views/layout/sidebar.vue b/packages/plugin-webui/client/views/layout/sidebar.vue
@@ -20,7 +20,7 @@ import type { RouteMeta } from 'vue-router'
 
 function isShown(meta: RouteMeta) {
   if (meta.hidden) return false
-  if (meta.authority && meta.authority > 1 && meta.authority > user.value?.authority) return false
+  if (meta.authority > 1 && !(meta.authority <= user.value?.authority)) return false
   return true
 }
 

diff --git a/packages/plugin-webui/client/views/login.vue b/packages/plugin-webui/client/views/login.vue
@@ -64,7 +64,7 @@ receive('login', body => data.value = body)
 
 watch(user, (value) => {
   if (!value) return
-  router.push('/profile')
+  router.push(router.currentRoute.value.redirectedFrom?.fullPath || '/profile')
 })
 
 let timestamp = 0