Merge release-v0.1.6 into master

Author: johnboxall

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.1.6 (October 16, 2018)
+- Fix `overrideHttpPut` logic invocation
+
 ## v0.1.5 (October 16, 2018)
 - Add `overrideHttpPut` option for handling environments not allowing http put.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "commercecloud-ocapi-client",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "An ES6 JavaScript Client for Salesforce Open Commerce API",
   "license": "SEE LICENSE IN LICENSE",
   "main": "dist/commercecloud-ocapi-client.cjs.js",

src/ApiClient.js

@@ -421,6 +421,12 @@ export default class ApiClient {
         queryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
         returnType) {
 
+        // emulate PUT method because they are not allowed on staging and production environments
+        if (this.overrideHttpPut && httpMethod.toUpperCase() === 'PUT') {
+            httpMethod = 'POST'
+            headerParams = Object.assign(headerParams || {}, {'x-dw-http-method-override': 'PUT'})
+        }
+
         const url = this.buildUrl(path, pathParams)
         const request = superagent(httpMethod, url)
 
@@ -432,12 +438,6 @@ export default class ApiClient {
             queryParams._ = new Date().getTime()
         }
 
-        // emulate PUT method because they are not allowed on staging and production environments
-        if (this.overrideHttpPut && httpMethod.toUpperCase() === 'PUT') {
-            httpMethod = 'POST'
-            headerParams = Object.assign(headerParams || {}, {'x-dw-http-method-override': 'PUT'})
-        }
-
         request.query(this.normalizeParams(queryParams))
 
         // set header parameters