Skip to content

Commit d8c0282

Browse files
committed
fix(webapp): keep API key limit out of server-only module
1 parent 336d824 commit d8c0282

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

apps/webapp/app/consts.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export const RUN_CHUNK_EXECUTION_BUFFER = 350;
1010
export const MAX_RUN_CHUNK_EXECUTION_LIMIT = 120000; // 2 minutes
1111
export const VERCEL_RESPONSE_TIMEOUT_STATUS_CODES = [408, 504];
1212
export const MAX_BATCH_TRIGGER_ITEMS = 100;
13+
export const MAX_API_KEY_TASK_IDENTIFIERS = 10;
1314
export const MAX_TASK_RUN_ATTEMPTS = 250;
1415
export const BULK_ACTION_RUN_LIMIT = 250;
1516
export const MAX_JOB_RUN_EXECUTION_COUNT = 250;

apps/webapp/app/models/api-key.server.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import type { PrismaClient, RuntimeEnvironment } from "@trigger.dev/database";
66
import type { HostRbacController } from "@trigger.dev/rbac";
77
import { trail } from "agentcrumbs"; // @crumbs
88
import { customAlphabet } from "nanoid";
9+
import { MAX_API_KEY_TASK_IDENTIFIERS } from "~/consts";
910
import { prisma } from "~/db.server";
1011
import { RuntimeEnvironmentType } from "~/database-types";
1112
import { rbac } from "~/services/rbac.server";
@@ -14,8 +15,6 @@ import { controlPlaneResolver } from "~/v3/runOpsMigration/controlPlaneResolver.
1415

1516
const crumb = trail("webapp"); // @crumbs
1617

17-
export const MAX_API_KEY_TASK_IDENTIFIERS = 10;
18-
1918
const apiKeyId = customAlphabet(
2019
"1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
2120
12

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,8 @@ import {
6363
TableHeaderCell,
6464
TableRow,
6565
} from "~/components/primitives/Table";
66-
import {
67-
createEnvironmentApiKey,
68-
MAX_API_KEY_TASK_IDENTIFIERS,
69-
revokeEnvironmentApiKey,
70-
} from "~/models/api-key.server";
66+
import { MAX_API_KEY_TASK_IDENTIFIERS } from "~/consts";
67+
import { createEnvironmentApiKey, revokeEnvironmentApiKey } from "~/models/api-key.server";
7168
import {
7269
redirectWithErrorMessage,
7370
redirectWithSuccessMessage,

apps/webapp/test/createEnvironmentApiKey.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { containerTest } from "@internal/testcontainers";
22
import type { PrismaClient } from "@trigger.dev/database";
33
import rbacPlugin, { type RoleBaseAccessController } from "@trigger.dev/rbac";
44
import { expect, vi } from "vitest";
5-
import { createEnvironmentApiKey, MAX_API_KEY_TASK_IDENTIFIERS } from "~/models/api-key.server";
5+
import { MAX_API_KEY_TASK_IDENTIFIERS } from "~/consts";
6+
import { createEnvironmentApiKey } from "~/models/api-key.server";
67
import {
78
createRuntimeEnvironment,
89
createTestOrgProjectWithMember,

0 commit comments

Comments
 (0)