Skip to content

chore: await params in v1 endpoints #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

chore: await params in v1 endpoints #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions apps/webservice/src/app/api/v1/cloud-locations/[provider]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ import { NextResponse } from "next/server";

import { cloudRegionsGeo } from "@ctrlplane/validators/resources";

export function GET(_: Request, { params }: { params: { provider: string } }) {
const { provider } = params;
export async function GET(
_: Request,
{ params }: { params: Promise<{ provider: string }> },
) {
const { provider } = await params;

// Check if provider exists
if (cloudRegionsGeo[provider] == null)
Expand Down
13 changes: 7 additions & 6 deletions apps/webservice/src/app/api/v1/deployment-versions/[deploymentVersionId]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,18 @@ export const PATCH = request()
.use(authn)
.use(parseBody(patchSchema))
.use(
authz(({ can, extra: { params } }) =>
can
.perform(Permission.DeploymentVersionUpdate)
.on({ type: "deploymentVersion", id: params.deploymentVersionId }),
authz(({ can, params }) =>
can.perform(Permission.DeploymentVersionUpdate).on({
type: "deploymentVersion",
id: params.deploymentVersionId ?? "",
}),
),
)
.handle<
{ body: z.infer<typeof patchSchema>; user: SCHEMA.User },
{ params: { deploymentVersionId: string } }
{ params: Promise<{ deploymentVersionId: string }> }
>(async (ctx, { params }) => {
const { deploymentVersionId } = params;
const { deploymentVersionId } = await params;
const { body, user, req } = ctx;

try {
Expand Down
14 changes: 6 additions & 8 deletions ...rc/app/api/v1/deployments/[deploymentId]/deployment-version-channels/name/[name]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,22 @@ import { request } from "~/app/api/v1/middleware";
export const DELETE = request()
.use(authn)
.use(
authz(async ({ can, extra: { params } }) =>
authz(({ can, params }) =>
can
.perform(Permission.DeploymentVersionChannelDelete)
.on({ type: "deployment", id: params.deploymentId }),
.on({ type: "deployment", id: params.deploymentId ?? "" }),
),
)
.handle<unknown, { params: { deploymentId: string; name: string } }>(
.handle<unknown, { params: Promise<{ deploymentId: string; name: string }> }>(
async (ctx, { params }) => {
const { deploymentId, name } = await params;
try {
await ctx.db
.delete(schema.deploymentVersionChannel)
.where(
and(
eq(
schema.deploymentVersionChannel.deploymentId,
params.deploymentId,
),
eq(schema.deploymentVersionChannel.name, params.name),
eq(schema.deploymentVersionChannel.deploymentId, deploymentId),
eq(schema.deploymentVersionChannel.name, name),
),
);

Expand Down
14 changes: 6 additions & 8 deletions ...ebservice/src/app/api/v1/deployments/[deploymentId]/release-channels/name/[name]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,22 @@ import { request } from "~/app/api/v1/middleware";
export const DELETE = request()
.use(authn)
.use(
authz(async ({ can, extra: { params } }) =>
authz(({ can, params }) =>
can
.perform(Permission.DeploymentVersionChannelDelete)
.on({ type: "deployment", id: params.deploymentId }),
.on({ type: "deployment", id: params.deploymentId ?? "" }),
),
)
.handle<unknown, { params: { deploymentId: string; name: string } }>(
.handle<unknown, { params: Promise<{ deploymentId: string; name: string }> }>(
async (ctx, { params }) => {
const { deploymentId, name } = await params;
try {
await ctx.db
.delete(schema.deploymentVersionChannel)
.where(
and(
eq(
schema.deploymentVersionChannel.deploymentId,
params.deploymentId,
),
eq(schema.deploymentVersionChannel.name, params.name),
eq(schema.deploymentVersionChannel.deploymentId, deploymentId),
eq(schema.deploymentVersionChannel.name, name),
),
);

Expand Down
24 changes: 13 additions & 11 deletions apps/webservice/src/app/api/v1/deployments/[deploymentId]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@ import { request } from "../../middleware";
export const GET = request()
.use(authn)
.use(
authz(({ can, extra: { params } }) =>
authz(({ can, params }) =>
can
.perform(Permission.DeploymentGet)
.on({ type: "deployment", id: params.deploymentId }),
.on({ type: "deployment", id: params.deploymentId ?? "" }),
),
)
.handle<{ db: Tx }, { params: { deploymentId: string } }>(
.handle<{ db: Tx }, { params: Promise<{ deploymentId: string }> }>(
async ({ db }, { params }) => {
const { deploymentId } = await params;
const deployment = await db
.select()
.from(SCHEMA.deployment)
.where(eq(SCHEMA.deployment.id, params.deploymentId))
.where(eq(SCHEMA.deployment.id, deploymentId))
.then(takeFirstOrNull);

if (deployment == null)
Expand All @@ -40,19 +41,20 @@ export const GET = request()
export const DELETE = request()
.use(authn)
.use(
authz(({ can, extra: { params } }) =>
authz(({ can, params }) =>
can
.perform(Permission.DeploymentDelete)
.on({ type: "deployment", id: params.deploymentId }),
.on({ type: "deployment", id: params.deploymentId ?? "" }),
),
)
.handle<{ db: Tx }, { params: { deploymentId: string } }>(
.handle<{ db: Tx }, { params: Promise<{ deploymentId: string }> }>(
async ({ db }, { params }) => {
try {
const { deploymentId } = await params;
const deployment = await db
.select()
.from(SCHEMA.deployment)
.where(eq(SCHEMA.deployment.id, params.deploymentId))
.where(eq(SCHEMA.deployment.id, deploymentId))
.then(takeFirstOrNull);

if (deployment == null)
Expand All @@ -63,7 +65,7 @@ export const DELETE = request()

await db
.delete(SCHEMA.deployment)
.where(eq(SCHEMA.deployment.id, params.deploymentId));
.where(eq(SCHEMA.deployment.id, deploymentId));

return NextResponse.json({ deployment, message: "Deployment deleted" });
} catch (error) {
Expand All @@ -79,10 +81,10 @@ export const DELETE = request()
export const PATCH = request()
.use(authn)
.use(
authz(async ({ can, extra: { params } }) => {
authz(({ can, params }) => {
return can
.perform(Permission.DeploymentUpdate)
.on({ type: "deployment", id: (await params).deploymentId });
.on({ type: "deployment", id: params.deploymentId ?? "" });
}),
)
.handle<{ db: Tx }, { params: Promise<{ deploymentId: string }> }>(
Expand Down
20 changes: 11 additions & 9 deletions apps/webservice/src/app/api/v1/environments/[environmentId]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ import { request } from "../../middleware";
export const GET = request()
.use(authn)
.use(
authz(({ can, extra: { params } }) =>
authz(({ can, params }) =>
can
.perform(Permission.SystemGet)
.on({ type: "environment", id: params.environmentId }),
.on({ type: "environment", id: params.environmentId ?? "" }),
),
)
.handle<unknown, { params: { environmentId: string } }>(
.handle<unknown, { params: Promise<{ environmentId: string }> }>(
async (ctx, { params }) => {
const { environmentId } = await params;
const environment = await ctx.db.query.environment.findFirst({
where: eq(schema.environment.id, params.environmentId),
where: eq(schema.environment.id, environmentId),
with: { policy: true, metadata: true },
});
if (environment == null)
Expand All @@ -38,16 +39,17 @@ export const GET = request()
export const DELETE = request()
.use(authn)
.use(
authz(({ can, extra: { params } }) =>
authz(({ can, params }) =>
can
.perform(Permission.SystemDelete)
.on({ type: "environment", id: params.environmentId }),
.on({ type: "environment", id: params.environmentId ?? "" }),
),
)
.handle<unknown, { params: { environmentId: string } }>(
.handle<unknown, { params: Promise<{ environmentId: string }> }>(
async (ctx, { params }) => {
const { environmentId } = await params;
const findEnv = await ctx.db.query.environment.findFirst({
where: eq(schema.environment.id, params.environmentId),
where: eq(schema.environment.id, environmentId),
});
if (findEnv == null)
return NextResponse.json(
Expand All @@ -57,7 +59,7 @@ export const DELETE = request()

const environment = await ctx.db
.delete(schema.environment)
.where(eq(schema.environment.id, params.environmentId))
.where(eq(schema.environment.id, environmentId))
.returning();

return NextResponse.json(environment, { status: 200 });
Expand Down
Loading