Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

fix(settings): API key edit and delete drawers load their own key, so keys past the first page open

aashud810371113d6
diff --git a/apps/erp/app/modules/settings/settings.service.ts b/apps/erp/app/modules/settings/settings.service.ts
index 2d004ba732..7cb693103f 100644
--- a/apps/erp/app/modules/settings/settings.service.ts
+++ b/apps/erp/app/modules/settings/settings.service.ts
@@ -101,6 +101,22 @@ export async function deleteSubsidiary(
return client.from("company").delete().eq("id", companyId);
}
+// The key hash never leaves the server.
+export async function getApiKey(
+ client: SupabaseClient<Database>,
+ id: string,
+ companyId: string
+) {
+ return client
+ .from("apiKey")
+ .select(
+ "id, name, expiresAt, scopes, keyPreview, lastUsedAt, rateLimit, rateLimitWindow, createdAt, createdBy, updatedBy, companyId"
+ )
+ .eq("id", id)
+ .eq("companyId", companyId)
+ .single();
+}
+
export const API_KEYS_PAGING: Paging = {
defaultSorts: [{ column: "createdAt", ascending: true }]
};
diff --git a/apps/erp/app/routes/api+/mcp+/lib/tool-manifest.digest.json b/apps/erp/app/routes/api+/mcp+/lib/tool-manifest.digest.json
index cf3638380d..3c4d07fc35 100644
--- a/apps/erp/app/routes/api+/mcp+/lib/tool-manifest.digest.json
+++ b/apps/erp/app/routes/api+/mcp+/lib/tool-manifest.digest.json
@@ -936,7 +936,7 @@
{"name":"purchasing_getSupplierQuotes","classification":"READ","paramCount":3,"schema":"c61cae75d189","response":"9e311e59b82e","injectAuth":"companyId","permission":"purchasing:view","paginates":true,"defaults":"always"},
{"name":"purchasing_getSupplierQuotesForComparison","classification":"READ","paramCount":1,"schema":"4e16cef99961","response":"540207b2c74e","injectAuth":"companyId","permission":"purchasing:view","paginates":false},
{"name":"purchasing_getSupplierQuotesList","classification":"READ","paramCount":0,"schema":"efddc7bd8bbc","response":"967dcad15168","injectAuth":"companyId","permission":"purchasing:view","paginates":false},
- {"name":"purchasing_getSupplierReportContacts","classification":"READ","paramCount":1,"schema":"f6d6276b4996","response":"5adbc4c5e67c","injectAuth":"companyId","permission":"purchasing:view","paginates":false,"result":"envelopes"},
+ {"name":"purchasing_getSupplierReportContacts","classification":"READ","paramCount":1,"schema":"f6d6276b4996","response":"a07965e69b81","injectAuth":"companyId","permission":"purchasing:view","paginates":false,"result":"envelopes"},
{"name":"purchasing_getSuppliers","classification":"READ","paramCount":5,"schema":"fe4524096cbe","response":"947b627d845e","injectAuth":"companyId","permission":"purchasing:view","paginates":true,"defaults":"always"},
{"name":"purchasing_getSupplierShipping","classification":"READ","paramCount":1,"schema":"67043a31b1b5","response":"17117a952d24","injectAuth":"companyId","permission":"purchasing:view","paginates":false},
{"name":"purchasing_getSuppliersList","classification":"READ","paramCount":0,"schema":"efddc7bd8bbc","response":"ce08332e0ce6","injectAuth":"companyId","permission":"purchasing:view","paginates":false},
diff --git a/apps/erp/app/routes/x+/settings+/api-keys.$id.tsx b/apps/erp/app/routes/x+/settings+/api-keys.$id.tsx
index c7711a54ab..c60bbd4cae 100644
--- a/apps/erp/app/routes/x+/settings+/api-keys.$id.tsx
+++ b/apps/erp/app/routes/x+/settings+/api-keys.$id.tsx
@@ -10,14 +10,32 @@ import { requireFeature } from "@carbon/ee/plan.server";
import { validationError, validator } from "@carbon/form";
import { useCloseRoute } from "@carbon/react";
import { redirect } from "@carbon/utils";
-import type { ActionFunctionArgs } from "react-router";
-import { data, useParams } from "react-router";
-import { useRouteData } from "~/hooks";
-import type { ApiKey } from "~/modules/settings";
-import { ApiKeyForm, apiKeyValidator } from "~/modules/settings";
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
+import { data, useLoaderData } from "react-router";
+import { ApiKeyForm, apiKeyValidator, getApiKey } from "~/modules/settings";
import { invalidateApiKeyCache } from "~/modules/settings/settings.server";
import { getParams, path } from "~/utils/path";
+// The list holds only the rows scrolled so far, so the drawer reads its own key.
+export async function loader({ request, params }: LoaderFunctionArgs) {
+ const { client, companyId } = await requirePermissions(request, {
+ update: "users"
+ });
+
+ const { id } = params;
+ if (!id) throw new Error("Could not find id");
+
+ const apiKey = await getApiKey(client, id, companyId);
+ if (apiKey.error) {
+ throw redirect(
+ `${path.to.apiKeys}?${getParams(request)}`,
+ await flash(request, error(apiKey.error, "Failed to load API key"))
+ );
+ }
+
+ return { apiKey: apiKey.data, companyId };
+}
+
export async function action({ request, params }: ActionFunctionArgs) {
assertIsPost(request);
const { client, companyId } = await requirePermissions(request, {
@@ -75,26 +93,20 @@ export async function action({ request, params }: ActionFunctionArgs) {
export default function EditApiKeyRoute() {
const closeRoute = useCloseRoute();
- const params = useParams();
- const routeData = useRouteData<{ apiKeys: ApiKey[]; companyId: string }>(
- path.to.apiKeys
- );
-
- const apiKey = routeData?.apiKeys.find((apiKey) => apiKey.id === params.id);
- if (!apiKey) throw new Error("API key not found");
+ const { apiKey, companyId } = useLoaderData<typeof loader>();
const initialValues = {
- id: apiKey?.id ?? undefined,
- name: apiKey?.name ?? "",
- expiresAt: (apiKey as any)?.expiresAt ?? undefined
+ id: apiKey.id,
+ name: apiKey.name,
+ expiresAt: apiKey.expiresAt ?? undefined
};
return (
<ApiKeyForm
key={initialValues.id}
initialValues={initialValues}
- companyId={routeData?.companyId}
- existingScopes={(apiKey as any)?.scopes ?? null}
+ companyId={companyId}
+ existingScopes={apiKey.scopes as Record<string, string[]> | null}
onClose={() => closeRoute()}
/>
);
diff --git a/apps/erp/app/routes/x+/settings+/api-keys.delete.$id.tsx b/apps/erp/app/routes/x+/settings+/api-keys.delete.$id.tsx
index e776198f8f..f576deed80 100644
--- a/apps/erp/app/routes/x+/settings+/api-keys.delete.$id.tsx
+++ b/apps/erp/app/routes/x+/settings+/api-keys.delete.$id.tsx
@@ -10,14 +10,33 @@ import { requireFeature } from "@carbon/ee/plan.server";
import { useCloseRoute } from "@carbon/react";
import { redirect } from "@carbon/utils";
import { useLingui } from "@lingui/react/macro";
-import type { ActionFunctionArgs } from "react-router";
-import { useParams } from "react-router";
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
+import { useLoaderData, useParams } from "react-router";
import { ConfirmDelete } from "~/components/Modals";
-import { useRouteData } from "~/hooks";
-import type { ApiKey } from "~/modules/settings";
+import { getApiKey } from "~/modules/settings";
import { invalidateApiKeyCache } from "~/modules/settings/settings.server";
import { getParams, path } from "~/utils/path";
+// The list holds only the rows scrolled so far, so the modal reads its own key.
+export async function loader({ request, params }: LoaderFunctionArgs) {
+ const { client, companyId } = await requirePermissions(request, {
+ update: "users"
+ });
+
+ const { id } = params;
+ if (!id) throw new Error("Could not find id");
+
+ const apiKey = await getApiKey(client, id, companyId);
+ if (apiKey.error) {
+ throw redirect(
+ `${path.to.apiKeys}?${getParams(request)}`,
+ await flash(request, error(apiKey.error, "Failed to load API key"))
+ );
+ }
+
+ return { apiKey: { name: apiKey.data.name } };
+}
+
export async function action({ request, params }: ActionFunctionArgs) {
const { client, companyId } = await requirePermissions(request, {
update: "users"
@@ -63,13 +82,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
export default function DeleteApiKeyRoute() {
const { id } = useParams();
if (!id) throw new Error("Could not find id");
- const routeData = useRouteData<{ apiKeys: ApiKey[] }>(path.to.apiKeys);
+ const { apiKey } = useLoaderData<typeof loader>();
const closeRoute = useCloseRoute();
const { t } = useLingui();
- const apiKey = routeData?.apiKeys.find((apiKey) => apiKey.id === id);
- if (!apiKey) return null;
-
const onCancel = () => closeRoute();
return (