Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

invert response / request bodies, improve Stripe integration response body

Steven Tey6929faeb46dd
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/route.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/route.ts
index 9b514adc03..7afaa5adbc 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/route.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/route.ts
@@ -4,7 +4,7 @@ import { stripe } from "@/lib/stripe";
import { StripeMode } from "@/lib/types";
import { prisma } from "@dub/prisma";
import { waitUntil } from "@vercel/functions";
-import { logAndRespond } from "app/(ee)/api/cron/utils";
+import { NextResponse } from "next/server";
import Stripe from "stripe";
import { accountApplicationDeauthorized } from "./account-application-deauthorized";
import { chargeRefunded } from "./charge-refunded";
@@ -80,9 +80,13 @@ export const POST = withAxiom(async (req: Request) => {
// and live mode events are sent to the live mode endpoint.
// See: https://docs.stripe.com/stripe-apps/build-backend#event-behavior-depends-on-install-mode
if (!event.livemode && mode === "live") {
- return logAndRespond(
- `Received a test webhook event (${event.type}) on our live webhook receiver endpoint, skipping...`,
- );
+ const response =
+ "Received a test webhook event on our live webhook receiver endpoint, skipping...";
+ console.log(`[${event.type}]: ${response}`);
+ return NextResponse.json({
+ eventType: event.type,
+ response,
+ });
}
let result: {
@@ -125,7 +129,10 @@ export const POST = withAxiom(async (req: Request) => {
break;
}
- const finalResponse = `[${event.type}]: ${result.response}`;
+ const responseBody = {
+ eventType: event.type,
+ response: result.response,
+ };
waitUntil(
(async () => {
@@ -160,12 +167,14 @@ export const POST = withAxiom(async (req: Request) => {
statusCode: 200,
duration: Date.now() - startTime,
requestBody: event,
- responseBody: finalResponse,
+ responseBody,
userAgent: req.headers.get("user-agent"),
});
}
})(),
);
- return logAndRespond(finalResponse);
+ console.log(`[${event.type}]: ${result.response}`);
+
+ return NextResponse.json(responseBody);
});
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/logs/[logId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/logs/[logId]/page-client.tsx
index a16c6525d0..640882d7bb 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/logs/[logId]/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/logs/[logId]/page-client.tsx
@@ -175,36 +175,36 @@ function LogDetailContent({ log }: { log: EnrichedApiLog }) {
return (
<div className="flex flex-col gap-6 lg:flex-row">
- {/* Left: Request & Response bodies */}
+ {/* Left: Response & Request bodies */}
<div className="order-last min-w-0 flex-1 lg:order-first">
<div className="flex flex-col gap-6">
<div className="flex flex-col gap-2">
<h3 className="text-content-emphasis text-lg font-semibold">
- Request body
+ Response body
</h3>
- {highlightedRequest ? (
+ {highlightedResponse ? (
<div
className="shiki-wrapper max-h-[800px] overflow-auto rounded-xl border border-neutral-200 bg-white p-4 text-sm"
- dangerouslySetInnerHTML={{ __html: highlightedRequest }}
+ dangerouslySetInnerHTML={{ __html: highlightedResponse }}
/>
) : (
<div className="rounded-xl border border-neutral-200 bg-white p-4 font-mono text-xs text-neutral-500">
- No request body
+ No response body
</div>
)}
</div>
<div className="flex flex-col gap-2">
<h3 className="text-content-emphasis text-lg font-semibold">
- Response body
+ Request body
</h3>
- {highlightedResponse ? (
+ {highlightedRequest ? (
<div
className="shiki-wrapper max-h-[800px] overflow-auto rounded-xl border border-neutral-200 bg-white p-4 text-sm"
- dangerouslySetInnerHTML={{ __html: highlightedResponse }}
+ dangerouslySetInnerHTML={{ __html: highlightedRequest }}
/>
) : (
<div className="rounded-xl border border-neutral-200 bg-white p-4 font-mono text-xs text-neutral-500">
- No response body
+ No request body
</div>
)}
</div>