fix(authentication): correctly extract the requested url from headers (…

…#507)
ForestAdmin · Nov 26, 2020 · d97e2c7 · d97e2c7
1 parent c089afd
commit d97e2c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/services/request-analyser.js b/src/services/request-analyser.js
@@ -1,3 +1,5 @@
+const url = require('url');
+
 class RequestAnalyzerService {
   /**
    * @private @static
@@ -27,7 +29,9 @@ class RequestAnalyzerService {
       || (isForwarded
         ? undefined
         : RequestAnalyzerService._extractPortFromHost(request.headers.host));
-    const path = request.url;
+
+    const parsedUrl = url.parse(request.originalUrl);
+    const path = parsedUrl.pathname;
 
     return `${protocol}://${hostname}${port ? `:${port}` : ''}${path}`;
   }

diff --git a/test/services/request-analyzer.test.js b/test/services/request-analyzer.test.js
@@ -13,7 +13,7 @@ describe('requestAnalyzerService', () => {
         },
         protocol: 'http',
         hostname: 'localhost.com',
-        url: '/forest/authentication',
+        originalUrl: '/forest/authentication?foo=bar&hello=world',
       };
 
       const result = service.extractOriginalUrlWithoutQuery(request);
@@ -32,7 +32,7 @@ describe('requestAnalyzerService', () => {
         },
         protocol: 'http',
         hostname: 'localhost.com',
-        url: '/forest/authentication',
+        originalUrl: '/forest/authentication?foo=bar&hello=world',
       };
 
       const result = service.extractOriginalUrlWithoutQuery(request);
@@ -54,7 +54,7 @@ describe('requestAnalyzerService', () => {
         },
         protocol: 'http',
         hostname: 'localhost.com',
-        url: '/forest/authentication',
+        originalUrl: '/forest/authentication?foo=bar&hello=world',
       };
 
       const result = service.extractOriginalUrlWithoutQuery(request);
@@ -75,7 +75,7 @@ describe('requestAnalyzerService', () => {
         },
         protocol: 'http',
         hostname: 'localhost.com',
-        url: '/forest/authentication',
+        originalUrl: '/forest/authentication?foo=bar&hello=world',
       };
 
       const result = service.extractOriginalUrlWithoutQuery(request);