Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8a71dad977 | ||
|
|
45ed773119 |
+9
-2
@@ -1,7 +1,14 @@
|
|||||||
import {defineStore} from "pinia";
|
import {defineStore} from "pinia";
|
||||||
import {ref} from "vue";
|
import {ref} from "vue";
|
||||||
import {CharacterResponse} from "@/generated/mammon";
|
import {CharacterResponse} from "@/generated/mammon";
|
||||||
import {addCharacter as addCharacterRequest, fetchMe, mammonLoginUrl, postLogout, refreshAccessToken, setOnAuthExpired} from "@/mammon";
|
import {
|
||||||
|
addCharacter as addCharacterRequest,
|
||||||
|
fetchMe,
|
||||||
|
mammonLoginUrl,
|
||||||
|
postLogout,
|
||||||
|
refreshAccessToken,
|
||||||
|
setOnAuthExpired
|
||||||
|
} from "@/mammon";
|
||||||
import {setAccessToken} from "./token";
|
import {setAccessToken} from "./token";
|
||||||
|
|
||||||
export const useAuthStore = defineStore('auth', () => {
|
export const useAuthStore = defineStore('auth', () => {
|
||||||
@@ -59,7 +66,7 @@ export const useAuthStore = defineStore('auth', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (await refresh()) {
|
if (await refresh()) {
|
||||||
await fetch();
|
await fetch().catch(() => {});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-2
@@ -17,10 +17,11 @@ const router = createRouter({
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.use(pinia);
|
app.use(pinia);
|
||||||
app.use(router);
|
|
||||||
|
|
||||||
const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
|
|
||||||
|
await authStore.bootstrap();
|
||||||
|
|
||||||
router.beforeEach(to => {
|
router.beforeEach(to => {
|
||||||
if (!to.meta.public && !authStore.isAuthenticated) {
|
if (!to.meta.public && !authStore.isAuthenticated) {
|
||||||
return {name: routeNames.home};
|
return {name: routeNames.home};
|
||||||
@@ -28,4 +29,5 @@ router.beforeEach(to => {
|
|||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
authStore.bootstrap().finally(() => app.mount('#app'));
|
app.use(router);
|
||||||
|
app.mount('#app');
|
||||||
Reference in New Issue
Block a user