From 01a257c5c24aaf67caf1a6fb7b826a741d3bd31d Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 26 Jul 2024 10:34:37 +0700 Subject: [PATCH] set logout at plugin keycloak --- src/plugins/keycloak.ts | 5 ++++- src/router/index.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/keycloak.ts b/src/plugins/keycloak.ts index a0e8cd4..24c64fd 100644 --- a/src/plugins/keycloak.ts +++ b/src/plugins/keycloak.ts @@ -13,7 +13,10 @@ const keycloak = new Keycloak(keycloakConfig); async function kcLogout() { await deleteCookie("BMAHRIS_KEYCLOAK_IDENTITY"); await deleteCookie("BMAHRIS_KEYCLOAK_REFRESH"); - keycloak.logout(); + + if (keycloak.authenticated !== undefined) { + keycloak.logout(); + } window.location.href = "/login"; } diff --git a/src/router/index.ts b/src/router/index.ts index ad5dd66..a5a9700 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -19,7 +19,7 @@ import ModuleProbation from "@/modules/11_probation/router"; import ModuleOrganization from "@/modules/12_organization/router"; import ModulePortfolio from "@/modules/13_portfolio/router"; // TODO: ใช้หรือไม่? -import keycloak from "@/plugins/keycloak"; +import keycloak, { kcLogout } from "@/plugins/keycloak"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -79,7 +79,7 @@ const router = createRouter({ router.beforeEach((to, from, next) => { if (to.meta.Auth) { if (keycloak.authenticated === undefined && to.meta.Auth) { - window.location.href = "/login"; + kcLogout(); } } else { next();