condense to isloggedin

This commit is contained in:
Maikiwi
2023-10-15 03:59:45 -07:00
parent fa595b965f
commit d1bcce05dc
3 changed files with 12 additions and 14 deletions

View File

@@ -11,8 +11,8 @@ const theme: GlobalThemeOverrides = {
},
};
const { refresh, isLogin } = useAuth();
if (isLogin.value) {
const { refresh, isLoggedin } = useAuth();
if (isLoggedin.value === true) {
refresh();
}
</script>

View File

@@ -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<User>({
@@ -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,

View File

@@ -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' });
}