From ddfd3fda70af11f4fe087b3f8333b871f1f2a89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Omar=20L=C3=B3pez?= <zomars@me.com>
Date: Wed, 16 Apr 2025 07:01:47 -0700
Subject: [PATCH] refactor: improve error handling in captureErrorsMiddleware
 (#20718)

---
 .../middlewares/captureErrorsMiddleware.ts      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/trpc/server/middlewares/captureErrorsMiddleware.ts b/packages/trpc/server/middlewares/captureErrorsMiddleware.ts
index 40a5b6559b..0e7eeb4c80 100644
--- a/packages/trpc/server/middlewares/captureErrorsMiddleware.ts
+++ b/packages/trpc/server/middlewares/captureErrorsMiddleware.ts
@@ -5,16 +5,15 @@ import { redactError } from "@calcom/lib/redactError";
 import { middleware } from "../trpc";
 
 const captureErrorsMiddleware = middleware(async ({ next }) => {
-  const result = await next();
-  if (result && !result.ok) {
-    const cause = result.error.cause;
-    if (!cause) {
-      return result;
-    }
-    captureException(cause);
-    throw redactError(cause);
+  try {
+    const result = await next();
+    if (result.ok) return result;
+    if (!result.error.cause) return result;
+    throw result.error.cause;
+  } catch (error) {
+    captureException(error);
+    throw redactError(error);
   }
-  return result;
 });
 
 export default captureErrorsMiddleware;