Resolve conflicts

node-red · Feb 27, 2019 · ece49d6 · ece49d6
2 parents f33072d + 4c4387a
commit ece49d6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/lib/nodegen.js b/lib/nodegen.js
@@ -23,7 +23,7 @@ var mustache = require('mustache');
 var jsStringEscape = require('js-string-escape');
 var obfuscator = require('javascript-obfuscator');
 var csv = require('csv-string');
-var CodeGen = require('swagger-js-codegen').CodeGen;
+var CodeGen = require('swagger-js-codegen-formdata').CodeGen;
 var jimp = require("jimp");
 
 function createCommonFiles(templateDirectory, data) {

diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
         "minimist": "1.2.0",
         "mustache": "2.3.0",
         "request": "2.83.0",
-        "swagger-js-codegen": "1.12.0",
+        "swagger-js-codegen-formdata": "^0.15.4",
         "when": "3.7.8",
         "yamljs": "0.3.0"
     },

diff --git a/templates/swagger/node.js.mustache b/templates/swagger/node.js.mustache
@@ -86,6 +86,7 @@ module.exports = function (RED) {
                 } else {
                     {{&methodName}}_parameters.{{&camelCaseName}} = RED.util.getMessageProperty(msg, {{&methodName}}_nodeParam);
                 }
+                {{&methodName}}_parameters.{{&camelCaseName}} = !!{{&methodName}}_parameters.{{&camelCaseName}} ? {{&methodName}}_parameters.{{&camelCaseName}} : msg.payload;
                 {{/isNotBodyParam}}
                 {{/parameters}}
                 result = client.{{&methodName}}({{&methodName}}_parameters);

diff --git a/templates/swagger/package.json.mustache b/templates/swagger/package.json.mustache
@@ -18,7 +18,8 @@
   ],
   "dependencies": {
     "q": "1.5.1",
-    "request": "2.83.0"
+    "request": "2.83.0",
+    "file-type": "^10.7.1"
   },
   "devDependencies": {
     "node-red": "0.18.7",