From 0258a182298af3ebad321854ef4f34a65f4c700a Mon Sep 17 00:00:00 2001 From: Leo Giovanetti Date: Wed, 16 Nov 2022 14:27:56 -0300 Subject: [PATCH] Standardizing apis --- packages/app-store/sendgrid/api/_getAdd.ts | 8 ++++++-- packages/app-store/sendgrid/api/_postAdd.ts | 6 +++--- packages/app-store/sendgrid/api/_postCheck.ts | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/app-store/sendgrid/api/_getAdd.ts b/packages/app-store/sendgrid/api/_getAdd.ts index 6f16a414db..31c5ba40c4 100644 --- a/packages/app-store/sendgrid/api/_getAdd.ts +++ b/packages/app-store/sendgrid/api/_getAdd.ts @@ -1,10 +1,14 @@ import type { NextApiRequest, NextApiResponse } from "next"; +import { defaultResponder } from "@calcom/lib/server"; + import checkSession from "../../_utils/auth"; import { checkInstalled } from "../../_utils/installation"; -export default async function handler(req: NextApiRequest, res: NextApiResponse) { +export async function getHandler(req: NextApiRequest, res: NextApiResponse) { const session = checkSession(req); await checkInstalled("sendgrid", session.user?.id); - return res.status(200).json({ url: "/apps/sendgrid/setup" }); + return { url: "/apps/sendgrid/setup" }; } + +export default defaultResponder(getHandler); diff --git a/packages/app-store/sendgrid/api/_postAdd.ts b/packages/app-store/sendgrid/api/_postAdd.ts index 417780f2d7..be7c9dc1d1 100644 --- a/packages/app-store/sendgrid/api/_postAdd.ts +++ b/packages/app-store/sendgrid/api/_postAdd.ts @@ -1,3 +1,4 @@ +import getInstalledAppPath from "_utils/getInstalledAppPath"; import type { NextApiRequest, NextApiResponse } from "next"; import { symmetricEncrypt } from "@calcom/lib/crypto"; @@ -7,7 +8,6 @@ import { defaultResponder } from "@calcom/lib/server"; import prisma from "@calcom/prisma"; import checkSession from "../../_utils/auth"; -import getInstalledAppPath from "../../_utils/getInstalledAppPath"; export async function getHandler(req: NextApiRequest, res: NextApiResponse) { const session = checkSession(req); @@ -30,10 +30,10 @@ export async function getHandler(req: NextApiRequest, res: NextApiResponse) { }); } catch (reason) { logger.error("Could not add Sendgrid app", reason); - return res.status(500).json({ message: "Could not add Sendgrid app" }); + return { message: "Could not add Sendgrid app", statusCode: 500 }; } - return res.status(200).json({ url: `/apps/installed/$other?hl=sendgrid` }); + return { url: getInstalledAppPath({ variant: "other", slug: "sendgrid" }) }; } export default defaultResponder(getHandler); diff --git a/packages/app-store/sendgrid/api/_postCheck.ts b/packages/app-store/sendgrid/api/_postCheck.ts index c71bbc7e05..fd3b0f34ba 100644 --- a/packages/app-store/sendgrid/api/_postCheck.ts +++ b/packages/app-store/sendgrid/api/_postCheck.ts @@ -17,12 +17,12 @@ export async function getHandler(req: NextApiRequest, res: NextApiResponse) { try { const usernameInfo = await sendgrid.username(); if (usernameInfo.username) { - return res.status(200).end(); + return {}; } else { - return res.status(404).end(); + return { statusCode: 404 }; } } catch (e) { - return res.status(500).json({ message: e }); + return { message: e, statusCode: 500 }; } }