Track HiveGrid Cloud planning reference
This commit is contained in:
1 parent
b3d5ea6764
commit
e341c5938a
5784 files changed
+1104929
-3
No files matched your search
@@ -0,0 +1,70 @@
|
||||
import type { LoaderFunctionArgs } from "react-router";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
vi.mock("~/modules/api/services/ApiSpecsService", () => ({
|
||||
default: {
|
||||
generateSpecs: vi.fn(async () => ({
|
||||
openApi: { openapi: "3.1.0" },
|
||||
postmanCollection: { info: {}, item: [] },
|
||||
apiDocsUrl: "https://api.example.com/v1/docs",
|
||||
})),
|
||||
},
|
||||
}));
|
||||
vi.mock("~/utils/db/appConfiguration.db.server", () => ({
|
||||
getAppConfiguration: vi.fn(async () => ({ app: { features: { tenantApiKeys: true } } })),
|
||||
}));
|
||||
vi.mock("~/utils/helpers/.server/PermissionsService", () => ({ verifyUserHasPermission: vi.fn(async () => undefined) }));
|
||||
vi.mock("~/utils/services/.server/urlService", () => ({ getTenantIdFromUrl: vi.fn(async () => "tenant-1") }));
|
||||
vi.mock("~/locale/i18next.server", () => ({
|
||||
getTranslations: vi.fn(async () => ({
|
||||
t: (key: string) => (key === "settings.api.errors.tenantApiKeysNotEnabled" ? "API keys are not enabled" : key),
|
||||
})),
|
||||
}));
|
||||
|
||||
import ApiSpecsService from "~/modules/api/services/ApiSpecsService";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { getAppConfiguration } from "~/utils/db/appConfiguration.db.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { loader } from "./docs";
|
||||
|
||||
describe("tenant API docs route", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(getTenantIdFromUrl).mockResolvedValue("tenant-1");
|
||||
vi.mocked(getAppConfiguration).mockResolvedValue({ app: { features: { tenantApiKeys: true } } } as never);
|
||||
vi.mocked(verifyUserHasPermission).mockResolvedValue(undefined as never);
|
||||
});
|
||||
|
||||
it("checks tenant permission and feature gate before generating docs", async () => {
|
||||
const request = new Request("https://app.example.com/acme/settings/api/docs");
|
||||
|
||||
const data = await loader({ request, params: { tenant: "acme" }, context: {} } as unknown as LoaderFunctionArgs);
|
||||
|
||||
expect(getTenantIdFromUrl).toHaveBeenCalledWith({ tenant: "acme" });
|
||||
expect(verifyUserHasPermission).toHaveBeenCalledWith(request, "app.settings.apiKeys.view", "tenant-1");
|
||||
expect(getAppConfiguration).toHaveBeenCalledWith({ request });
|
||||
expect(ApiSpecsService.generateSpecs).toHaveBeenCalledWith({ request });
|
||||
expect(data).toMatchObject({ apiSpecs: { apiDocsUrl: "https://api.example.com/v1/docs" } });
|
||||
expect(vi.mocked(verifyUserHasPermission).mock.invocationCallOrder[0]).toBeLessThan(
|
||||
vi.mocked(ApiSpecsService.generateSpecs).mock.invocationCallOrder[0]
|
||||
);
|
||||
});
|
||||
|
||||
it("does not generate docs when tenant API keys are disabled", async () => {
|
||||
vi.mocked(getAppConfiguration).mockResolvedValue({ app: { features: { tenantApiKeys: false } } } as never);
|
||||
|
||||
try {
|
||||
await loader({ request: new Request("https://app.example.com/acme/settings/api/docs"), params: { tenant: "acme" }, context: {} } as never);
|
||||
throw new Error("Expected loader to throw");
|
||||
} catch (error) {
|
||||
expect(error).toBeInstanceOf(Response);
|
||||
const response = error as Response;
|
||||
expect(response.status).toBe(404);
|
||||
await expect(response.json()).resolves.toEqual({ error: "API keys are not enabled" });
|
||||
}
|
||||
|
||||
expect(getTranslations).toHaveBeenCalledWith(expect.any(Request));
|
||||
expect(ApiSpecsService.generateSpecs).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,61 @@
|
||||
import { LoaderFunctionArgs, useLoaderData } from "react-router";
|
||||
import { useParams } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import ApiSpecs from "~/modules/api/components/ApiSpecs";
|
||||
import ApiSpecsService, { ApiSpecsDto } from "~/modules/api/services/ApiSpecsService";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { getAppConfiguration } from "~/utils/db/appConfiguration.db.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
|
||||
type LoaderData = {
|
||||
apiSpecs: ApiSpecsDto;
|
||||
};
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.view", tenantId);
|
||||
const appConfiguration = await getAppConfiguration({ request });
|
||||
if (!appConfiguration.app.features.tenantApiKeys) {
|
||||
throw Response.json({ error: t("settings.api.errors.tenantApiKeysNotEnabled") }, { status: 404 });
|
||||
}
|
||||
const apiSpecs = await ApiSpecsService.generateSpecs({ request });
|
||||
const data: LoaderData = {
|
||||
apiSpecs,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export default function AdminApiDocsRoute() {
|
||||
const { t } = useTranslation();
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const params = useParams();
|
||||
return (
|
||||
<>
|
||||
<EditPageLayout
|
||||
tabs={[
|
||||
{
|
||||
name: t("shared.overview"),
|
||||
routePath: UrlUtils.getModulePath(params, "api"),
|
||||
},
|
||||
{
|
||||
name: t("models.apiCall.plural"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/logs"),
|
||||
},
|
||||
{
|
||||
name: t("models.apiKey.plural"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/keys"),
|
||||
},
|
||||
{
|
||||
name: t("docs.title"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/docs"),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<ApiSpecs item={data.apiSpecs} postmanCollectionUrl={null} showPostmanCollection={false} />
|
||||
</EditPageLayout>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
import type { LoaderFunctionArgs } from "react-router";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
vi.mock("~/modules/api/services/ApiKeyLogService", () => ({
|
||||
default: {
|
||||
getSummary: vi.fn(async () => ({ items: [], filterableProperties: [] })),
|
||||
},
|
||||
}));
|
||||
vi.mock("~/utils/db/appConfiguration.db.server", () => ({
|
||||
getAppConfiguration: vi.fn(async () => ({ app: { features: { tenantApiKeys: true } } })),
|
||||
}));
|
||||
vi.mock("~/utils/helpers/.server/PermissionsService", () => ({ verifyUserHasPermission: vi.fn(async () => undefined) }));
|
||||
vi.mock("~/utils/services/.server/urlService", () => ({ getTenantIdFromUrl: vi.fn(async () => "tenant-1") }));
|
||||
vi.mock("~/locale/i18next.server", () => ({
|
||||
getTranslations: vi.fn(async () => ({
|
||||
t: (key: string) => (key === "settings.api.errors.tenantApiKeysNotEnabled" ? "API keys are not enabled" : key),
|
||||
})),
|
||||
}));
|
||||
|
||||
import ApiKeyLogService from "~/modules/api/services/ApiKeyLogService";
|
||||
import { getAppConfiguration } from "~/utils/db/appConfiguration.db.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { loader } from "./index";
|
||||
|
||||
describe("tenant API settings overview route", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(getTenantIdFromUrl).mockResolvedValue("tenant-1");
|
||||
vi.mocked(getAppConfiguration).mockResolvedValue({ app: { features: { tenantApiKeys: true } } } as never);
|
||||
vi.mocked(verifyUserHasPermission).mockResolvedValue(undefined as never);
|
||||
});
|
||||
|
||||
it("checks tenant permission and feature gate before loading API key logs", async () => {
|
||||
const request = new Request("https://app.example.com/acme/settings/api");
|
||||
|
||||
const data = await loader({ request, params: { tenant: "acme" }, context: {} } as unknown as LoaderFunctionArgs);
|
||||
|
||||
expect(getTenantIdFromUrl).toHaveBeenCalledWith({ tenant: "acme" });
|
||||
expect(verifyUserHasPermission).toHaveBeenCalledWith(request, "app.settings.apiKeys.view", "tenant-1");
|
||||
expect(ApiKeyLogService.getSummary).toHaveBeenCalledWith({ request, params: { tenant: "acme" } });
|
||||
expect(data).toMatchObject({ items: [], filterableProperties: [] });
|
||||
});
|
||||
|
||||
it("returns an i18n key when tenant API keys are disabled", async () => {
|
||||
vi.mocked(getAppConfiguration).mockResolvedValue({ app: { features: { tenantApiKeys: false } } } as never);
|
||||
|
||||
const response = await loader({ request: new Request("https://app.example.com/acme/settings/api"), params: { tenant: "acme" }, context: {} } as never);
|
||||
|
||||
expect(response).toBeInstanceOf(Response);
|
||||
expect((response as Response).status).toBe(400);
|
||||
await expect((response as Response).json()).resolves.toEqual({ error: "settings.api.errors.tenantApiKeysNotEnabled" });
|
||||
expect(ApiKeyLogService.getSummary).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,88 @@
|
||||
import { LoaderFunctionArgs, useLoaderData } from "react-router";
|
||||
import { Link, useParams } from "react-router";
|
||||
import { Fragment } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { FilterablePropertyDto } from "~/application/dtos/data/FilterablePropertyDto";
|
||||
import ErrorBanner from "~/components/ui/banners/ErrorBanner";
|
||||
import ServerError from "~/components/ui/errors/ServerError";
|
||||
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
|
||||
import ApiKeyLogsSummary from "~/modules/api/components/ApiKeyLogsSummary";
|
||||
import { ApiCallSummaryDto } from "~/modules/api/dtos/ApiCallSummaryDto";
|
||||
import ApiKeyLogService from "~/modules/api/services/ApiKeyLogService";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { getAppConfiguration } from "~/utils/db/appConfiguration.db.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
|
||||
type LoaderData =
|
||||
| { error: string }
|
||||
| {
|
||||
items: ApiCallSummaryDto[];
|
||||
allTenants: { id: string; name: string }[];
|
||||
filterableProperties: FilterablePropertyDto[];
|
||||
};
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.view", tenantId);
|
||||
try {
|
||||
const appConfiguration = await getAppConfiguration({ request });
|
||||
if (!appConfiguration.app.features.tenantApiKeys) {
|
||||
return Response.json({ error: "settings.api.errors.tenantApiKeysNotEnabled" }, { status: 400 });
|
||||
}
|
||||
const { items, filterableProperties } = await ApiKeyLogService.getSummary({ request, params });
|
||||
const data: LoaderData = {
|
||||
items,
|
||||
allTenants: [],
|
||||
filterableProperties,
|
||||
};
|
||||
return data;
|
||||
} catch (error) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.error(error);
|
||||
return Response.json({ error: "shared.unexpectedError" }, { status: 400 });
|
||||
}
|
||||
};
|
||||
|
||||
export default function () {
|
||||
const { t } = useTranslation();
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const params = useParams();
|
||||
return (
|
||||
<EditPageLayout
|
||||
tabs={[
|
||||
{
|
||||
name: t("shared.overview"),
|
||||
routePath: UrlUtils.getModulePath(params, "api"),
|
||||
},
|
||||
{
|
||||
name: t("models.apiCall.plural"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/logs"),
|
||||
},
|
||||
{
|
||||
name: t("models.apiKey.plural"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/keys"),
|
||||
},
|
||||
{
|
||||
name: t("docs.title"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/docs"),
|
||||
},
|
||||
]}
|
||||
>
|
||||
{"error" in data ? (
|
||||
<ErrorBanner title={t(data.error)}>
|
||||
<Link to="." className="underline">
|
||||
{t("shared.clickHereToTryAgain")}
|
||||
</Link>
|
||||
</ErrorBanner>
|
||||
) : (
|
||||
<Fragment>
|
||||
<ApiKeyLogsSummary data={data} />
|
||||
</Fragment>
|
||||
)}
|
||||
</EditPageLayout>
|
||||
);
|
||||
}
|
||||
|
||||
export function ErrorBoundary() {
|
||||
return <ServerError />;
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
import { LoaderFunctionArgs, Outlet, useLoaderData, useParams } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import ApiKeysTable from "~/components/core/apiKeys/ApiKeysTable";
|
||||
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import { RedactedApiKeyWithDetails, getApiKeys } from "~/utils/db/apiKeys.db.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
|
||||
type LoaderData = {
|
||||
apiKeys: RedactedApiKeyWithDetails[];
|
||||
};
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.view", tenantId);
|
||||
const data: LoaderData = {
|
||||
apiKeys: await getApiKeys(tenantId),
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export default function ApiKeysRoute() {
|
||||
const { t } = useTranslation();
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const appData = useAppData();
|
||||
const params = useParams();
|
||||
|
||||
return (
|
||||
<EditPageLayout
|
||||
tabs={[
|
||||
{ name: t("shared.overview"), routePath: UrlUtils.getModulePath(params, "api") },
|
||||
{ name: t("models.apiCall.plural"), routePath: UrlUtils.getModulePath(params, "api/logs") },
|
||||
{ name: t("models.apiKey.plural"), routePath: UrlUtils.getModulePath(params, "api/keys") },
|
||||
{ name: t("docs.title"), routePath: UrlUtils.getModulePath(params, "api/docs") },
|
||||
]}
|
||||
>
|
||||
<ApiKeysTable
|
||||
canCreate={getUserHasPermission(appData, "app.settings.apiKeys.create")}
|
||||
entities={appData.entities}
|
||||
items={data.apiKeys}
|
||||
/>
|
||||
<Outlet />
|
||||
</EditPageLayout>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,225 @@
|
||||
// @vitest-environment node
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { ActionFunctionArgs } from "react-router";
|
||||
|
||||
vi.mock("~/locale/i18next.server", () => ({
|
||||
getTranslations: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/services/.server/urlService", () => ({
|
||||
getTenantIdFromUrl: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/helpers/.server/PermissionsService", () => ({
|
||||
verifyUserHasPermission: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/session.server", () => ({
|
||||
getUserInfo: vi.fn(),
|
||||
validateCSRFToken: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/tenants.db.server", () => ({
|
||||
getTenant: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/users.db.server", () => ({
|
||||
getUser: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/apiKeys.db.server", () => ({
|
||||
countApiKeyLogsForKey: vi.fn(),
|
||||
deleteApiKey: vi.fn(),
|
||||
getApiKeys: vi.fn(),
|
||||
getTenantApiKeyById: vi.fn(),
|
||||
rotateApiKey: vi.fn(),
|
||||
updateApiKey: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/logs.db.server", () => ({
|
||||
createLog: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/helpers/.server/ApiKeyHelperService", () => ({
|
||||
getApiKeyEntityPermissions: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/modules/events/services/.server/EventsService", () => ({
|
||||
default: { create: vi.fn() },
|
||||
}));
|
||||
vi.mock("~/utils/app/UrlUtils", () => ({
|
||||
default: { currentTenantUrl: vi.fn((_params: Record<string, string | undefined>, path: string) => `/acme/${path}`) },
|
||||
}));
|
||||
vi.mock("~/components/core/apiKeys/ApiKeyCreatedModal", () => ({ default: () => null }));
|
||||
vi.mock("~/components/core/apiKeys/ApiKeyForm", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/modals/OpenModal", () => ({ default: ({ children }: { children: React.ReactNode }) => children }));
|
||||
vi.mock("~/utils/data/useAppData", () => ({ useAppData: () => ({ entities: [] }) }));
|
||||
vi.mock("~/utils/helpers/PermissionsHelper", () => ({ getUserHasPermission: vi.fn(() => true) }));
|
||||
|
||||
import EventsService from "~/modules/events/services/.server/EventsService";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { countApiKeyLogsForKey, deleteApiKey, getApiKeys, getTenantApiKeyById, rotateApiKey, updateApiKey } from "~/utils/db/apiKeys.db.server";
|
||||
import { createLog } from "~/utils/db/logs.db.server";
|
||||
import { getTenant } from "~/utils/db/tenants.db.server";
|
||||
import { getUser } from "~/utils/db/users.db.server";
|
||||
import { getApiKeyEntityPermissions } from "~/utils/helpers/.server/ApiKeyHelperService";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
|
||||
import { action } from "./$id";
|
||||
|
||||
const params = { tenant: "acme", id: "api-key-1" };
|
||||
const tenant = { id: "tenant-1", name: "Acme", slug: "acme" };
|
||||
const user = { id: "user-1", email: "ada@example.test" };
|
||||
const entityPermission = { entityId: "entity-1", create: true, read: true, update: false, delete: false };
|
||||
const existingApiKey = {
|
||||
id: "api-key-1",
|
||||
tenantId: "tenant-1",
|
||||
alias: "Primary integration",
|
||||
expires: null,
|
||||
active: true,
|
||||
entities: [entityPermission],
|
||||
};
|
||||
const rotatedApiKey = { ...existingApiKey, key: "tc_live_rotated_plaintext_once" };
|
||||
|
||||
function createRequest(form: FormData) {
|
||||
return new Request("https://app.example.test/acme/settings/api/keys/api-key-1", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/x-www-form-urlencoded" },
|
||||
body: new URLSearchParams(form as unknown as Record<string, string>),
|
||||
});
|
||||
}
|
||||
|
||||
function createForm(actionName: "edit" | "delete" | "rotate" = "edit", overrides: Record<string, string> = {}) {
|
||||
const form = new FormData();
|
||||
form.set("action", actionName);
|
||||
form.set("alias", "Primary integration updated");
|
||||
form.set("active", "on");
|
||||
form.append("entities[]", JSON.stringify(entityPermission));
|
||||
Object.entries(overrides).forEach(([key, value]) => form.set(key, value));
|
||||
return form;
|
||||
}
|
||||
|
||||
async function callAction(form: FormData) {
|
||||
return action({
|
||||
request: createRequest(form),
|
||||
params,
|
||||
context: {},
|
||||
unstable_pattern: "app.$tenant/settings/api/keys/$id",
|
||||
} as ActionFunctionArgs) as Promise<Response>;
|
||||
}
|
||||
|
||||
async function responseJson(response: Response) {
|
||||
return response.json() as Promise<Record<string, unknown>>;
|
||||
}
|
||||
|
||||
describe("tenant API key edit route", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(getTranslations).mockResolvedValue({ t: (key: string) => `translated:${key}` } as never);
|
||||
vi.mocked(getTenantIdFromUrl).mockResolvedValue("tenant-1");
|
||||
vi.mocked(verifyUserHasPermission).mockResolvedValue(undefined as never);
|
||||
vi.mocked(getUserInfo).mockResolvedValue({ userId: "user-1" } as never);
|
||||
vi.mocked(validateCSRFToken).mockResolvedValue(undefined as never);
|
||||
vi.mocked(getTenant).mockResolvedValue(tenant as never);
|
||||
vi.mocked(getUser).mockResolvedValue(user as never);
|
||||
vi.mocked(getTenantApiKeyById).mockResolvedValue(existingApiKey as never);
|
||||
vi.mocked(getApiKeys).mockResolvedValue([existingApiKey] as never);
|
||||
vi.mocked(updateApiKey).mockResolvedValue({ ...existingApiKey, alias: "Primary integration updated" } as never);
|
||||
vi.mocked(rotateApiKey).mockResolvedValue(rotatedApiKey as never);
|
||||
vi.mocked(deleteApiKey).mockResolvedValue(existingApiKey as never);
|
||||
vi.mocked(countApiKeyLogsForKey).mockResolvedValue(0 as never);
|
||||
vi.mocked(getApiKeyEntityPermissions).mockImplementation(async (permissions) => permissions as never);
|
||||
vi.mocked(EventsService.create).mockResolvedValue(undefined as never);
|
||||
vi.mocked(createLog).mockResolvedValue({} as never);
|
||||
});
|
||||
|
||||
it("rejects keys outside the tenant scope before update, rotation, or delete", async () => {
|
||||
vi.mocked(getTenantApiKeyById).mockResolvedValue(null as never);
|
||||
|
||||
for (const actionName of ["edit", "rotate", "delete"] as const) {
|
||||
const response = await callAction(createForm(actionName));
|
||||
const data = await responseJson(response);
|
||||
|
||||
expect(response.status).toBe(400);
|
||||
expect(data).toEqual({ error: "translated:shared.notFound" });
|
||||
}
|
||||
|
||||
expect(updateApiKey).not.toHaveBeenCalled();
|
||||
expect(rotateApiKey).not.toHaveBeenCalled();
|
||||
expect(deleteApiKey).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("returns one-time plaintext only after successful rotation", async () => {
|
||||
const response = await callAction(createForm("rotate"));
|
||||
const data = await responseJson(response);
|
||||
|
||||
expect(response.status).toBe(200);
|
||||
expect(data).toEqual({ apiKey: { key: rotatedApiKey.key, alias: rotatedApiKey.alias } });
|
||||
expect(rotateApiKey).toHaveBeenCalledWith("api-key-1", "tenant-1");
|
||||
expect(createLog).toHaveBeenCalledWith(
|
||||
expect.any(Request),
|
||||
"tenant-1",
|
||||
"settings.apiKeys.rotated",
|
||||
expect.stringContaining('"alias":"Primary integration"')
|
||||
);
|
||||
expect(updateApiKey).not.toHaveBeenCalled();
|
||||
expect(deleteApiKey).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("checks delete permission only for delete actions", async () => {
|
||||
await callAction(createForm("edit"));
|
||||
await callAction(createForm("rotate"));
|
||||
await callAction(createForm("delete"));
|
||||
|
||||
expect(verifyUserHasPermission).toHaveBeenCalledWith(expect.any(Request), "app.settings.apiKeys.update", "tenant-1");
|
||||
expect(verifyUserHasPermission).toHaveBeenCalledWith(expect.any(Request), "app.settings.apiKeys.delete", "tenant-1");
|
||||
expect(vi.mocked(verifyUserHasPermission).mock.calls.filter((call) => call[1] === "app.settings.apiKeys.delete")).toHaveLength(1);
|
||||
});
|
||||
|
||||
it("checks delete permission before probing delete usage logs", async () => {
|
||||
vi.mocked(verifyUserHasPermission).mockImplementation(async (_request, permission) => {
|
||||
if (permission === "app.settings.apiKeys.delete") {
|
||||
throw new Response("Forbidden", { status: 403 });
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
await expect(callAction(createForm("delete"))).rejects.toMatchObject({ status: 403 });
|
||||
|
||||
expect(countApiKeyLogsForKey).not.toHaveBeenCalled();
|
||||
expect(deleteApiKey).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("scopes delete usage-log checks to the current tenant", async () => {
|
||||
const response = await callAction(createForm("delete"));
|
||||
|
||||
expect(response.status).toBe(302);
|
||||
expect(countApiKeyLogsForKey).toHaveBeenCalledWith("api-key-1", "tenant-1");
|
||||
expect(deleteApiKey).toHaveBeenCalledWith("api-key-1", "tenant-1");
|
||||
expect(createLog).toHaveBeenCalledWith(expect.any(Request), "tenant-1", "settings.apiKeys.deleted", "");
|
||||
});
|
||||
|
||||
it("preserves edited scope changes in logs and events", async () => {
|
||||
const response = await callAction(createForm("edit", { alias: "Primary integration updated" }));
|
||||
|
||||
expect(response.status).toBe(302);
|
||||
expect(updateApiKey).toHaveBeenCalledWith(
|
||||
"api-key-1",
|
||||
{
|
||||
tenantId: "tenant-1",
|
||||
alias: "Primary integration updated",
|
||||
expires: null,
|
||||
active: true,
|
||||
},
|
||||
[entityPermission]
|
||||
);
|
||||
expect(createLog).toHaveBeenCalledWith(
|
||||
expect.any(Request),
|
||||
"tenant-1",
|
||||
"settings.apiKeys.updated",
|
||||
expect.stringContaining('"entities":[{"entityId":"entity-1","create":true,"read":true,"update":false,"delete":false}]')
|
||||
);
|
||||
expect(createLog).toHaveBeenCalledTimes(1);
|
||||
expect(EventsService.create).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
event: "api_key.updated",
|
||||
data: expect.objectContaining({
|
||||
new: expect.objectContaining({ entities: [entityPermission] }),
|
||||
old: expect.objectContaining({ entities: [entityPermission] }),
|
||||
}),
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,198 @@
|
||||
import { ActionFunction, LoaderFunctionArgs, redirect, useActionData, useLoaderData } from "react-router";
|
||||
import { useNavigate, useParams } from "react-router";
|
||||
import ApiKeyCreatedModal from "~/components/core/apiKeys/ApiKeyCreatedModal";
|
||||
import ApiKeyForm from "~/components/core/apiKeys/ApiKeyForm";
|
||||
import OpenModal from "~/components/ui/modals/OpenModal";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import {
|
||||
RedactedApiKeyWithDetails,
|
||||
countApiKeyLogsForKey,
|
||||
deleteApiKey,
|
||||
getApiKeys,
|
||||
getTenantApiKeyById,
|
||||
rotateApiKey,
|
||||
updateApiKey,
|
||||
} from "~/utils/db/apiKeys.db.server";
|
||||
import { createLog } from "~/utils/db/logs.db.server";
|
||||
import { getUser } from "~/utils/db/users.db.server";
|
||||
import { getApiKeyEntityPermissions } from "~/utils/helpers/.server/ApiKeyHelperService";
|
||||
import EventsService from "~/modules/events/services/.server/EventsService";
|
||||
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { ApiKeyUpdatedDto } from "~/modules/events/dtos/ApiKeyUpdatedDto";
|
||||
import { getTenant } from "~/utils/db/tenants.db.server";
|
||||
import { ApiKeyDeletedDto } from "~/modules/events/dtos/ApiKeyDeletedDto";
|
||||
|
||||
type LoaderData = {
|
||||
item: RedactedApiKeyWithDetails;
|
||||
};
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.update", tenantId);
|
||||
const item = await getTenantApiKeyById(params.id ?? "", tenantId);
|
||||
if (!item) {
|
||||
return redirect(UrlUtils.currentTenantUrl(params, "settings/api/keys"));
|
||||
}
|
||||
const data: LoaderData = {
|
||||
item,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
error?: string;
|
||||
apiKey?: {
|
||||
key: string;
|
||||
alias: string;
|
||||
};
|
||||
};
|
||||
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
const userInfo = await getUserInfo(request);
|
||||
const currentUser = await getUser(userInfo.userId);
|
||||
const tenant = await getTenant(tenantId);
|
||||
if (!tenant || !currentUser) {
|
||||
return badRequest({ error: t("shared.notFound") });
|
||||
}
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.update", tenantId);
|
||||
await validateCSRFToken(request);
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString() ?? "";
|
||||
const existing = await getTenantApiKeyById(params.id ?? "", tenantId);
|
||||
if (!existing) {
|
||||
return badRequest({ error: t("shared.notFound") });
|
||||
}
|
||||
if (action === "edit") {
|
||||
const entities: { entityId: string; create: boolean; read: boolean; update: boolean; delete: boolean }[] = form
|
||||
.getAll("entities[]")
|
||||
.map((f: FormDataEntryValue) => {
|
||||
return JSON.parse(f.toString());
|
||||
});
|
||||
let expirationDate: Date | null = null;
|
||||
let expires = form.get("expires")?.toString();
|
||||
if (expires) {
|
||||
expirationDate = new Date(expires);
|
||||
}
|
||||
const alias = form.get("alias")?.toString() ?? "";
|
||||
const existingAlias = await getApiKeys(existing.tenantId);
|
||||
if (existingAlias.filter((f) => f.id !== existing.id && f.alias === alias).length > 0) {
|
||||
return badRequest({ error: t("models.apiKey.errors.aliasExists", { alias }) });
|
||||
}
|
||||
const active = Boolean(form.get("active"));
|
||||
await updateApiKey(
|
||||
params.id ?? "",
|
||||
{
|
||||
tenantId: tenantId,
|
||||
alias,
|
||||
expires: expirationDate,
|
||||
active,
|
||||
},
|
||||
entities
|
||||
);
|
||||
await createLog(request, tenantId, "settings.apiKeys.updated", JSON.stringify({ tenantId, alias, expirationDate, active, entities }));
|
||||
await EventsService.create({
|
||||
request,
|
||||
event: "api_key.updated",
|
||||
tenantId: tenant.id,
|
||||
userId: currentUser.id,
|
||||
data: {
|
||||
id: existing.id,
|
||||
new: {
|
||||
alias: alias,
|
||||
expires: expirationDate,
|
||||
active: active,
|
||||
entities: await getApiKeyEntityPermissions(entities),
|
||||
},
|
||||
old: {
|
||||
alias: existing.alias,
|
||||
expires: existing.expires,
|
||||
active: existing.active,
|
||||
entities: await getApiKeyEntityPermissions(existing.entities),
|
||||
},
|
||||
user: { id: currentUser?.id ?? "", email: currentUser?.email ?? "" },
|
||||
} satisfies ApiKeyUpdatedDto,
|
||||
});
|
||||
return redirect(UrlUtils.currentTenantUrl(params, "settings/api/keys"));
|
||||
} else if (action === "rotate") {
|
||||
const apiKey = await rotateApiKey(existing.id, tenantId);
|
||||
await createLog(request, tenantId, "settings.apiKeys.rotated", JSON.stringify({ tenantId, alias: existing.alias }));
|
||||
await EventsService.create({
|
||||
request,
|
||||
event: "api_key.updated",
|
||||
tenantId: tenant.id,
|
||||
userId: currentUser.id,
|
||||
data: {
|
||||
id: existing.id,
|
||||
new: {
|
||||
alias: existing.alias,
|
||||
expires: existing.expires,
|
||||
active: existing.active,
|
||||
entities: await getApiKeyEntityPermissions(existing.entities),
|
||||
},
|
||||
old: {
|
||||
alias: existing.alias,
|
||||
expires: existing.expires,
|
||||
active: existing.active,
|
||||
entities: await getApiKeyEntityPermissions(existing.entities),
|
||||
},
|
||||
user: { id: currentUser?.id ?? "", email: currentUser?.email ?? "" },
|
||||
} satisfies ApiKeyUpdatedDto,
|
||||
});
|
||||
return Response.json({ apiKey: { key: apiKey.key, alias: apiKey.alias } } satisfies ActionData);
|
||||
} else if (action === "delete") {
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.delete", tenantId);
|
||||
const logs = await countApiKeyLogsForKey(params.id ?? "", tenantId);
|
||||
if (logs > 0) {
|
||||
return badRequest({ error: t("models.apiKey.errors.cannotDeleteUsed") });
|
||||
}
|
||||
await deleteApiKey(params.id ?? "", tenantId);
|
||||
await createLog(request, tenantId, "settings.apiKeys.deleted", "");
|
||||
await EventsService.create({
|
||||
request,
|
||||
event: "api_key.deleted",
|
||||
tenantId: tenant.id,
|
||||
userId: currentUser.id,
|
||||
data: {
|
||||
id: existing.id,
|
||||
alias: existing.alias,
|
||||
expires: existing.expires,
|
||||
active: existing.active,
|
||||
entities: await getApiKeyEntityPermissions(existing.entities),
|
||||
user: { id: currentUser?.id ?? "", email: currentUser?.email ?? "" },
|
||||
} satisfies ApiKeyDeletedDto,
|
||||
});
|
||||
return redirect(UrlUtils.currentTenantUrl(params, "settings/api/keys"));
|
||||
} else {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
};
|
||||
|
||||
export default function ApiEditKeyRoute() {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const actionData = useActionData<ActionData>();
|
||||
const navigate = useNavigate();
|
||||
const appData = useAppData();
|
||||
const params = useParams();
|
||||
return (
|
||||
<>
|
||||
<OpenModal className="sm:max-w-xl" onClose={() => navigate(UrlUtils.currentTenantUrl(params, "settings/api/keys"))}>
|
||||
<ApiKeyForm
|
||||
entities={appData.entities}
|
||||
item={data.item}
|
||||
canUpdate={getUserHasPermission(appData, "app.settings.apiKeys.update")}
|
||||
canDelete={getUserHasPermission(appData, "app.settings.apiKeys.delete")}
|
||||
canRotate={getUserHasPermission(appData, "app.settings.apiKeys.update")}
|
||||
/>
|
||||
{actionData?.apiKey !== undefined && (
|
||||
<ApiKeyCreatedModal apiKey={actionData?.apiKey} redirectTo={UrlUtils.currentTenantUrl(params, "settings/api/keys")} action="rotated" />
|
||||
)}
|
||||
</OpenModal>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,169 @@
|
||||
// @vitest-environment node
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { ActionFunctionArgs } from "react-router";
|
||||
|
||||
vi.mock("~/locale/i18next.server", () => ({
|
||||
getTranslations: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/services/.server/urlService", () => ({
|
||||
getTenantIdFromUrl: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/helpers/.server/PermissionsService", () => ({
|
||||
verifyUserHasPermission: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/session.server", () => ({
|
||||
getUserInfo: vi.fn(),
|
||||
validateCSRFToken: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/tenants.db.server", () => ({
|
||||
getTenant: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/users.db.server", () => ({
|
||||
getUser: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/apiKeys.db.server", () => ({
|
||||
createApiKey: vi.fn(),
|
||||
getApiKeyByAlias: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/logs.db.server", () => ({
|
||||
createLog: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/helpers/.server/ApiKeyHelperService", () => ({
|
||||
getApiKeyEntityPermissions: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/modules/events/services/.server/EventsService", () => ({
|
||||
default: { create: vi.fn() },
|
||||
}));
|
||||
vi.mock("~/utils/app/UrlUtils", () => ({
|
||||
default: { currentTenantUrl: vi.fn((_params: Record<string, string | undefined>, path: string) => `/acme/${path}`) },
|
||||
}));
|
||||
vi.mock("~/components/core/apiKeys/ApiKeyCreatedModal", () => ({ default: () => null }));
|
||||
vi.mock("~/components/core/apiKeys/ApiKeyForm", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/modals/OpenModal", () => ({ default: ({ children }: { children: React.ReactNode }) => children }));
|
||||
vi.mock("~/utils/data/useAppData", () => ({ useAppData: () => ({ entities: [] }) }));
|
||||
|
||||
import EventsService from "~/modules/events/services/.server/EventsService";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { createApiKey, getApiKeyByAlias } from "~/utils/db/apiKeys.db.server";
|
||||
import { createLog } from "~/utils/db/logs.db.server";
|
||||
import { getTenant } from "~/utils/db/tenants.db.server";
|
||||
import { getUser } from "~/utils/db/users.db.server";
|
||||
import { getApiKeyEntityPermissions } from "~/utils/helpers/.server/ApiKeyHelperService";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
|
||||
import { action } from "./new";
|
||||
|
||||
const params = { tenant: "acme" };
|
||||
const tenant = { id: "tenant-1", name: "Acme", slug: "acme" };
|
||||
const user = { id: "user-1", email: "ada@example.test" };
|
||||
const apiKey = {
|
||||
id: "api-key-1",
|
||||
alias: "Primary integration",
|
||||
key: "tc_live_plaintext_secret_once",
|
||||
active: true,
|
||||
};
|
||||
const entityPermission = { entityId: "entity-1", create: true, read: true, update: false, delete: false };
|
||||
|
||||
function createRequest(form: FormData) {
|
||||
return new Request("https://app.example.test/acme/settings/api/keys/new", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/x-www-form-urlencoded" },
|
||||
body: new URLSearchParams(form as unknown as Record<string, string>),
|
||||
});
|
||||
}
|
||||
|
||||
function createForm(overrides: Record<string, string> = {}) {
|
||||
const form = new FormData();
|
||||
form.set("action", "create");
|
||||
form.set("alias", "Primary integration");
|
||||
form.set("active", "on");
|
||||
form.append("entities[]", JSON.stringify(entityPermission));
|
||||
Object.entries(overrides).forEach(([key, value]) => form.set(key, value));
|
||||
return form;
|
||||
}
|
||||
|
||||
async function callAction(form: FormData) {
|
||||
return action({
|
||||
request: createRequest(form),
|
||||
params,
|
||||
context: {},
|
||||
unstable_pattern: "app.$tenant/settings/api/keys/new",
|
||||
} as ActionFunctionArgs) as Promise<Response>;
|
||||
}
|
||||
|
||||
async function responseJson(response: Response) {
|
||||
return response.json() as Promise<Record<string, unknown>>;
|
||||
}
|
||||
|
||||
describe("tenant API key create route", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(getTranslations).mockResolvedValue({
|
||||
t: (key: string, values?: Record<string, unknown>) =>
|
||||
key === "models.apiKey.errors.aliasExists" ? `API key with this alias already exists: ${values?.alias}` : `translated:${key}`,
|
||||
} as never);
|
||||
vi.mocked(getTenantIdFromUrl).mockResolvedValue("tenant-1");
|
||||
vi.mocked(verifyUserHasPermission).mockResolvedValue(undefined as never);
|
||||
vi.mocked(getUserInfo).mockResolvedValue({ userId: "user-1" } as never);
|
||||
vi.mocked(validateCSRFToken).mockResolvedValue(undefined as never);
|
||||
vi.mocked(getTenant).mockResolvedValue(tenant as never);
|
||||
vi.mocked(getUser).mockResolvedValue(user as never);
|
||||
vi.mocked(getApiKeyByAlias).mockResolvedValue(null as never);
|
||||
vi.mocked(createApiKey).mockResolvedValue(apiKey as never);
|
||||
vi.mocked(getApiKeyEntityPermissions).mockResolvedValue([entityPermission] as never);
|
||||
vi.mocked(EventsService.create).mockResolvedValue(undefined as never);
|
||||
vi.mocked(createLog).mockResolvedValue({} as never);
|
||||
});
|
||||
|
||||
it("checks create permission before creating a key", async () => {
|
||||
const response = await callAction(createForm());
|
||||
|
||||
expect(response.status).toBe(200);
|
||||
expect(verifyUserHasPermission).toHaveBeenCalledWith(expect.any(Request), "app.settings.apiKeys.create", "tenant-1");
|
||||
expect(vi.mocked(verifyUserHasPermission).mock.invocationCallOrder[0]).toBeLessThan(vi.mocked(createApiKey).mock.invocationCallOrder[0]);
|
||||
});
|
||||
|
||||
it("returns one-time plaintext only in successful create action JSON", async () => {
|
||||
const response = await callAction(createForm());
|
||||
const data = await responseJson(response);
|
||||
|
||||
expect(response.status).toBe(200);
|
||||
expect(data).toEqual({ apiKey: { key: apiKey.key, alias: apiKey.alias } });
|
||||
expect(createApiKey).toHaveBeenCalledTimes(1);
|
||||
expect(EventsService.create).toHaveBeenCalledTimes(1);
|
||||
expect(createLog).toHaveBeenCalledWith(
|
||||
expect.any(Request),
|
||||
"tenant-1",
|
||||
"settings.apiKeys.created",
|
||||
expect.stringContaining('"alias":"Primary integration"')
|
||||
);
|
||||
expect(createLog).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("rejects duplicate aliases without creating or leaking generated key material", async () => {
|
||||
vi.mocked(getApiKeyByAlias).mockResolvedValueOnce({ id: "existing-key", alias: "Primary integration" } as never);
|
||||
|
||||
const response = await callAction(createForm());
|
||||
const data = await responseJson(response);
|
||||
|
||||
expect(response.status).toBe(400);
|
||||
expect(data).toEqual({ error: "API key with this alias already exists: Primary integration" });
|
||||
expect(JSON.stringify(data)).not.toContain(apiKey.key);
|
||||
expect(createApiKey).not.toHaveBeenCalled();
|
||||
expect(EventsService.create).not.toHaveBeenCalled();
|
||||
expect(createLog).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("rejects invalid actions without creating or leaking generated key material", async () => {
|
||||
const response = await callAction(createForm({ action: "rotate" }));
|
||||
const data = await responseJson(response);
|
||||
|
||||
expect(response.status).toBe(400);
|
||||
expect(data).toEqual({ error: "translated:shared.invalidForm" });
|
||||
expect(JSON.stringify(data)).not.toContain(apiKey.key);
|
||||
expect(createApiKey).not.toHaveBeenCalled();
|
||||
expect(EventsService.create).not.toHaveBeenCalled();
|
||||
expect(createLog).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,113 @@
|
||||
import { ActionFunction, LoaderFunctionArgs } from "react-router";
|
||||
import { useActionData, useNavigate, useParams } from "react-router";
|
||||
import ApiKeyCreatedModal from "~/components/core/apiKeys/ApiKeyCreatedModal";
|
||||
import ApiKeyForm from "~/components/core/apiKeys/ApiKeyForm";
|
||||
import OpenModal from "~/components/ui/modals/OpenModal";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import { createApiKey, getApiKeyByAlias } from "~/utils/db/apiKeys.db.server";
|
||||
import { createLog } from "~/utils/db/logs.db.server";
|
||||
import { getUser } from "~/utils/db/users.db.server";
|
||||
import { getApiKeyEntityPermissions } from "~/utils/helpers/.server/ApiKeyHelperService";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import EventsService from "~/modules/events/services/.server/EventsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
|
||||
import { ApiKeyCreatedDto } from "~/modules/events/dtos/ApiKeyCreatedDto";
|
||||
import { getTenant } from "~/utils/db/tenants.db.server";
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.create", tenantId);
|
||||
return Response.json({});
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
error?: string;
|
||||
apiKey?: {
|
||||
key: string;
|
||||
alias: string;
|
||||
};
|
||||
};
|
||||
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.create", tenantId);
|
||||
await validateCSRFToken(request);
|
||||
const userInfo = await getUserInfo(request);
|
||||
const tenant = await getTenant(tenantId);
|
||||
const currentUser = await getUser(userInfo.userId);
|
||||
|
||||
if (!tenant || !currentUser) {
|
||||
return badRequest({ error: t("shared.notFound") });
|
||||
}
|
||||
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString() ?? "";
|
||||
if (action === "create") {
|
||||
const entities: { entityId: string; create: boolean; read: boolean; update: boolean; delete: boolean }[] = form
|
||||
.getAll("entities[]")
|
||||
.map((f: FormDataEntryValue) => {
|
||||
return JSON.parse(f.toString());
|
||||
});
|
||||
|
||||
let expirationDate: Date | null = null;
|
||||
let expires = form.get("expires")?.toString();
|
||||
if (expires) {
|
||||
expirationDate = new Date(expires);
|
||||
}
|
||||
const alias = form.get("alias")?.toString() ?? "";
|
||||
const existingAlias = await getApiKeyByAlias(tenantId, alias);
|
||||
if (existingAlias) {
|
||||
return badRequest({ error: t("models.apiKey.errors.aliasExists", { alias }) });
|
||||
}
|
||||
const active = Boolean(form.get("active"));
|
||||
const apiKey = await createApiKey(
|
||||
{
|
||||
tenantId: tenantId,
|
||||
createdByUserId: userInfo.userId,
|
||||
alias,
|
||||
expires: expirationDate,
|
||||
active,
|
||||
},
|
||||
entities
|
||||
);
|
||||
await EventsService.create({
|
||||
request,
|
||||
event: "api_key.created",
|
||||
tenantId: tenantId,
|
||||
userId: currentUser.id,
|
||||
data: {
|
||||
id: apiKey.id,
|
||||
alias: apiKey.alias,
|
||||
expires: expirationDate,
|
||||
active: active,
|
||||
entities: await getApiKeyEntityPermissions(entities),
|
||||
user: { id: currentUser?.id ?? "", email: currentUser?.email ?? "" },
|
||||
} satisfies ApiKeyCreatedDto,
|
||||
});
|
||||
await createLog(request, tenantId, "settings.apiKeys.created", JSON.stringify({ id: apiKey.id, alias, expirationDate, active, entities }));
|
||||
return Response.json({ apiKey: { key: apiKey.key, alias: apiKey.alias } } satisfies ActionData);
|
||||
} else {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
};
|
||||
|
||||
export default function ApiNewKeyRoute() {
|
||||
const navigate = useNavigate();
|
||||
const actionData = useActionData<ActionData>();
|
||||
const params = useParams();
|
||||
const appData = useAppData();
|
||||
return (
|
||||
<>
|
||||
<OpenModal className="sm:max-w-xl" onClose={() => navigate(UrlUtils.currentTenantUrl(params, "settings/api/keys"))}>
|
||||
<ApiKeyForm entities={appData.entities} />
|
||||
{actionData?.apiKey !== undefined && (
|
||||
<ApiKeyCreatedModal apiKey={actionData?.apiKey} redirectTo={UrlUtils.currentTenantUrl(params, "settings/api/keys")} />
|
||||
)}
|
||||
</OpenModal>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import { LoaderFunctionArgs, useLoaderData } from "react-router";
|
||||
import { useParams } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { FilterablePropertyDto } from "~/application/dtos/data/FilterablePropertyDto";
|
||||
import { PaginationDto } from "~/application/dtos/data/PaginationDto";
|
||||
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
|
||||
import ApiKeyLogsDetails from "~/modules/api/components/ApiKeyLogsDetails";
|
||||
import { ApiKeyLogDto } from "~/modules/api/dtos/ApiKeyLogDto";
|
||||
import ApiKeyLogService from "~/modules/api/services/ApiKeyLogService";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
|
||||
type LoaderData = {
|
||||
items: ApiKeyLogDto[];
|
||||
filterableProperties: FilterablePropertyDto[];
|
||||
pagination: PaginationDto;
|
||||
};
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.apiKeys.view", tenantId);
|
||||
const { items, filterableProperties, pagination } = await ApiKeyLogService.getDetails({ request, params });
|
||||
const data: LoaderData = {
|
||||
items,
|
||||
filterableProperties,
|
||||
pagination,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export default function AdminApiLogsRoute() {
|
||||
const { t } = useTranslation();
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const params = useParams();
|
||||
return (
|
||||
<EditPageLayout
|
||||
tabs={[
|
||||
{
|
||||
name: t("shared.overview"),
|
||||
routePath: UrlUtils.getModulePath(params, "api"),
|
||||
},
|
||||
{
|
||||
name: t("models.apiCall.plural"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/logs"),
|
||||
},
|
||||
{
|
||||
name: t("models.apiKey.plural"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/keys"),
|
||||
},
|
||||
{
|
||||
name: t("docs.title"),
|
||||
routePath: UrlUtils.getModulePath(params, "api/docs"),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<ApiKeyLogsDetails data={data} />
|
||||
</EditPageLayout>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user