Change array to object with cookies and query

dcantatore · Aug 13, 2020 · 50f1d7d · 50f1d7d
1 parent ce9fa26
commit 50f1d7d
Show file tree

Hide file tree

Showing 6 changed files with 135 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "mocha": "^7.1.1"
   },
   "dependencies": {
+    "cookie": "^0.4.1",
     "query-string": "^6.13.1"
   }
 }
diff --git a/src/helpers.js b/src/helpers.js
@@ -0,0 +1,11 @@
+const cookie = require('cookie');
+
+function parseCookieHeader (header) {
+    return (Array.isArray(header) ? header : header.split(',')).map(
+        xs => cookie.parse(xs)
+    ).reduce((lhs, rhs) => Object.assign(lhs, rhs), {});
+}
+
+module.exports = {
+    parseCookieHeader
+}
diff --git a/src/index.js b/src/index.js
@@ -2,6 +2,7 @@ const http = require('http');
 const https = require('https')
 const qs = require('query-string')
 const RedirectLimitError = require('./errors/RedirectLimitError');
+const helpers = require('./helpers');
 
 /**
  * Follows all 300x errors
@@ -53,12 +54,11 @@ function followRedirects(url, opts = {}) {
             request.on('response', (res) => {
                 let { location } = res.headers;
                 const queryParamsObj = qs.parse(new URL(urlToGo.toString()).search)
-                const queryParamsArr = Object.keys(queryParamsObj).map((k) => ({ key: k, value: queryParamsObj[k] }))
                 redirectChain.push({
                     url: urlToGo.toString(),
                     code: res.statusCode,
-                    cookies: res.headers['set-cookie'] || [],
-                    queryParams: queryParamsArr || []
+                    cookies: res.headers['set-cookie'] ? helpers.parseCookieHeader(res.headers['set-cookie']) : {},
+                    queryParams: queryParamsObj
                 });
 
                 if (location && isRedirect(res.statusCode)) {

diff --git a/test/mockServer.js b/test/mockServer.js
@@ -29,6 +29,12 @@ class MockServer {
 			res.statusCode = 200;
 			res.setHeader('Content-Type', 'text/plain');
 			res.end('world');
+		}
+
+		if (path === '/cookie') {
+			res.statusCode = 200;
+			res.setHeader('Set-Cookie', 'hello=world');
+			res.end();
         }
 
         if (path === '/redirect/301') {

diff --git a/test/test.js b/test/test.js
@@ -47,7 +47,9 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -59,11 +61,15 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}hello`,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -75,11 +81,15 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 302
+                code: 302,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}hello`,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -91,11 +101,15 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 303
+                code: 303,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}hello`,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -107,11 +121,15 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 307
+                code: 307,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}hello`,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -123,11 +141,15 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 308
+                code: 308,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}hello`,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -139,15 +161,21 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}redirect/301`,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}hello`,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -159,15 +187,21 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}redirect/301`,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}hello`,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -179,19 +213,27 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}redirect/slow`,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}redirect/301`,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}hello`,
-                code: 200
+                code: 200,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -203,7 +245,9 @@ describe('follow-url-redirects', () => {
         const expected = [
             {
                 url: url,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -232,11 +276,15 @@ describe('follow-url-redirects', () => {
         const redirects = [
             {
                 url,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             },
             {
                 url: `${baseUrl}redirect/301`,
-                code: 301
+                code: 301,
+                cookies: {},
+                queryParams: {}
             }
         ];
 
@@ -248,4 +296,41 @@ describe('follow-url-redirects', () => {
             expect(error.redirects).to.be.eql(redirects);
         }
     });
+
+    it('Returns the cookies of a request', async () => {
+        const url = `${baseUrl}cookie`;
+        const expected = [
+            {
+                url: url,
+                code: 200,
+                cookies:
+                {
+                    hello: 'world'
+                },
+                queryParams: {}
+            }
+        ];
+
+        expect((await followRedirects(url))).to.be.eql(expected);
+    });
+
+    it('Returns the cookies and query params of a request', async () => {
+        const url = `${baseUrl}cookie?hello=world&test=1`;
+        const expected = [
+            {
+                url: url,
+                code: 200,
+                cookies:
+                {
+                    hello: 'world'
+                },
+                queryParams: {
+                    hello: 'world',
+                    test: '1'
+                }
+            }
+        ];
+
+        expect((await followRedirects(url))).to.be.eql(expected);
+    });
 });