remove keycloak use cookie auth

This commit is contained in:
Warunee Tamkoo 2024-08-28 15:29:09 +07:00
parent 035db71697
commit 5a5e37c12d
27 changed files with 501 additions and 440 deletions

View file

@ -7,11 +7,11 @@ import { useCounterMixin } from "@/stores/mixin";
import CurrencyInput from "@/components/CurruncyInput.vue";
import http from "@/plugins/http";
import config from "@/app.config";
import keycloak from "@/plugins/keycloak";
/**Import type */
import type { QForm } from "quasar";
import type { ResponseDataDetail } from "@/modules/06_retirement/interface/response/discharged";
import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
import { tokenParsed } from "@/plugins/auth";
const modalPersonal = ref<boolean>(false);
const personId = ref<string>("");
@ -64,8 +64,9 @@ const responseData = ref<ResponseDataDetail>({
/** Hook */
onMounted(async () => {
if (keycloak.tokenParsed != null) {
roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
const user = await tokenParsed();
if (user) {
roleAdmin.value = await user.role.includes("placement1");
}
await getData();
});

View file

@ -5,7 +5,7 @@ import { useRoute, useRouter } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
import config from "@/app.config";
import keycloak from "@/plugins/keycloak";
import { tokenParsed } from "@/plugins/auth";
/**Import type */
import type { QForm } from "quasar";
@ -146,8 +146,9 @@ const getClass = (val: boolean) => {
/** Hook */
onMounted(async () => {
if (keycloak.tokenParsed != null) {
roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
const user = await tokenParsed();
if (user) {
roleAdmin.value = await user.role.includes("placement1");
}
await getData();
});
@ -182,7 +183,11 @@ onMounted(async () => {
แกไขขอมลเพอลงบญชแนบทาย
</div>
<q-space />
<div v-if="status !== 'DONE' && status !== 'REPORT' && !checkRoutePermisson">
<div
v-if="
status !== 'DONE' && status !== 'REPORT' && !checkRoutePermisson
"
>
<div class="q-gutter-sm" v-if="!edit">
<q-btn
outline

View file

@ -5,7 +5,6 @@ import { useRouter } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
import config from "@/app.config";
// import keycloak from "@/plugins/keycloak";
import type { QForm } from "quasar";

View file

@ -5,7 +5,7 @@ import { useRoute, useRouter } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
import config from "@/app.config";
import keycloak from "@/plugins/keycloak";
import { tokenParsed } from "@/plugins/auth";
/**import type*/
import type {
@ -23,7 +23,9 @@ import CardProfile from "@/components/CardProfile.vue";
const $q = useQuasar();
const route = useRoute();
const router = useRouter();
const checkRoutePermisson = ref<boolean>(route.name == "exit-Interview-detailsOnly");
const checkRoutePermisson = ref<boolean>(
route.name == "exit-Interview-detailsOnly"
);
const mixin = useCounterMixin();
const dataId = route.params.id.toString();
const {
@ -80,8 +82,9 @@ const adjustOther = ref("");
/** HOOK */
onMounted(async () => {
if (keycloak.tokenParsed != null) {
roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
const user = await tokenParsed();
if (user) {
roleAdmin.value = await user.role.includes("placement1");
}
await getData();
await fecthquestion();
@ -1087,9 +1090,14 @@ const putData = () => {
</div>
</div>
<div class="col-12" v-if="!checkRoutePermisson"><q-separator /></div>
<div class="col-12" v-if="!checkRoutePermisson">
<q-separator />
</div>
<q-card-actions class="col-12 text-primary q-pa-md" v-if="!checkRoutePermisson">
<q-card-actions
class="col-12 text-primary q-pa-md"
v-if="!checkRoutePermisson"
>
<q-space />
<q-btn
unelevated

View file

@ -6,7 +6,8 @@ import { useCounterMixin } from "@/stores/mixin";
import CurrencyInput from "@/components/CurruncyInput.vue";
import http from "@/plugins/http";
import config from "@/app.config";
import keycloak from "@/plugins/keycloak";
import { tokenParsed } from "@/plugins/auth";
/**Import Type */
import type { QForm } from "quasar";
import type { ResponseDataDetail } from "@/modules/06_retirement/interface/response/expulsion";
@ -62,8 +63,9 @@ const responseData = ref<ResponseDataDetail>({
/**Hook */
onMounted(async () => {
if (keycloak.tokenParsed != null) {
roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
const user = await tokenParsed();
if (user) {
roleAdmin.value = await user.role.includes("placement1");
}
await getData();
});

View file

@ -9,8 +9,8 @@ import { useRetirementDataStore } from "@/modules/06_retirement/store";
import http from "@/plugins/http";
import config from "@/app.config";
import axios from "axios";
import { tokenParsed } from "@/plugins/auth";
import keycloak from "@/plugins/keycloak";
import type {
TypeFile,
rowFile,
@ -144,10 +144,11 @@ const checkboxOp = ref<CheckBoxType[]>([
onMounted(async () => {
fetchData(id.value);
fetchFile();
if (keycloak.tokenParsed !== undefined) {
const commander = await keycloak.tokenParsed.role.includes("commander");
const oligarch = await keycloak.tokenParsed.role.includes("oligarch");
const officer = await keycloak.tokenParsed.role.includes("officer");
const user = await tokenParsed();
if (user) {
const commander = await user.role.includes("commander");
const oligarch = await kuser.role.includes("oligarch");
const officer = await user.role.includes("officer");
if (commander) {
roleUser.value = "commander";
} else if (oligarch) {