feature/#20-API-Tokens #50

Merged
jkeffects merged 3 commits from feature/#20-API-Tokens into develop 2025-01-22 10:59:45 +00:00
12 changed files with 554 additions and 62 deletions
Showing only changes of commit 7ded4a21bb - Show all commits

View file

@ -0,0 +1,72 @@
<template>
<div class="w-full md:max-w-md">
<div class="flex flex-col items-center">
<p class="text-xl font-medium">Webapi-Token erstellen</p>
</div>
<br />
<form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreateWebapi">
<div>
<label for="webapi">Bezeichnung</label>
<input type="text" id="webapi" required />
</div>
<div class="flex flex-row gap-2">
<button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">erstellen</button>
<Spinner v-if="status == 'loading'" class="my-auto" />
<SuccessCheckmark v-else-if="status?.status == 'success'" />
<FailureXMark v-else-if="status?.status == 'failed'" />
</div>
</form>
<div class="flex flex-row justify-end">
<div class="flex flex-row gap-4 py-2">
<button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
abbrechen
</button>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { defineComponent } from "vue";
import { mapState, mapActions } from "pinia";
import { useModalStore } from "@/stores/modal";
import Spinner from "@/components/Spinner.vue";
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
import FailureXMark from "@/components/FailureXMark.vue";
import { useWebapiStore } from "@/stores/admin/user/webapi";
</script>
<script lang="ts">
export default defineComponent({
data() {
return {
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
timeout: undefined as any,
};
},
beforeUnmount() {
try {
clearTimeout(this.timeout);
} catch (error) {}
},
methods: {
...mapActions(useModalStore, ["closeModal"]),
...mapActions(useWebapiStore, ["createWebapi"]),
triggerCreateWebapi(e: any) {
let formData = e.target.elements;
this.status = "loading";
this.createWebapi(formData.webapi.value)
.then(() => {
this.status = { status: "success" };
this.timeout = setTimeout(() => {
this.closeModal();
}, 1500);
})
.catch(() => {
this.status = { status: "failed" };
});
},
},
});
</script>

View file

@ -0,0 +1,75 @@
<template>
<div class="w-full md:max-w-md">
<div class="flex flex-col items-center">
<p class="text-xl font-medium">Webapi-Token {{ webapi?.title }} löschen?</p>
</div>
<br />
<div class="flex flex-row gap-2">
<button primary :disabled="status == 'loading' || status?.status == 'success'" @click="triggerDeleteWebapi">
unwiederuflich löschen
</button>
<Spinner v-if="status == 'loading'" class="my-auto" />
<SuccessCheckmark v-else-if="status?.status == 'success'" />
<FailureXMark v-else-if="status?.status == 'failed'" />
</div>
<div class="flex flex-row justify-end">
<div class="flex flex-row gap-4 py-2">
<button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
abbrechen
</button>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { defineComponent } from "vue";
import { mapState, mapActions } from "pinia";
import { useModalStore } from "@/stores/modal";
import Spinner from "@/components/Spinner.vue";
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
import FailureXMark from "@/components/FailureXMark.vue";
import { useWebapiStore } from "@/stores/admin/user/webapi";
</script>
<script lang="ts">
export default defineComponent({
data() {
return {
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
timeout: undefined as any,
};
},
beforeUnmount() {
try {
clearTimeout(this.timeout);
} catch (error) {}
},
computed: {
...mapState(useModalStore, ["data"]),
...mapState(useWebapiStore, ["webapis"]),
webapi() {
return this.webapis.find((r) => r.id == this.data);
},
},
methods: {
...mapActions(useModalStore, ["closeModal"]),
...mapActions(useWebapiStore, ["deleteWebapi"]),
triggerDeleteWebapi() {
this.status = "loading";
this.deleteWebapi(this.data)
.then(() => {
this.status = { status: "success" };
this.timeout = setTimeout(() => {
this.closeModal();
}, 1500);
})
.catch(() => {
this.status = { status: "failed" };
});
},
},
});
</script>

View file

@ -0,0 +1,54 @@
<template>
<div class="flex flex-col h-fit w-full border border-primary rounded-md">
<div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
<p>{{ webapi.title }} <small v-if="webapi.permissions.admin">(Admin)</small></p>
<div class="flex flex-row">
<RouterLink
v-if="can('admin', 'user', 'webapi')"
:to="{ name: 'admin-user-webapi-permission', params: { id: webapi.id } }"
>
<WrenchScrewdriverIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
</RouterLink>
<RouterLink
v-if="can('update', 'user', 'webapi')"
:to="{ name: 'admin-user-webapi-edit', params: { id: webapi.id } }"
>
<PencilIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
</RouterLink>
<div v-if="can('delete', 'user', 'webapi')" @click="openDeleteModal">
<TrashIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
import { mapState, mapActions } from "pinia";
import { PencilIcon, WrenchScrewdriverIcon, TrashIcon } from "@heroicons/vue/24/outline";
import type { WebapiViewModel } from "@/viewmodels/admin/user/webapi.models";
import { RouterLink } from "vue-router";
import { useAbilityStore } from "@/stores/ability";
import { useModalStore } from "@/stores/modal";
</script>
<script lang="ts">
export default defineComponent({
props: {
webapi: { type: Object as PropType<WebapiViewModel>, default: {} },
},
computed: {
...mapState(useAbilityStore, ["can"]),
},
methods: {
...mapActions(useModalStore, ["openModal"]),
openDeleteModal() {
this.openModal(
markRaw(defineAsyncComponent(() => import("@/components/admin/user/webapi/DeleteWebapiModal.vue"))),
this.webapi.id
);
},
},
});
</script>

View file

@ -582,6 +582,36 @@ const router = createRouter({
},
],
},
{
path: "webapi",
name: "admin-user-webapi-route",
component: () => import("@/views/RouterView.vue"),
meta: { type: "read", section: "user", module: "webapi" },
beforeEnter: [abilityAndNavUpdate],
children: [
{
path: "",
name: "admin-user-webapi",
component: () => import("@/views/admin/user/webapi/Webapi.vue"),
},
{
path: ":id/edit",
name: "admin-user-webapi-edit",
component: () => import("@/views/admin/user/webapi/WebapiEdit.vue"),
meta: { type: "update", section: "user", module: "webapi" },
beforeEnter: [abilityAndNavUpdate],
props: true,
},
{
path: ":id/permission",
name: "admin-user-webapi-permission",
component: () => import("@/views/admin/user/webapi/WebapiEditPermission.vue"),
meta: { type: "update", section: "user", module: "webapi" },
beforeEnter: [abilityAndNavUpdate],
props: true,
},
],
},
],
},
{

View file

@ -131,6 +131,7 @@ export const useNavigationStore = defineStore("navigation", {
main: [
...(abilityStore.can("read", "user", "user") ? [{ key: "user", title: "Benutzer" }] : []),
...(abilityStore.can("read", "user", "role") ? [{ key: "role", title: "Rollen" }] : []),
...(abilityStore.can("read", "user", "webapi") ? [{ key: "webapi", title: "Webapi-Token" }] : []),
],
},
} as navigationModel;

View file

@ -1,57 +0,0 @@
import { defineStore } from "pinia";
import type { ApiViewModel } from "@/viewmodels/admin/user/api.models";
import { http } from "@/serverCom";
import type { PermissionObject } from "@/types/permissionTypes";
import type { AxiosResponse } from "axios";
export const useApiStore = defineStore("api", {
state: () => {
return {
apis: [] as Array<ApiViewModel>,
loading: null as null | "loading" | "success" | "failed",
};
},
actions: {
fetchApis() {
this.loading = "loading";
http
.get("/admin/api")
.then((result) => {
this.apis = result.data;
this.loading = "success";
})
.catch((err) => {
this.loading = "failed";
});
},
fetchApiById(id: number): Promise<AxiosResponse<any, any>> {
return http.get(`/admin/api/${id}`);
},
async createApi(api: string): Promise<AxiosResponse<any, any>> {
const result = await http.post("/admin/api", {
api: api,
});
this.fetchApis();
return result;
},
async updateActiveApi(id: number, api: string): Promise<AxiosResponse<any, any>> {
const result = await http.patch(`/admin/api/${id}`, {
api: api,
});
this.fetchApis();
return result;
},
async updateActiveApiPermissions(api: number, permission: PermissionObject): Promise<AxiosResponse<any, any>> {
const result = await http.patch(`/admin/api/${api}/permissions`, {
permissions: permission,
});
this.fetchApis();
return result;
},
async deleteApi(api: number): Promise<AxiosResponse<any, any>> {
const result = await http.delete(`/admin/api/${api}`);
this.fetchApis();
return result;
},
},
});

View file

@ -0,0 +1,60 @@
import { defineStore } from "pinia";
import type { WebapiViewModel } from "@/viewmodels/admin/user/webapi.models";
import { http } from "@/serverCom";
import type { PermissionObject } from "@/types/permissionTypes";
import type { AxiosResponse } from "axios";
export const useWebapiStore = defineStore("webapi", {
state: () => {
return {
webapis: [] as Array<WebapiViewModel>,
loading: null as null | "loading" | "success" | "failed",
};
},
actions: {
fetchWebapis() {
this.loading = "loading";
http
.get("/admin/webapi")
.then((result) => {
this.webapis = result.data;
this.loading = "success";
})
.catch((err) => {
this.loading = "failed";
});
},
fetchWebapiById(id: number): Promise<AxiosResponse<any, any>> {
return http.get(`/admin/webapi/${id}`);
},
async createWebapi(webapi: string): Promise<AxiosResponse<any, any>> {
const result = await http.post("/admin/webapi", {
webapi: webapi,
});
this.fetchWebapis();
return result;
},
async updateActiveWebapi(id: number, webapi: string): Promise<AxiosResponse<any, any>> {
const result = await http.patch(`/admin/webapi/${id}`, {
webapi: webapi,
});
this.fetchWebapis();
return result;
},
async updateActiveWebapiPermissions(
webapi: number,
permission: PermissionObject
): Promise<AxiosResponse<any, any>> {
const result = await http.patch(`/admin/webapi/${webapi}/permissions`, {
permissions: permission,
});
this.fetchWebapis();
return result;
},
async deleteWebapi(webapi: number): Promise<AxiosResponse<any, any>> {
const result = await http.delete(`/admin/webapi/${webapi}`);
this.fetchWebapis();
return result;
},
},
});

View file

@ -14,6 +14,7 @@ export type PermissionModule =
| "calendar_type"
| "user"
| "role"
| "webapi"
| "query"
| "query_store"
| "template"
@ -55,6 +56,7 @@ export const permissionModules: Array<PermissionModule> = [
"calendar_type",
"user",
"role",
"webapi",
"query",
"query_store",
"template",
@ -75,5 +77,5 @@ export const sectionsAndModules: SectionsAndModulesObject = {
"template_usage",
"newsletter_config",
],
user: ["user", "role"],
user: ["user", "role", "webapi"],
};

View file

@ -1,6 +1,6 @@
import type { PermissionObject } from "@/types/permissionTypes";
export interface ApiViewModel {
export interface WebapiViewModel {
id: number;
permissions: PermissionObject;
title: string;
@ -9,18 +9,18 @@ export interface ApiViewModel {
expiry?: Date;
}
export interface CreateApiViewModel {
export interface CreateWebapiViewModel {
title: string;
token: string;
expiry?: Date;
}
export interface UpdateApiViewModel {
export interface UpdateWebapiViewModel {
id: number;
title: string;
expiry?: Date;
}
export interface DeleteApiViewModel {
export interface DeleteWebapiViewModel {
id: number;
}

View file

@ -0,0 +1,52 @@
<template>
<MainTemplate>
<template #topBar>
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
<h1 class="font-bold text-xl h-8">Webapi-Token</h1>
</div>
</template>
<template #diffMain>
<div class="flex flex-col gap-4 h-full pl-7">
<div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
<WebapiListItem v-for="webapi in webapis" :key="webapi.id" :webapi="webapi" />
</div>
<div class="flex flex-row gap-4">
<button v-if="can('create', 'user', 'webapi')" primary class="!w-fit" @click="openCreateModal">
Webapi-Token erstellen
</button>
</div>
</div>
</template>
</MainTemplate>
</template>
<script setup lang="ts">
import { defineAsyncComponent, defineComponent, markRaw } from "vue";
import { mapState, mapActions } from "pinia";
import MainTemplate from "@/templates/Main.vue";
import { useWebapiStore } from "@/stores/admin/user/webapi";
import WebapiListItem from "@/components/admin/user/webapi/WebapiListItem.vue";
import { useModalStore } from "@/stores/modal";
import { useAbilityStore } from "@/stores/ability";
</script>
<script lang="ts">
export default defineComponent({
computed: {
...mapState(useWebapiStore, ["webapis"]),
...mapState(useAbilityStore, ["can"]),
},
mounted() {
this.fetchWebapis();
},
methods: {
...mapActions(useWebapiStore, ["fetchWebapis"]),
...mapActions(useModalStore, ["openModal"]),
openCreateModal() {
this.openModal(
markRaw(defineAsyncComponent(() => import("@/components/admin/user/webapi/CreateWebapiModal.vue")))
);
},
},
});
</script>

View file

@ -0,0 +1,116 @@
<template>
<MainTemplate>
<template #headerInsert>
<RouterLink to="../" class="text-primary">zurück zur Liste (abbrechen)</RouterLink>
</template>
<template #topBar>
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
<h1 class="font-bold text-xl h-8">Webapi-Token {{ origin?.title }} - Daten bearbeiten</h1>
</div>
</template>
<template #main>
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
<form
v-else-if="webapi"
class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
@submit.prevent="triggerWebapiUpdate"
>
<div>
<label for="webapi">Bezeichnung</label>
<input type="text" id="webapi" required v-model="webapi.title" />
</div>
<div class="flex flex-row justify-end gap-2">
<button primary-outline type="reset" class="!w-fit" :disabled="canSaveOrReset" @click="resetForm">
verwerfen
</button>
<button primary type="submit" class="!w-fit" :disabled="status == 'loading' || canSaveOrReset">
speichern
</button>
<Spinner v-if="status == 'loading'" class="my-auto" />
<SuccessCheckmark v-else-if="status?.status == 'success'" />
<FailureXMark v-else-if="status?.status == 'failed'" />
</div>
</form>
</template>
</MainTemplate>
</template>
<script setup lang="ts">
import { defineComponent } from "vue";
import { mapState, mapActions } from "pinia";
import MainTemplate from "@/templates/Main.vue";
import { useWebapiStore } from "@/stores/admin/user/webapi";
import Spinner from "@/components/Spinner.vue";
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
import FailureXMark from "@/components/FailureXMark.vue";
import { RouterLink } from "vue-router";
import cloneDeep from "lodash.clonedeep";
import isEqual from "lodash.isequal";
import type { WebapiViewModel } from "@/viewmodels/admin/user/webapi.models";
</script>
<script lang="ts">
export default defineComponent({
props: {
id: String,
},
data() {
return {
loading: "loading" as "loading" | "fetched" | "failed",
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
origin: null as null | WebapiViewModel,
webapi: null as null | WebapiViewModel,
timeout: null as any,
};
},
computed: {
canSaveOrReset(): boolean {
return isEqual(this.origin, this.webapi);
},
},
mounted() {
this.fetchItem();
},
beforeUnmount() {
try {
clearTimeout(this.timeout);
} catch (error) {}
},
methods: {
...mapActions(useWebapiStore, ["fetchWebapiById", "updateActiveWebapi"]),
resetForm() {
this.webapi = cloneDeep(this.origin);
},
fetchItem() {
this.fetchWebapiById(parseInt(this.id ?? ""))
.then((result) => {
this.webapi = result.data;
this.origin = cloneDeep(result.data);
this.loading = "fetched";
})
.catch((err) => {
this.loading = "failed";
});
},
triggerWebapiUpdate(e: any) {
if (this.webapi == null) return;
let formData = e.target.elements;
this.status = "loading";
this.updateActiveWebapi(this.webapi.id, formData.webapi.value)
.then(() => {
this.fetchItem();
this.status = { status: "success" };
})
.catch((err) => {
this.status = { status: "failed" };
})
.finally(() => {
this.timeout = setTimeout(() => {
this.status = null;
}, 2000);
});
},
},
});
</script>

View file

@ -0,0 +1,87 @@
<template>
<MainTemplate>
<template #headerInsert>
<RouterLink to="../" class="text-primary">zurück zur Liste (abbrechen)</RouterLink>
</template>
<template #topBar>
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
<h1 class="font-bold text-xl h-8">Webapi-Token {{ webapi?.title }} - Berechtigungen bearbeiten</h1>
</div>
</template>
<template #main>
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
<Permission
v-else-if="webapi != null"
:permissions="webapi.permissions"
:status="status"
@savePermissions="triggerUpdate"
/>
</template>
</MainTemplate>
</template>
<script setup lang="ts">
import { defineComponent } from "vue";
import { mapState, mapActions } from "pinia";
import MainTemplate from "@/templates/Main.vue";
import { useWebapiStore } from "@/stores/admin/user/webapi";
import Permission from "@/components/admin/Permission.vue";
import Spinner from "@/components/Spinner.vue";
import type { PermissionObject } from "@/types/permissionTypes";
import type { WebapiViewModel } from "@/viewmodels/admin/user/webapi.models";
</script>
<script lang="ts">
export default defineComponent({
props: {
id: String,
},
data() {
return {
loading: "loading" as "loading" | "fetched" | "failed",
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
webapi: null as null | WebapiViewModel,
timeout: null as any,
};
},
mounted() {
this.fetchItem();
},
beforeUnmount() {
try {
clearTimeout(this.timeout);
} catch (error) {}
},
methods: {
...mapActions(useWebapiStore, ["fetchWebapiById", "updateActiveWebapiPermissions"]),
fetchItem() {
this.fetchWebapiById(parseInt(this.id ?? ""))
.then((result) => {
this.webapi = result.data;
this.loading = "fetched";
})
.catch((err) => {
this.loading = "failed";
});
},
triggerUpdate(e: PermissionObject) {
if (this.webapi == null) return;
this.status = "loading";
this.updateActiveWebapiPermissions(this.webapi.id, e)
.then(() => {
this.fetchItem();
this.status = { status: "success" };
})
.catch((err) => {
this.status = { status: "failed" };
})
.finally(() => {
this.timeout = setTimeout(() => {
this.status = null;
}, 2000);
});
},
},
});
</script>