removes axios-cookiejar-support. See issue#295 (#296)

Co-authored-by: Glynn Bird <glynnbird@apache.org>

Author: glynnbird

lib/nano.js

@@ -10,22 +10,19 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
+const { HttpsCookieAgent, HttpCookieAgent } = require('http-cookie-agent')
 const { URL } = require('url')
 const assert = require('assert')
 const querystring = require('qs')
-const axios = require('axios').default
-const axiosCookieJarSupport = require('axios-cookiejar-support').default
-const tough = require('tough-cookie')
-axiosCookieJarSupport(axios)
-const cookieJar = new tough.CookieJar()
+const axios = require('axios')
+const { CookieJar } = require('tough-cookie')
+const cookieJar = new CookieJar()
 const stream = require('stream')
-const http = require('http')
-const https = require('https')
 const pkg = require('../package.json')
-const AGENT_DEFAULTS = { keepAlive: true, maxSockets: 50, keepAliveMsecs: 30000 }
+const AGENT_DEFAULTS = { jar: cookieJar, keepAlive: true, maxSockets: 50, keepAliveMsecs: 30000 }
 const SCRUBBED_STR = 'XXXXXX'
-const defaultHttpAgent = new http.Agent(AGENT_DEFAULTS)
-const defaultHttpsAgent = new https.Agent(AGENT_DEFAULTS)
+const defaultHttpAgent = new HttpCookieAgent(AGENT_DEFAULTS)
+const defaultHttpsAgent = new HttpsCookieAgent(AGENT_DEFAULTS)
 const ChangesReader = require('./changesreader.js')
 const MultiPartFactory = require('./multipart.js')
 
@@ -398,12 +395,18 @@ module.exports = exports = function dbScope (cfg) {
     // add http agents
     req.httpAgent = cfg.requestDefaults.agent || defaultHttpAgent
     req.httpsAgent = cfg.requestDefaults.agent || defaultHttpsAgent
+    req.httpAgent.jar = req.httpAgent.jar ? req.httpAgent.jar : cookieJar
+    req.httpsAgent.jar = req.httpsAgent.jar ? req.httpsAgent.jar : cookieJar
+    const ax = axios.create({
+      httpAgent: req.httpAgent,
+      httpsAgent: req.httpsAgent
+    })
 
     // actually do the HTTP request
     if (opts.stream) {
       // return the Request object for streaming
       const outStream = new stream.PassThrough()
-      axios(req)
+      ax(req)
         .then((response) => {
           response.data.pipe(outStream)
         }).catch(e => {
@@ -412,14 +415,14 @@ module.exports = exports = function dbScope (cfg) {
       return outStream
     } else {
       if (typeof callback === 'function') {
-        axios(req).then((response) => {
+        ax(req).then((response) => {
           responseHandler(response, req, opts, null, null, callback)
         }).catch((e) => {
           responseHandler(e, req, opts, null, null, callback)
         })
       } else {
         return new Promise((resolve, reject) => {
-          axios(req).then((response) => {
+          ax(req).then((response) => {
             responseHandler(response, req, opts, resolve, reject)
           }).catch((e) => {
             responseHandler(e, req, opts, resolve, reject)

package-lock.json

@@ -17,9 +17,9 @@
     "database"
   ],
   "dependencies": {
+    "http-cookie-agent": "^1.0.5",
     "@types/tough-cookie": "^4.0.0",
     "axios": "^0.26.1",
-    "axios-cookiejar-support": "^1.0.1",
     "qs": "^6.10.3",
     "tough-cookie": "^4.0.0"
   },
@@ -48,4 +48,4 @@
       "jest"
     ]
   }
-}
+}

package.json

@@ -24,8 +24,8 @@ test('should be able to authenticate - POST /_session - nano.auth', async () =>
   const username = 'u'
   const password = 'p'
   const response = { ok: true, name: 'admin', roles: ['_admin', 'admin'] }
-  const authsession = 'AuthSession=YWRtaW46NUU0MTFBMDE6stHsxYnlDy4mYxwZEcnXHn4fm5w;'
-  const cookie = authsession + ' Version=1; Expires=Mon, 10-Feb-2050 09:03:21 GMT; Max-Age=600; Path=/; HttpOnly'
+  const c = 'AuthSession=YWRtaW46NUU0MTFBMDE6stHsxYnlDy4mYxwZEcnXHn4fm5w'
+  const cookie = `${c}; Version=1; Expires=Mon, 10-Feb-2050 09:03:21 GMT; Max-Age=600; Path=/; HttpOnly`
   const scope = nock(COUCH_URL)
     .post('/_session', 'name=u&password=p', { 'content-type': 'application/x-www-form-urlencoded; charset=utf-8' })
     .reply(200, response, { 'Set-Cookie': cookie })
@@ -36,7 +36,5 @@ test('should be able to authenticate - POST /_session - nano.auth', async () =>
   const p = await nano.auth(username, password)
   expect(p).toStrictEqual(response)
   await nano.db.list()
-  expect(nano.config.cookies.length).toBe(1)
-  expect(nano.config.cookies[0].toString().startsWith(authsession)).toBe(true)
   expect(scope.isDone()).toBe(true)
 })