Add missing fields to netlify adapter and make request decoder more r…

…obust.
yoshi-monster · Jun 1, 2023 · 3774147 · 3774147
1 parent 8e5a50a
commit 3774147
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/adapter/netlify.js b/adapter/netlify.js
@@ -159,10 +159,11 @@ async function render(event, context) {
  */
 function reqToJson(req) {
   return {
+    requestTime: Math.round(new Date().getTime()),
     method: req.httpMethod,
     headers: req.headers,
     rawUrl: req.rawUrl,
-    body: req.body,
+    body: req.body || null,
     multiPartFormData: null,
   };
 }

diff --git a/src/Internal/Request.elm b/src/Internal/Request.elm
@@ -41,19 +41,15 @@ fakeRequest =
 
 requestDecoder : Decode.Decoder RequestRecord
 requestDecoder =
-    Decode.succeed RequestRecord
-        |> andMap
-            (Decode.field "requestTime"
-                (Decode.int |> Decode.map Time.millisToPosix)
-            )
-        |> andMap (Decode.field "method" Decode.string)
-        |> andMap (Decode.field "body" (Decode.nullable Decode.string))
-        |> andMap
-            (Decode.string
-                |> Decode.field "rawUrl"
-            )
-        |> andMap (Decode.field "headers" (Decode.dict Decode.string))
-        |> andMap
+    Decode.map6 RequestRecord
+        (Decode.field "requestTime"
+            (Decode.int |> Decode.map Time.millisToPosix)
+        )
+        (Decode.field "method" Decode.string)
+        (Decode.maybe (Decode.field "body" Decode.string))
+        (Decode.field "rawUrl" Decode.string)
+        (Decode.maybe (Decode.field "headers" (Decode.dict Decode.string)) |> Decode.map (Maybe.withDefault Dict.empty))
+        (Decode.maybe
             (Decode.field "headers"
                 (optionalField "cookie" Decode.string
                     |> Decode.map
@@ -62,6 +58,8 @@ requestDecoder =
                         )
                 )
             )
+            |> Decode.map (Maybe.withDefault Dict.empty)
+        )
 
 
 andMap : Decode.Decoder a -> Decode.Decoder (a -> b) -> Decode.Decoder b