npm - @webtypen/webframez-core - Versions diffs - 0.0.47 → 0.0.48 - Mend

@webtypen/webframez-core 0.0.47 → 0.0.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/Router/Router.js CHANGED Viewed

@@ -190,8 +190,12 @@ class RouterFacade {
             if (!req && this.mode === "aws-lambda" && options && options.event) {
                 customRequest = {
                     method: options.event.requestContext.http.method,
-                    url: options.event.requestContext.http.path,
+                    url: options.event.rawPath +
+                        (options.event.rawQueryString && options.event.rawQueryString.trim() !== '' ?
+                            "?" + options.event.rawQueryString
+                            : ""),
                     headers: options.event.headers,
+                    urlParams: options.event.queryStringParameters ? options.event.queryStringParameters : {},
                 };
             }
             if (!this.kernel) {
@@ -223,16 +227,18 @@ class RouterFacade {
                     })
                     : null;
             const urlParams = {};
-            if (req && req.url && req.url.indexOf("?") > 0) {
-                const temp = req.url.substring(req.url.indexOf("?") + 1);
-                if (temp && temp.trim() !== "") {
-                    const entries = temp.split("&");
-                    for (let entry of entries) {
-                        if (entry.indexOf("=") > 0) {
-                            urlParams[entry.substring(0, entry.indexOf("="))] = entry.substring(entry.indexOf("=") + 1);
-                        }
-                        else {
-                            urlParams[entry] = true;
+            if (!customRequest) {
+                if (req && req.url && req.url.indexOf("?") > 0) {
+                    const temp = req.url.substring(req.url.indexOf("?") + 1);
+                    if (temp && temp.trim() !== "") {
+                        const entries = temp.split("&");
+                        for (let entry of entries) {
+                            if (entry.indexOf("=") > 0) {
+                                urlParams[entry.substring(0, entry.indexOf("="))] = entry.substring(entry.indexOf("=") + 1);
+                            }
+                            else {
+                                urlParams[entry] = true;
+                            }
                         }
                     }
                 }
@@ -251,7 +257,8 @@ class RouterFacade {
                             : {},
                     bodyPlain: bodyPlain,
                     params: route && route.params ? route.params : {},
-                    urlParams: urlParams,
+                    url: customRequest.url,
+                    urlParams: customRequest.urlParams,
                     headers: customRequest.headers,
                     method: customRequest.method,
                 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-core",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
   "homepage": "https://webtypen.de/",
   "license": "MIT",

package/src/Router/Router.ts CHANGED Viewed

@@ -227,8 +227,14 @@ class RouterFacade {
     if (!req && this.mode === "aws-lambda" && options && options.event) {
       customRequest = {
         method: options.event.requestContext.http.method,
-        url: options.event.requestContext.http.path,
+        url:
+          options.event.rawPath +
+          (options.event.rawQueryString  && options.event.rawQueryString.trim() !== '' ?
+            "?" + options.event.rawQueryString
+            : ""
+          ),
         headers: options.event.headers,
+        urlParams: options.event.queryStringParameters ? options.event.queryStringParameters : {},
       };
     }
@@ -267,17 +273,19 @@ class RouterFacade {
         : null;
     const urlParams: any = {};
-    if (req && req.url && req.url.indexOf("?") > 0) {
-      const temp = req.url.substring(req.url.indexOf("?") + 1);
-      if (temp && temp.trim() !== "") {
-        const entries = temp.split("&");
-        for (let entry of entries) {
-          if (entry.indexOf("=") > 0) {
-            urlParams[entry.substring(0, entry.indexOf("="))] = entry.substring(
-              entry.indexOf("=") + 1
-            );
-          } else {
-            urlParams[entry] = true;
+    if (!customRequest) {
+      if (req && req.url && req.url.indexOf("?") > 0) {
+        const temp = req.url.substring(req.url.indexOf("?") + 1);
+        if (temp && temp.trim() !== "") {
+          const entries = temp.split("&");
+          for (let entry of entries) {
+            if (entry.indexOf("=") > 0) {
+              urlParams[entry.substring(0, entry.indexOf("="))] = entry.substring(
+                entry.indexOf("=") + 1
+              );
+            } else {
+              urlParams[entry] = true;
+            }
           }
         }
       }
@@ -299,10 +307,10 @@ class RouterFacade {
                       : bodyPlain
                   )
                 : {},
             bodyPlain: bodyPlain,
             params: route && route.params ? route.params : {},
-            urlParams: urlParams,
+            url: customRequest.url,
+            urlParams: customRequest.urlParams,
             headers: customRequest.headers,
             method: customRequest.method,
           }