Merge remote-tracking branch 'origin/master' into 2.3.0

samples/client/petstore/javascript-promise/README.md

@@ -45,6 +45,24 @@ browserify main.js > bundle.js
 
 Then include *bundle.js* in the HTML pages.
 
+### Webpack Configuration
+
+Using Webpack you may encounter the following error: "Module not found: Error:
+Cannot resolve module", most certainly you should disable AMD loader. Add/merge
+the following section to your webpack config:
+
+```javascript
+module: {
+  rules: [
+    {
+      parser: {
+        amd: false
+      }
+    }
+  ]
+}
+```
+
 ## Getting Started
 
 Please follow the [installation](#installation) instruction and execute the following JS code:

samples/client/petstore/javascript-promise/src/ApiClient.js

@@ -467,7 +467,7 @@
             if (_this.enableCookies && typeof window === 'undefined'){
               _this.agent.saveCookies(response);
             }
-            resolve({data, response});
+            resolve({data: data, response: response});
           } catch (err) {
             reject(err);
           }