From d1bcce05dc927ba847e427957fab388c8b8c2ebd Mon Sep 17 00:00:00 2001 From: Maikiwi <74925636+maikirakiwi@users.noreply.github.com> Date: Sun, 15 Oct 2023 03:59:45 -0700 Subject: [PATCH] condense to isloggedin --- webui/src/App.vue | 4 ++-- webui/src/hooks/useAuth.ts | 14 ++++++-------- webui/src/router/index.ts | 8 ++++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/webui/src/App.vue b/webui/src/App.vue index af1f79a4..edf84327 100644 --- a/webui/src/App.vue +++ b/webui/src/App.vue @@ -11,8 +11,8 @@ const theme: GlobalThemeOverrides = { }, }; -const { refresh, isLogin } = useAuth(); -if (isLogin.value) { +const { refresh, isLoggedin } = useAuth(); +if (isLoggedin.value === true) { refresh(); } diff --git a/webui/src/hooks/useAuth.ts b/webui/src/hooks/useAuth.ts index 01814468..fb3ce35d 100644 --- a/webui/src/hooks/useAuth.ts +++ b/webui/src/hooks/useAuth.ts @@ -2,7 +2,7 @@ import type { User } from '#/auth'; import type { ApiError } from '#/api'; export const useAuth = createSharedComposable(() => { - const auth = useLocalStorage('auth', ''); + const isLoggedin = useLocalStorage('isLoggedin', false); const message = useMessage(); const user = reactive({ @@ -10,7 +10,6 @@ export const useAuth = createSharedComposable(() => { password: '', }); - const isLogin = computed(() => auth.value === '1'); function clearUser() { user.username = ''; @@ -39,7 +38,7 @@ export const useAuth = createSharedComposable(() => { }); onResult((res) => { - auth.value = `1`; + isLoggedin.value = true; clearUser(); }); @@ -68,7 +67,7 @@ export const useAuth = createSharedComposable(() => { onLogoutResult(() => { clearUser(); - auth.value = ''; + isLoggedin.value = false; }); const { execute: refresh, onResult: onRefreshResult } = useApi( @@ -76,7 +75,7 @@ export const useAuth = createSharedComposable(() => { ); onRefreshResult((res) => { - auth.value = `1`; + isLoggedin.value = true; }); function update() { @@ -90,7 +89,7 @@ export const useAuth = createSharedComposable(() => { onResult((res) => { if (res.message === 'update success') { - auth.value = ``; + isLoggedin.value = false; clearUser(); } else { user.password = ''; @@ -107,9 +106,8 @@ export const useAuth = createSharedComposable(() => { } return { - auth, + isLoggedin, user, - isLogin, login, logout, diff --git a/webui/src/router/index.ts b/webui/src/router/index.ts index 8a9ff55a..4e620998 100644 --- a/webui/src/router/index.ts +++ b/webui/src/router/index.ts @@ -5,14 +5,14 @@ const router = createRouter({ }); router.beforeEach((to) => { - const { isLogin } = useAuth(); + const { isLoggedin } = useAuth(); const { type, url } = storeToRefs(usePlayerStore()); - if (!isLogin.value && to.path !== '/login') { + if (!isLoggedin.value && to.path !== '/login') { return { name: 'Login' }; } - if (isLogin.value && to.path === '/login') { + if (isLoggedin.value && to.path === '/login') { return { name: 'Index' }; } @@ -21,7 +21,7 @@ router.beforeEach((to) => { return false; } - watch(isLogin, (val) => { + watch(isLoggedin, (val) => { if (to.path === '/login' && val) { router.replace({ name: 'Index' }); }