fix(contentful-export): Fix proxy issue

Author: Khaledgarbaya

lib/parseOptions.js

@@ -1,5 +1,7 @@
 import { resolve } from 'path'
 import { version } from '../package'
+import { proxyStringToObject } from './utils/proxy'
+
 export default function parseOptions (params) {
   const defaultOptions = {
     exportDir: process.cwd(),
@@ -47,27 +49,7 @@ export default function parseOptions (params) {
   }
 
   if (typeof options.proxy === 'string') {
-    const chunks = options.proxy.split('@')
-    if (chunks.length > 1) {
-      // Advanced proxy config with auth credentials
-      const auth = chunks[0].split(':')
-      const host = chunks[1].split(':')
-      options.proxy = {
-        host: host[0],
-        port: parseInt(host[1]),
-        auth: {
-          username: auth[0],
-          password: auth[1]
-        }
-      }
-    } else {
-      // Simple proxy config without auth credentials
-      const host = chunks[0].split(':')
-      options.proxy = {
-        host: host[0],
-        port: parseInt(host[1])
-      }
-    }
+    options.proxy = proxyStringToObject(options.proxy)
   }
 
   options.managementApplication = options.managementApplication || `contentful.export/${version}`

lib/usageParams.js

@@ -58,7 +58,7 @@ export default yargs
     default: 'api.contentful.com'
   })
   .option('proxy', {
-    describe: 'Proxy configuration in HTTP auth format: host:port or user:password@host:port',
+    describe: 'Proxy configuration in HTTP auth format: [http|https]://host:port or [http|https]://user:password@host:port',
     type: 'string'
   })
   .option('error-log-file', {

lib/utils/proxy.js

@@ -0,0 +1,58 @@
+import { parse, format } from 'url'
+import { toInteger } from 'lodash'
+
+function serializeAuth ({ username, password } = {}) {
+  if (!username) {
+    return ''
+  }
+
+  if (!password) {
+    return username
+  }
+
+  return `${username}:${password}`
+}
+
+function parseAuth (authString) {
+  // authString may be a falsy value like `null`
+  const [username, password] = (authString || '').split(':')
+  return { username, password }
+}
+
+export function proxyStringToObject (proxyString) {
+  if (!proxyString.startsWith('http')) {
+    return proxyStringToObject(`http://${proxyString}`)
+  }
+
+  const {
+    hostname: host,
+    port: portString,
+    auth: authString,
+    protocol
+  } = parse(proxyString)
+
+  const auth = parseAuth(authString)
+  const port = toInteger(portString)
+  const isHttps = protocol === 'https:'
+
+  if (!auth.username) {
+    return { host, port, isHttps }
+  }
+
+  return {
+    host,
+    port,
+    auth,
+    isHttps
+  }
+}
+
+export function proxyObjectToString (proxyObject) {
+  const { host: hostname, port, auth: authObject } = proxyObject
+  const auth = serializeAuth(authObject)
+
+  const formatted = format({ hostname, port, auth })
+
+  // Ugly fix for Node 6 vs Node 8 behavior
+  return formatted.replace(/^\/\//, '')
+}

package.json

@@ -51,7 +51,7 @@
   "dependencies": {
     "bluebird": "^3.3.3",
     "cli-table2": "^0.2.0",
-    "contentful-batch-libs": "^5.7.0",
+    "contentful-batch-libs": "^5.9.2",
     "fs-extra": "^2.1.2",
     "json-stringify-safe": "^5.0.1",
     "listr": "^0.11.0",