Merge pull request #182 from mbret/develop

release
mbret · Sep 27, 2024 · e1d2ad2 · e1d2ad2
2 parents 05aa9b3 + 5063b34
commit e1d2ad2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/packages/api/src/functions/signin/handler.ts b/packages/api/src/functions/signin/handler.ts
@@ -13,6 +13,7 @@ import { generateToken } from "@libs/auth"
 import { ObokuErrorCode } from "@oboku/shared"
 import { createHttpError } from "@libs/httpErrors"
 import { getParametersValue } from "@libs/ssm"
+import { withMiddy } from "@libs/middy/withMiddy"
 
 const firebaseConfig = JSON.parse(
   Buffer.from(process.env.FIREBASE_CONFIG ?? "", "base64").toString() ?? "{}"

diff --git a/packages/api/src/libs/middy/unexpectedErrorToHttpError.ts b/packages/api/src/libs/middy/unexpectedErrorToHttpError.ts
@@ -0,0 +1,22 @@
+import { createHttpError } from "@libs/httpErrors"
+import { MiddlewareObj } from "@middy/core"
+import { ObokuErrorCode } from "@oboku/shared"
+
+export const unexpectedErrorToHttpError = (): MiddlewareObj => ({
+  onError: async (request) => {
+    if (request.error) {
+      console.error("error received", request.error)
+    }
+
+    if (request.error) {
+      request.error = createHttpError(500, {
+        code: ObokuErrorCode.UNKNOWN,
+        message: request.error.message
+      })
+
+      // eslint-disable-next-line no-extra-semi
+      ;(request.error as any).expose =
+        (request.error as any)?.expose ?? process.env.NODE_ENV === "development"
+    }
+  }
+})
diff --git a/packages/api/src/libs/middy/withMiddy.ts b/packages/api/src/libs/middy/withMiddy.ts
@@ -1,13 +1,11 @@
 import middy from "@middy/core"
-import { jsonSafeParse } from "@middy/util"
 import middyJsonBodyParser from "@middy/http-json-body-parser"
 import httpErrorHandler from "@middy/http-error-handler"
 import httpHeaderNormalizer from "@middy/http-header-normalizer"
 import cors from "@middy/http-cors"
 import { transpileSchema } from "@middy/validator/transpile"
 import validator from "@middy/validator"
-import { createHttpError } from "@libs/httpErrors"
-import { ObokuErrorCode } from "@oboku/shared"
+import { unexpectedErrorToHttpError } from "./unexpectedErrorToHttpError"
 
 export const withMiddy = (
   handler: any,
@@ -68,25 +66,7 @@ export const withMiddy = (
           fallbackMessage: `An error occurred`
         })
       )
-      .use({
-        onError: async (request) => {
-          if (request.error) {
-            console.error("error received", request.error)
-          }
-
-          if (request.error) {
-            request.error = createHttpError(500, {
-              code: ObokuErrorCode.UNKNOWN,
-              message: request.error.message
-            })
-
-            // eslint-disable-next-line no-extra-semi
-            ;(request.error as any).expose =
-              (request.error as any)?.expose ??
-              process.env.NODE_ENV === "development"
-          }
-        }
-      })
+      .use(unexpectedErrorToHttpError())
       // @todo eventually protect the api and only allow a subset of origins
       .use(
         withCors