chore: migrate /api/avatar/[uuid] to App Router (#19514)

* chore: migrate /api/avatar/[uuid]

* fix type

* move location of apiRouteMiddleware and fix the args

* refactor
This commit is contained in:
Benny Joo
2025-02-25 11:19:29 +00:00
committed by GitHub
parent 6ea879f265
commit d1a9af84b2
5 changed files with 35 additions and 28 deletions
@@ -1,15 +1,16 @@
import { captureException } from "@sentry/nextjs";
import type { Params } from "app/_types";
import { ApiError } from "next/dist/server/api-utils";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { getServerErrorFromUnknown } from "./getServerErrorFromUnknown";
import { getServerErrorFromUnknown } from "@calcom/lib/server";
export const apiRouteMiddleware =
(handler: (req: NextRequest, res?: NextResponse) => Promise<NextResponse>) =>
async (req: NextRequest, res: NextResponse) => {
(handler: (req: NextRequest, { params }: { params: Params }) => Promise<NextResponse>) =>
async (req: NextRequest, { params }: { params: Params }) => {
try {
return await handler(req, res);
return await handler(req, { params });
} catch (error) {
if (error instanceof ApiError) {
return NextResponse.json({ message: error.message }, { status: error.statusCode });
@@ -1,4 +1,7 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { Params } from "app/_types";
import { apiRouteMiddleware } from "app/api/apiRouteMiddleware";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { z } from "zod";
import { AVATAR_FALLBACK } from "@calcom/lib/constants";
@@ -8,22 +11,25 @@ const querySchema = z.object({
uuid: z.string().transform((objectKey) => objectKey.split(".")[0]),
});
const handleValidationError = (res: NextApiResponse, error: z.ZodError): void => {
const handleValidationError = (error: z.ZodError): NextResponse => {
const errors = error.errors.map((err) => ({
path: err.path.join("."),
errorCode: `error.validation.${err.code}`,
}));
res.status(400).json({
message: "VALIDATION_ERROR",
errors,
});
return NextResponse.json(
{
message: "VALIDATION_ERROR",
errors,
},
{ status: 400 }
);
};
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
const result = querySchema.safeParse(req.query);
async function handler(req: NextRequest, { params }: { params: Params }) {
const result = querySchema.safeParse(params);
if (!result.success) {
return handleValidationError(res, result.error);
return handleValidationError(result.error);
}
const { uuid: objectKey } = result.data;
@@ -41,22 +47,22 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
img = data;
} catch (e) {
// If anything goes wrong or avatar is not found, use default avatar
res.writeHead(302, {
Location: AVATAR_FALLBACK,
});
res.end();
return;
return NextResponse.redirect(AVATAR_FALLBACK, 302);
}
const decoded = img.toString().replace("data:image/png;base64,", "").replace("data:image/jpeg;base64,", "");
const imageResp = Buffer.from(decoded, "base64");
res.writeHead(200, {
"Content-Type": "image/png",
"Content-Length": imageResp.length,
"Cache-Control": "max-age=86400",
return new NextResponse(imageResp, {
headers: {
"Content-Type": "image/png",
"Content-Length": imageResp.length.toString(),
"Cache-Control": "max-age=86400",
},
status: 200,
});
res.end(imageResp);
}
const getHandler = apiRouteMiddleware(handler);
export { getHandler as GET };
+1 -1
View File
@@ -1,10 +1,10 @@
import { apiRouteMiddleware } from "app/api/apiRouteMiddleware";
import { cookies, headers } from "next/headers";
import { NextResponse } from "next/server";
import type { NextRequest } from "next/server";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
import { apiRouteMiddleware } from "@calcom/lib/server/apiRouteMiddleware";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
+1 -1
View File
@@ -1,11 +1,11 @@
import { cardExamples } from "@pages/api/plain/example-cards";
import { apiRouteMiddleware } from "app/api/apiRouteMiddleware";
import { createHmac } from "crypto";
import { headers } from "next/headers";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { z } from "zod";
import { apiRouteMiddleware } from "@calcom/lib/server/apiRouteMiddleware";
import { UserRepository } from "@calcom/lib/server/repository/user";
import { userMetadata } from "@calcom/prisma/zod-utils";
+1 -1
View File
@@ -1,10 +1,10 @@
import { apiRouteMiddleware } from "app/api/apiRouteMiddleware";
import { createHmac } from "crypto";
import { cookies, headers } from "next/headers";
import { NextResponse } from "next/server";
import { z } from "zod";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import { apiRouteMiddleware } from "@calcom/lib/server/apiRouteMiddleware";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";