From 8ed7ffd4fc4fe0b4e4ee9479f5778ace661304d2 Mon Sep 17 00:00:00 2001 From: Roland Bewick Date: Tue, 26 Sep 2023 13:52:34 +0700 Subject: [PATCH] chore: update comments, replace fixme with todo --- .env.appStore.example | 2 +- packages/app-store/alby/api/add.ts | 3 ++- packages/app-store/alby/components/AlbyPaymentComponent.tsx | 6 ++++-- .../server/routers/loggedInViewer/integrations.handler.ts | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.env.appStore.example b/.env.appStore.example index 9bb34fe5b2..20b57acee5 100644 --- a/.env.appStore.example +++ b/.env.appStore.example @@ -128,7 +128,7 @@ ZOHOCRM_CLIENT_SECRET="" # ALBY # Used for the Alby payment app / receiving Alby payments # Get it from: https://getalby.com/developer/oauth_clients -# Set callbackUrl to /api/integrations/alby/alby-webhooks +# Set callbackUrl to YOUR_APP_DOMAIN/api/integrations/alby/alby-webhook NEXT_PUBLIC_ALBY_CLIENT_ID="" NEXT_PUBLIC_ALBY_CLIENT_SECRET="" diff --git a/packages/app-store/alby/api/add.ts b/packages/app-store/alby/api/add.ts index d572833ca8..1a8bec38b8 100644 --- a/packages/app-store/alby/api/add.ts +++ b/packages/app-store/alby/api/add.ts @@ -4,7 +4,8 @@ import prisma from "@calcom/prisma"; import config from "../config.json"; -// FIXME: is a custom handler really needed? +// TODO: is a custom handler really needed? +// all we need is to redirect to the setup page after installing the app export default async function handler(req: NextApiRequest, res: NextApiResponse) { if (!req.session?.user?.id) { return res.status(401).json({ message: "You must be logged in to do this" }); diff --git a/packages/app-store/alby/components/AlbyPaymentComponent.tsx b/packages/app-store/alby/components/AlbyPaymentComponent.tsx index 1cc3f95b2c..ccb9423153 100644 --- a/packages/app-store/alby/components/AlbyPaymentComponent.tsx +++ b/packages/app-store/alby/components/AlbyPaymentComponent.tsx @@ -125,8 +125,10 @@ type PaymentCheckerProps = PaymentPageProps; function PaymentChecker(props: PaymentCheckerProps) { // This effect checks if the booking status has changed to "ACCEPTED" // then reload the page to show the new payment status - // FIXME: subscribe to the exact payment instead of polling bookings - // FIXME: booking success is copied from packages/features/ee/payments/components/Payment.tsx + // TODO: subscribe to the exact payment instead of polling bookings + // - we can enable payments for trpc and then you actually listen for any success there + // TODO: booking success is copied from packages/features/ee/payments/components/Payment.tsx + // - this code should be extracted into a common lib function. const searchParams = useSearchParams(); const bookingSuccessRedirect = useBookingSuccessRedirect(); const utils = trpc.useContext(); diff --git a/packages/trpc/server/routers/loggedInViewer/integrations.handler.ts b/packages/trpc/server/routers/loggedInViewer/integrations.handler.ts index a5baa1e480..b27f0215fc 100644 --- a/packages/trpc/server/routers/loggedInViewer/integrations.handler.ts +++ b/packages/trpc/server/routers/loggedInViewer/integrations.handler.ts @@ -169,7 +169,7 @@ export const integrationsHandler = async ({ ctx, input }: IntegrationsOptions) = invalidCredentialIds, teams, isInstalled: !!userCredentialIds.length || !!teams.length || app.isGlobal, - // FIXME: remove hardcoding and add per-app validation + // TODO: remove hardcoding and add per-app validation. We can probably validate using zod schemas. isSetup: !!(credential?.key as { account_id: string })?.account_id || app.slug !== "alby", }; }