remove keycloak change use cookie only
This commit is contained in:
parent
24374ab8f2
commit
92b85ce4ef
23 changed files with 236 additions and 189 deletions
|
|
@ -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<boolean>(false);
|
||||
const icon = ref<string>("mdi-account-check");
|
||||
const userId = ref<string | undefined>(keycloak.subject);
|
||||
|
||||
const userId = ref<string | undefined>("");
|
||||
const userStatus = ref<SupportUserStatus[]>([]);
|
||||
const issue = ref<SupportIssueResponse>();
|
||||
const issueCategory = ref<SupportIssueCategoryResponse>();
|
||||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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<any>([
|
|||
]);
|
||||
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) => {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
import { tokenParsed } from "@/plugins/auth";
|
||||
/**import calendar*/
|
||||
import FullCalendar from "@fullcalendar/vue3";
|
||||
import dayGridPlugin from "@fullcalendar/daygrid";
|
||||
|
|
@ -35,9 +34,7 @@ const $q = useQuasar();
|
|||
const emit = defineEmits(["update:dateYear"]);
|
||||
const fullName = ref<string>("");
|
||||
const mainData = ref<DataCalendar[]>([]);
|
||||
const keycloakId = ref<string>(
|
||||
keycloak.tokenParsed ? keycloak.tokenParsed.sub!.toString() : ""
|
||||
);
|
||||
const keycloakId = ref<string>("");
|
||||
const modal = ref<boolean>(false);
|
||||
const leaveId = ref<string>("");
|
||||
|
||||
|
|
@ -171,7 +168,6 @@ const fetchData = async () => {
|
|||
// textColor: "#FF8000",
|
||||
// }))
|
||||
// calendarOptions.value.events = [...calendarOptions.value.events, ...eventSix]
|
||||
console.log(calendarOptions.value.events);
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -265,6 +261,8 @@ watch(
|
|||
|
||||
/**Hook */
|
||||
onMounted(async () => {
|
||||
const user = await tokenParsed();
|
||||
keycloakId.value = await (user ? user.sub : "");
|
||||
filterVal.value.push(keycloakId.value);
|
||||
await fetchDataCalendar();
|
||||
await fetchData();
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ import { ref, watch, onMounted, reactive } from "vue";
|
|||
import { useRouter, useRoute } from "vue-router";
|
||||
import { VuePDF, usePDF } from "@tato30/vue-pdf";
|
||||
import { useQuasar } from "quasar";
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import axios from "axios";
|
||||
import genReport from "@/plugins/genreport";
|
||||
import { tokenParsed } from "@/plugins/auth";
|
||||
|
||||
/** importType*/
|
||||
import type { FormCommand } from "@/modules/06_evaluate/interface/evalute";
|
||||
|
|
@ -401,8 +401,9 @@ async function downloadFile(fileName: string) {
|
|||
|
||||
/**lifecycle Hooks*/
|
||||
onMounted(async () => {
|
||||
if (keycloak.tokenParsed != null) {
|
||||
formCommand.author = keycloak.tokenParsed.name;
|
||||
const user = await tokenParsed();
|
||||
if (user) {
|
||||
formCommand.author = user.name;
|
||||
}
|
||||
showLoader();
|
||||
await Promise.all([
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@
|
|||
import { ref, reactive, watch, onMounted } from "vue";
|
||||
import { useRoute } from "vue-router";
|
||||
import { useQuasar } from "quasar";
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import axios from "axios";
|
||||
|
||||
import { tokenParsed } from "@/plugins/auth";
|
||||
/** importType*/
|
||||
import type { FormCommand } from "@/modules/06_evaluate/interface/evalute";
|
||||
|
||||
|
|
@ -214,8 +213,9 @@ function checkDoc() {
|
|||
|
||||
/** hook lifecycle*/
|
||||
onMounted(async () => {
|
||||
if (keycloak.tokenParsed != null) {
|
||||
formCommand.author = keycloak.tokenParsed.name;
|
||||
const user = await tokenParsed();
|
||||
if (user) {
|
||||
formCommand.author = user.name;
|
||||
}
|
||||
checkDoc();
|
||||
if (store.currentStep > 2) {
|
||||
|
|
|
|||
|
|
@ -179,7 +179,6 @@ const getData = async () => {
|
|||
maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
|
||||
let data = res.data.result.data;
|
||||
dataStore.fetchAppealComplain(data);
|
||||
console.log(data);
|
||||
})
|
||||
.catch((e: any) => {
|
||||
messageError($q, e);
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ function fetchspecialByid(id: string) {
|
|||
.get(config.API.kpiAchievement("special") + `/${id}`)
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
console.log(data);
|
||||
|
||||
formData.including = data.including;
|
||||
formData.includingName = data.includingName;
|
||||
|
|
|
|||
|
|
@ -364,7 +364,6 @@ function fetchDataDetail(id: string) {
|
|||
.get(config.API.developmentScholarship + `/${id}`)
|
||||
.then((res) => {
|
||||
const data: DataSholarship = res.data.result;
|
||||
console.log(data);
|
||||
formBody.rank = data.rank;
|
||||
formBody.prefix = data.prefix;
|
||||
formBody.firstName = data.firstName;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import { useQuasar } from "quasar";
|
|||
import config from "@/app.config";
|
||||
import http from "@/plugins/http";
|
||||
import axios from "axios";
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
|
||||
import DialogHeader from "@/components/DialogHeader.vue";
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import avatar from "@/assets/avatar_user.jpg";
|
|||
import { ref, reactive, onMounted } from "vue";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
|
||||
//หน้าเมนู
|
||||
import InformationPage from "@/modules/10_registry/tabs/01_information.vue";
|
||||
|
|
@ -373,12 +372,12 @@ onMounted(async () => {
|
|||
<q-avatar text-color="info" icon="mdi-chevron-right" />
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item clickable v-ripple disabled>
|
||||
<!-- <q-item clickable v-ripple disabled>
|
||||
<q-item-section>เปลี่ยนรหัสผ่าน</q-item-section>
|
||||
<q-item-section avatar>
|
||||
<q-avatar text-color="info" icon="mdi-chevron-right" />
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</q-item> -->
|
||||
</q-list>
|
||||
</q-card>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import avatar from "@/assets/avatar_user.jpg";
|
||||
import { ref, reactive, onMounted } from "vue";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
|
||||
import { useRouter } from "vue-router";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import avatar from "@/assets/avatar_user.jpg";
|
||||
import { ref, reactive, onMounted } from "vue";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue