feat: add api key delete (#2210)
Co-authored-by: Meier Lukas <meierschlumpf@gmail.com>
This commit is contained in:
@@ -1,14 +1,15 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useMemo } from "react";
|
import { useCallback, useMemo } from "react";
|
||||||
import { Button, Group, Stack, Text, Title } from "@mantine/core";
|
import { ActionIcon, Button, Group, Stack, Text, Title } from "@mantine/core";
|
||||||
|
import { IconTrash } from "@tabler/icons-react";
|
||||||
import type { MRT_ColumnDef } from "mantine-react-table";
|
import type { MRT_ColumnDef } from "mantine-react-table";
|
||||||
import { MantineReactTable, useMantineReactTable } from "mantine-react-table";
|
import { MantineReactTable, useMantineReactTable } from "mantine-react-table";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { revalidatePathActionAsync } from "@homarr/common/client";
|
import { revalidatePathActionAsync } from "@homarr/common/client";
|
||||||
import { useModalAction } from "@homarr/modals";
|
import { useConfirmModal, useModalAction } from "@homarr/modals";
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
import { UserAvatar } from "@homarr/ui";
|
import { UserAvatar } from "@homarr/ui";
|
||||||
|
|
||||||
@@ -20,7 +21,8 @@ interface ApiKeysManagementProps {
|
|||||||
|
|
||||||
export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
|
export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
|
||||||
const { openModal } = useModalAction(CopyApiKeyModal);
|
const { openModal } = useModalAction(CopyApiKeyModal);
|
||||||
const { mutate, isPending } = clientApi.apiKeys.create.useMutation({
|
const { openConfirmModal } = useConfirmModal();
|
||||||
|
const { mutate: mutateCreate, isPending: isPendingCreate } = clientApi.apiKeys.create.useMutation({
|
||||||
async onSuccess(data) {
|
async onSuccess(data) {
|
||||||
openModal({
|
openModal({
|
||||||
apiKey: data.apiKey,
|
apiKey: data.apiKey,
|
||||||
@@ -28,7 +30,26 @@ export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
|
|||||||
await revalidatePathActionAsync("/manage/tools/api");
|
await revalidatePathActionAsync("/manage/tools/api");
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
const { mutateAsync: mutateDeleteAsync, isPending: isPendingDelete } = clientApi.apiKeys.delete.useMutation({
|
||||||
|
async onSuccess() {
|
||||||
|
await revalidatePathActionAsync("/manage/tools/api");
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const t = useScopedI18n("management.page.tool.api.tab.apiKey");
|
const t = useScopedI18n("management.page.tool.api.tab.apiKey");
|
||||||
|
const handleDelete = useCallback(
|
||||||
|
(id: string) => {
|
||||||
|
openConfirmModal({
|
||||||
|
title: t("modal.delete.title"),
|
||||||
|
children: t("modal.delete.text"),
|
||||||
|
// eslint-disable-next-line no-restricted-syntax
|
||||||
|
async onConfirm() {
|
||||||
|
await mutateDeleteAsync({ apiKeyId: id });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
},
|
||||||
|
[t, openConfirmModal, mutateDeleteAsync],
|
||||||
|
);
|
||||||
|
|
||||||
const columns = useMemo<MRT_ColumnDef<RouterOutputs["apiKeys"]["getAll"][number]>[]>(
|
const columns = useMemo<MRT_ColumnDef<RouterOutputs["apiKeys"]["getAll"][number]>[]>(
|
||||||
() => [
|
() => [
|
||||||
@@ -46,8 +67,18 @@ export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
|
|||||||
</Group>
|
</Group>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
header: t("table.header.actions"),
|
||||||
|
Cell: ({ row }) => (
|
||||||
|
<Group gap="xs">
|
||||||
|
<ActionIcon onClick={() => handleDelete(row.original.id)} loading={isPendingDelete} c="red">
|
||||||
|
<IconTrash size="1rem" />
|
||||||
|
</ActionIcon>
|
||||||
|
</Group>
|
||||||
|
),
|
||||||
|
},
|
||||||
],
|
],
|
||||||
[t],
|
[t, handleDelete, isPendingDelete],
|
||||||
);
|
);
|
||||||
|
|
||||||
const table = useMantineReactTable({
|
const table = useMantineReactTable({
|
||||||
@@ -56,9 +87,9 @@ export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
|
|||||||
renderTopToolbarCustomActions: () => (
|
renderTopToolbarCustomActions: () => (
|
||||||
<Button
|
<Button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
mutate();
|
mutateCreate();
|
||||||
}}
|
}}
|
||||||
loading={isPending}
|
loading={isPendingCreate}
|
||||||
>
|
>
|
||||||
{t("button.createApiToken")}
|
{t("button.createApiToken")}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
|
import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
|
||||||
import { generateSecureRandomToken } from "@homarr/common/server";
|
import { generateSecureRandomToken } from "@homarr/common/server";
|
||||||
import { createId, db } from "@homarr/db";
|
import { createId, db, eq } from "@homarr/db";
|
||||||
import { apiKeys } from "@homarr/db/schema";
|
import { apiKeys } from "@homarr/db/schema";
|
||||||
|
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
|
||||||
@@ -39,4 +41,10 @@ export const apiKeysRouter = createTRPCRouter({
|
|||||||
apiKey: `${id}.${randomToken}`,
|
apiKey: `${id}.${randomToken}`,
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
|
delete: permissionRequiredProcedure
|
||||||
|
.requiresPermission("admin")
|
||||||
|
.input(z.object({ apiKeyId: z.string() }))
|
||||||
|
.mutation(async ({ ctx, input }) => {
|
||||||
|
await ctx.db.delete(apiKeys).where(eq(apiKeys.id, input.apiKeyId)).limit(1);
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2584,10 +2584,17 @@
|
|||||||
"button": {
|
"button": {
|
||||||
"createApiToken": "Create API token"
|
"createApiToken": "Create API token"
|
||||||
},
|
},
|
||||||
|
"modal": {
|
||||||
|
"delete": {
|
||||||
|
"title": "Delete API token",
|
||||||
|
"text": "This will permanently delete the API token. API clients using this token can no longer authenticate and perform API requests. This action cannot be undone."
|
||||||
|
}
|
||||||
|
},
|
||||||
"table": {
|
"table": {
|
||||||
"header": {
|
"header": {
|
||||||
"id": "ID",
|
"id": "ID",
|
||||||
"createdBy": "Created by"
|
"createdBy": "Created by",
|
||||||
|
"actions": "Actions"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user