Fix instanceof bug

merlinn-co · Jul 31, 2024 · fcafd99 · fcafd99
1 parent a74139c
commit fcafd99
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 31 deletions.
diff --git a/services/api/src/routers/oauth/atlassian.ts b/services/api/src/routers/oauth/atlassian.ts
@@ -79,9 +79,6 @@ router.get(
 
       return res.send("App installed successfully");
     } catch (error) {
-      if (error instanceof AppError) {
-        throw error;
-      }
       if (error instanceof AxiosError) {
         if (error.response) {
           throw AppError({

diff --git a/services/api/src/routers/oauth/github.ts b/services/api/src/routers/oauth/github.ts
@@ -89,9 +89,6 @@ router.get(
 
       return res.send("App installed successfully");
     } catch (error) {
-      if (error instanceof AppError) {
-        throw error;
-      }
       if (error instanceof AxiosError) {
         if (error.response) {
           throw AppError({

diff --git a/services/api/src/routers/oauth/notion.ts b/services/api/src/routers/oauth/notion.ts
@@ -82,9 +82,6 @@ router.get(
 
       return res.send("App installed successfully");
     } catch (error) {
-      if (error instanceof AppError) {
-        throw error;
-      }
       if (error instanceof AxiosError) {
         if (error.response) {
           throw AppError({

diff --git a/services/api/src/routers/oauth/pagerduty.ts b/services/api/src/routers/oauth/pagerduty.ts
@@ -72,9 +72,6 @@ router.get(
 
       return res.status(200).send("Successfully integrated PagerDuty!");
     } catch (error) {
-      if (error instanceof AppError) {
-        throw error;
-      }
       if (error instanceof AxiosError) {
         if (error.response) {
           throw AppError({

diff --git a/services/api/src/routers/oauth/slack.ts b/services/api/src/routers/oauth/slack.ts
@@ -87,9 +87,6 @@ router.get(
 
       return res.send("App installed successfully");
     } catch (error) {
-      if (error instanceof AppError) {
-        throw error;
-      }
       if (error instanceof AxiosError) {
         if (error.response) {
           throw AppError({

diff --git a/services/api/src/services/oauth/atlassian.ts b/services/api/src/services/oauth/atlassian.ts
@@ -46,9 +46,6 @@ export async function refreshToken(integrationId: string) {
     });
   } catch (error) {
     console.log(error);
-    if (error instanceof AppError) {
-      throw error;
-    }
     if (error instanceof AxiosError) {
       if (error.response) {
         throw AppError({

diff --git a/services/api/src/services/oauth/pagerduty.ts b/services/api/src/services/oauth/pagerduty.ts
@@ -49,9 +49,6 @@ export async function refreshToken(integrationId: string) {
     });
   } catch (error) {
     console.log(error);
-    if (error instanceof AppError) {
-      throw error;
-    }
     if (error instanceof AxiosError) {
       if (error.response) {
         throw AppError({

diff --git a/services/api/src/utils/errors.ts b/services/api/src/utils/errors.ts
@@ -10,16 +10,15 @@ export const catchAsync = (
   return (req: Request, res: Response, next: NextFunction) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const handleError = (error: any) => {
-      if (error instanceof AppError) {
-        next(error);
-      } else {
-        const newError = AppError({
-          message: error.message || "Internal error",
-          statusCode: 500,
-        });
-        newError.stack = error.stack;
-        next(newError);
-      }
+      const newError = AppError({
+        message: error.message || "Internal error",
+        statusCode: error.statusCode || 500,
+        internalCode: error.internalCode || "internal_error",
+        stack: error.stack,
+        context: error.context,
+      });
+      newError.stack = error.stack;
+      next(newError);
     };
 
     const isAsync = fn.constructor.name === "AsyncFunction";