From 078c9ddca5f92405a97a3741880eac79e0bb1c27 Mon Sep 17 00:00:00 2001 From: Praveen Dias <87233758+praveendias1180@users.noreply.github.com> Date: Fri, 12 May 2023 04:34:10 +0530 Subject: [PATCH] Improved API key error message for SendGrid setup page (#8847) Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> --- packages/app-store/sendgrid/api/_postAdd.ts | 8 +++++++- packages/app-store/sendgrid/pages/setup/index.tsx | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/app-store/sendgrid/api/_postAdd.ts b/packages/app-store/sendgrid/api/_postAdd.ts index 1cf672fb95..b34826d5d9 100644 --- a/packages/app-store/sendgrid/api/_postAdd.ts +++ b/packages/app-store/sendgrid/api/_postAdd.ts @@ -15,7 +15,13 @@ export async function getHandler(req: NextApiRequest) { const { api_key } = req.body; if (!api_key) throw new HttpError({ statusCode: 400, message: "No Api Key provided to check" }); - const encrypted = symmetricEncrypt(JSON.stringify({ api_key }), process.env.CALENDSO_ENCRYPTION_KEY || ""); + let encrypted; + try { + encrypted = symmetricEncrypt(JSON.stringify({ api_key }), process.env.CALENDSO_ENCRYPTION_KEY || ""); + } catch (reason) { + logger.error("Could not add Sendgrid app", reason); + throw new HttpError({ statusCode: 500, message: "Invalid length - CALENDSO_ENCRYPTION_KEY" }); + } const data = { type: "sendgrid_other_calendar", diff --git a/packages/app-store/sendgrid/pages/setup/index.tsx b/packages/app-store/sendgrid/pages/setup/index.tsx index bd59a3aa7b..0575763810 100644 --- a/packages/app-store/sendgrid/pages/setup/index.tsx +++ b/packages/app-store/sendgrid/pages/setup/index.tsx @@ -84,7 +84,7 @@ export default function SendgridSetup() { onBlur={onBlur} disabled={testPassed === true} name="api_key" - placeholder="api_xyz..." + placeholder="SG.xxxxxx..." onChange={async (e) => { onChange(e.target.value); form.setValue("api_key", e.target.value);