From 92b85ce4ef4a25df0f2feb8640f8478839723180 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Wed, 28 Aug 2024 11:14:21 +0700 Subject: [PATCH] remove keycloak change use cookie only --- src/main.ts | 24 ------- src/modules/00_support/store/Main.ts | 11 +-- src/modules/01_dashboard/views/Dashboard.vue | 7 +- src/modules/05_leave/components/Calendar.vue | 10 ++- .../06_evaluate/components/step/step2.vue | 7 +- .../06_evaluate/components/step/step6.vue | 8 +-- src/modules/07_appealComplain/views/Main.vue | 1 - .../Tab/Dialog/03_FormIndicatorSpecial.vue | 1 - src/modules/09_scholarship/views/detail.vue | 1 - .../components/DialogAddRequestEdit.vue | 1 - src/modules/10_registry/views/main.vue | 5 +- src/modules/11_probation/views/main.vue | 1 - src/modules/11_probation/views/mainDetail.vue | 1 - src/plugins/ !keycloak.ts | 70 ++++++++++++++++++ src/plugins/auth.ts | 71 +++++++++++++++++++ src/plugins/axios.ts | 33 +++++---- src/plugins/http.ts | 4 +- src/plugins/keycloak.ts | 70 ------------------ src/router/index.ts | 12 ++-- src/stores/mixin.ts | 8 +-- src/views/MainLayout.vue | 20 +++--- src/views/auth.vue | 13 ++-- src/views/login.vue | 46 ++++++------ 23 files changed, 236 insertions(+), 189 deletions(-) create mode 100644 src/plugins/ !keycloak.ts create mode 100644 src/plugins/auth.ts delete mode 100644 src/plugins/keycloak.ts diff --git a/src/main.ts b/src/main.ts index b2b22cb..183f7b9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -9,7 +9,6 @@ import "@vuepic/vue-datepicker/dist/main.css"; import "quasar/src/css/index.sass"; import http from "./plugins/http"; -import keycloak, { getToken } from "@/plugins/keycloak"; // import OpenLayersMap from "vue3-openlayers"; @@ -41,27 +40,4 @@ app.component( ); app.config.globalProperties.$http = http; - -// authen with keycloak client -const auth = await getToken(); - -if (auth.token && auth.refresh_token) { - keycloak.init({ - checkLoginIframe: false, - token: auth.token, - refreshToken: auth.refresh_token, - }); - // .then((authenticated) => { - // console.log("authenticated", authenticated); - // if (!authenticated) { - // window.location.reload(); - // } else { - // console.log("Authenticated"); - // } - // }) - // .catch((err) => { - // console.error("Keycloak initialization failed:", err); - // }); -} - app.mount("#app"); diff --git a/src/modules/00_support/store/Main.ts b/src/modules/00_support/store/Main.ts index 72bb088..5302d69 100644 --- a/src/modules/00_support/store/Main.ts +++ b/src/modules/00_support/store/Main.ts @@ -12,15 +12,16 @@ import type { SupportUserStatus, SupportMessageStatus, } from "@/modules/00_support/interface/index/Main"; -import keycloak from "@/plugins/keycloak"; import { useCounterMixin } from "@/stores/mixin"; +import { getToken, tokenParsed } from "@/plugins/auth"; export const useSupportStore = defineStore("supportServiceStore", () => { const { showLoader, hideLoader, messageError } = useCounterMixin(); const $q = useQuasar(); const openChat = ref(false); const icon = ref("mdi-account-check"); - const userId = ref(keycloak.subject); + + const userId = ref(""); const userStatus = ref([]); const issue = ref(); const issueCategory = ref(); @@ -33,7 +34,7 @@ export const useSupportStore = defineStore("supportServiceStore", () => { const scrollContainer = ref(); const socket = io(config.API.supportSocket, { - auth: { token: keycloak.token }, + auth: { token: getToken() }, autoConnect: false, path: "/api/v1/support/socket/", }); @@ -42,7 +43,9 @@ export const useSupportStore = defineStore("supportServiceStore", () => { userStatus.value = data; }); - socket.on("online", (r) => { + socket.on("online", async (r) => { + const user = await tokenParsed(); + userId.value = user?.sub; userStatus.value.push({ socketId: r.socketId, userId: r.userId, diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index 0fe5ca2..85c0349 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -6,9 +6,9 @@ import router from "@/router"; import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; -import keycloak from "@/plugins/keycloak"; import PopupReplyInbox from "@/components/PopupReplyInbox.vue"; import PopupDetailInbox from "@/components/PopupDetailInbox.vue"; +import { tokenParsed } from "@/plugins/auth"; const $q = useQuasar(); const mixin = useCounterMixin(); @@ -125,8 +125,9 @@ const items = ref([ ]); onMounted(async () => { await fetchlistInbox(1); - if (keycloak.tokenParsed != null) { - fullname.value = keycloak.tokenParsed.name; + const user = await tokenParsed(); + if (user) { + fullname.value = user.name; } }); const fetchlistInbox = async (index: number) => { diff --git a/src/modules/05_leave/components/Calendar.vue b/src/modules/05_leave/components/Calendar.vue index a217649..31dec7f 100644 --- a/src/modules/05_leave/components/Calendar.vue +++ b/src/modules/05_leave/components/Calendar.vue @@ -1,10 +1,9 @@ diff --git a/src/views/login.vue b/src/views/login.vue index c1ad245..a9d4de2 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,11 +1,12 @@ - +