From 15a28336fb5d45b8492868d2732e60aade0d9bdc Mon Sep 17 00:00:00 2001
From: Tiago Rodrigues <tmcrodrigues@gmail.com>
Date: Tue, 22 Mar 2016 10:58:27 +0100
Subject: [PATCH] fix: Encode query URI parameters

---
 lib/create-http-client.js               |  4 +++-
 package.json                            |  3 ++-
 test/unit/create-request-config-test.js | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/create-request-config-test.js

diff --git a/lib/create-http-client.js b/lib/create-http-client.js
index 80162958d..5b03822c5 100644
--- a/lib/create-http-client.js
+++ b/lib/create-http-client.js
@@ -1,4 +1,5 @@
 import version from '../version'
+import qs from 'qs'
 
 /**
  * Create pre configured axios instance
@@ -29,6 +30,7 @@ export default function createHttpClient (axios, {space, accessToken, insecure,
   return axios.create({
     baseURL: `${insecure ? 'http' : 'https'}://${hostname}:${port}/spaces/${space}/`,
     headers: headers,
-    agent: agent
+    agent: agent,
+    paramsSerializer: qs.stringify
   })
 }
diff --git a/package.json b/package.json
index 623dcdac6..e3ae8afce 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,8 @@
     "babel-runtime": "^6.3.19",
     "follow-redirects": "0.0.7",
     "json-stringify-safe": "^5.0.1",
-    "lodash": "^4.2.0"
+    "lodash": "^4.2.0",
+    "qs": "^6.1.0"
   },
   "devDependencies": {
     "axios": "^0.9.1",
diff --git a/test/unit/create-request-config-test.js b/test/unit/create-request-config-test.js
new file mode 100644
index 000000000..f386c3333
--- /dev/null
+++ b/test/unit/create-request-config-test.js
@@ -0,0 +1,14 @@
+import test from 'tape'
+
+import createRequestConfig from '../../lib/create-request-config'
+
+test('Create request config', t => {
+  const config = createRequestConfig({
+    resolveLinks: true,
+    query: {}
+  })
+
+  t.ok(config.params, 'params property exist')
+  t.notOk(config.params.resolveLinks, 'resolveLinks property is removed from query')
+  t.end()
+})