imacat/lucia-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move auth-entry checks to router guard and simplify MainContainer route logic

Browse Source 
Co-Authored-By: Codex <codex@openai.com>
This commit is contained in:
依瑪貓
2026-03-08 19:14:20 +08:00
parent f3d11ebbcb
commit 955e9ceda9
3 changed files with 48 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/views/MainContainer.vue
View File

@@ -27,11 +27,9 @@
* via beforeRouteUpdate.
*/
import { useLoginStore as useLoginStoreInGuard } from "@/stores/login";
import { usePageAdminStore as usePageAdminStoreInGuard } from "@/stores/pageAdmin";
import { useAllMapDataStore as useAllMapDataStoreInGuard } from "@/stores/allMapData";
import { useConformanceStore as useConformanceStoreInGuard } from "@/stores/conformance";
import { getCookie, setCookie } from "@/utils/cookieUtil.js";
import {
leaveFilter as leaveFilterInGuard,
leaveConformance as leaveConformanceInGuard,
@@ -39,55 +37,6 @@ import {
import emitterInGuard from "@/utils/emitter";
export default {
// When the page is refreshed or entered for the first time, beforeRouteEnter is executed, but beforeRouteUpdate is not
// PSEUDOCODE
// if (not logged in) {
// if (has refresh token) {
// refresh_token();
// if (refresh failed) {
// go to log in();
// } else {
// cookie add("refresh_token=" + refresh_token "; expire=****")
// }
// } else {
// go to log in();
// }
// }
async beforeRouteEnter(to, from, next) {
const loginStore = useLoginStoreInGuard();
const relativeReturnTo = `${window.location.pathname}${window.location.search}${window.location.hash}`;
const hasLoginMarker = Boolean(getCookie("isLuciaLoggedIn"));
const hasAccessToken = Boolean(getCookie("luciaToken"));
const hasRefreshToken = Boolean(getCookie("luciaRefreshToken"));
if (hasLoginMarker && hasAccessToken) {
next();
return;
}
if (hasRefreshToken) {
try {
await loginStore.refreshToken();
loginStore.setIsLoggedIn(true);
setCookie("isLuciaLoggedIn", "true");
next();
} catch (error) {
next({
path: "/login",
query: {
"return-to": btoa(relativeReturnTo),
},
});
}
} else {
next({
path: "/login",
query: {
"return-to": btoa(relativeReturnTo),
},
});
}
},
// Remember, Swal modal handling is called before beforeRouteUpdate
beforeRouteUpdate(to, from, next) {
const pageAdminStore = usePageAdminStoreInGuard();
@@ -127,31 +76,17 @@ export default {
<script setup lang="ts">
import { onBeforeMount } from "vue";
import { useRouter } from "vue-router";
import { storeToRefs } from "pinia";
import { useLoadingStore } from "@/stores/loading";
import { useAllMapDataStore } from "@/stores/allMapData";
import { useConformanceStore } from "@/stores/conformance";
import Header from "@/components/AppHeader.vue";
import Navbar from "@/components/AppNavbar.vue";
import Loading from "@/components/LoadingOverlay.vue";
import { leaveFilter, leaveConformance } from "@/module/alertModal.js";
import { usePageAdminStore } from "@/stores/pageAdmin";
import { useLoginStore } from "@/stores/login";
import emitter from "@/utils/emitter";
import ModalContainer from "./AccountManagement/ModalContainer.vue";
const loadingStore = useLoadingStore();
const allMapDataStore = useAllMapDataStore();
const conformanceStore = useConformanceStore();
const pageAdminStore = usePageAdminStore();
const loginStore = useLoginStore();
const router = useRouter();
const { tempFilterId, createFilterId, temporaryData, postRuleData, ruleData } =
storeToRefs(allMapDataStore);
const { conformanceLogTempCheckId, conformanceFilterTempCheckId } =
storeToRefs(conformanceStore);
/** Sets the highlighted navbar item based on the current URL path on page load. */
const setHighlightedNavItemOnLanding = () => {
const currentPath = router.currentRoute.value.path;