Cleanup isFetchRequest

dac09 · Dec 22, 2023 · fe40f61 · fe40f61
1 parent 1a3cbd4
commit fe40f61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/packages/api/src/transforms.ts b/packages/api/src/transforms.ts
@@ -47,21 +47,17 @@ export const parseFetchEventBody = async (event: Request) => {
   return body ? JSON.parse(body) : undefined
 }
 
-// @TODO
-// @TODO
-// @TODO
-// THis is in a hacked state. Need to figure out why instanceof isn't working in middleware
-export const isFetchApiRequest = (event: any): event is Request => {
-  if (event instanceof Request || event instanceof PonyFillRequest) {
+export const isFetchApiRequest = (
+  event: Request | APIGatewayProxyEvent
+): event is Request => {
+  if (
+    event.constructor.name === 'Request' ||
+    event.constructor.name === PonyFillRequest.name
+  ) {
     return true
   }
 
-  if (event.httpMethod || event.queryStringParameters) {
-    return false
-  }
-
-  // @TODO I dont know why instance of Request is not working in middleware
-  return true
+  return false
 }
 
 function getQueryStringParams(reqUrl: string) {

diff --git a/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts b/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts
@@ -393,10 +393,6 @@ export class DbAuthHandler<
     this.options = options
     this.event = event
     this.httpMethod = isFetchApiRequest(event) ? event.method : event.httpMethod
-    console.log(
-      `👉 \n ~ file: DbAuthHandler.ts:396 ~ isFetchApiRequest(event):`,
-      isFetchApiRequest(event)
-    )
 
     this.cookie = extractCookie(event) || ''