fix(nextjs): Check for validity of API route handler signature (getsentry#8811)

lforst · web-flow · commit e6e6ebff74d8 · 2023-08-14T14:45:14.000+02:00
diff --git a/packages/nextjs/src/common/wrapApiHandlerWithSentry.ts b/packages/nextjs/src/common/wrapApiHandlerWithSentry.ts
@@ -53,9 +53,25 @@ export const withSentryAPI = wrapApiHandlerWithSentry;
  */
 export function withSentry(apiHandler: NextApiHandler, parameterizedRoute?: string): NextApiHandler {
   return new Proxy(apiHandler, {
-    apply: (wrappingTarget, thisArg, args: [AugmentedNextApiRequest, AugmentedNextApiResponse]) => {
+    apply: (
+      wrappingTarget,
+      thisArg,
+      args: [AugmentedNextApiRequest | undefined, AugmentedNextApiResponse | undefined],
+    ) => {
       const [req, res] = args;
 
+      if (!req) {
+        logger.debug(
+          `Wrapped API handler on route "${parameterizedRoute}" was not passed a request object. Will not instrument.`,
+        );
+        return wrappingTarget.apply(thisArg, args);
+      } else if (!res) {
+        logger.debug(
+          `Wrapped API handler on route "${parameterizedRoute}" was not passed a response object. Will not instrument.`,
+        );
+        return wrappingTarget.apply(thisArg, args);
+      }
+
       // We're now auto-wrapping API route handlers using `wrapApiHandlerWithSentry` (which uses `withSentry` under the hood), but
       // users still may have their routes manually wrapped with `withSentry`. This check makes `sentryWrappedHandler`
       // idempotent so that those cases don't break anything.
