Skip to content

Commit d12e6a8

Browse files
committed
style(webapp): merge duplicate imports on the user-actor auth path
1 parent f58a9dc commit d12e6a8

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboard-agent.in.$.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
MESSAGE_TOO_LARGE_CODE,
88
MESSAGE_TOO_LARGE_ERROR,
99
} from "~/components/dashboard-agent/message-limits";
10-
import { $replica } from "~/db.server";
1110
import { findProjectBySlug } from "~/models/project.server";
1211
import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
1312
import {

apps/webapp/app/services/routeBuilders/apiBuilder.server.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import type { z } from "zod";
2-
import type { ApiAuthenticationResultSuccess } from "../apiAuth.server";
2+
import type {
3+
ApiAuthenticationResultSuccess,
4+
UserActorAuthenticatedActor,
5+
} from "../apiAuth.server";
36
import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/server-runtime";
47
import { json } from "@remix-run/server-runtime";
58
import { fromZodError } from "zod-validation-error";
69
import { apiCors } from "~/utils/apiCors";
710
import { logger } from "../logger.server";
811
import { rbac } from "../rbac.server";
912
import { authenticateBearerWithTelemetry } from "~/services/authTelemetry.server";
10-
import type { RbacAbility, RbacResource } from "@trigger.dev/rbac";
11-
import type { UserActorClaims } from "@trigger.dev/rbac";
13+
import type { RbacAbility, RbacResource, UserActorClaims } from "@trigger.dev/rbac";
1214
import { isUserActorToken, verifyUserActorToken } from "@trigger.dev/rbac";
1315
import { updateLastAccessedAtIfStale } from "../personalAccessToken.server";
14-
import type { UserActorAuthenticatedActor } from "../apiAuth.server";
1516
import { assertUserActorScope } from "../userActorEnvironment.server";
1617
import { env } from "~/env.server";
1718
import { safeJsonParse } from "~/utils/json";

apps/webapp/test/rbacFallbackBranch.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { postgresTest } from "@internal/testcontainers";
2-
import plugin from "@trigger.dev/rbac";
3-
import { signUserActorToken } from "@trigger.dev/rbac";
2+
import plugin, { signUserActorToken } from "@trigger.dev/rbac";
43
import { createHash } from "node:crypto";
54
import { generateJWT } from "@trigger.dev/core/v3/jwt";
65
import { type PrismaClient } from "@trigger.dev/database";

0 commit comments

Comments
 (0)