Merge pull request #43 from Psychopoulet/develop

improve packages & set default content-type

lib/components/Orchestrator.js

@@ -69,7 +69,7 @@ module.exports = class Orchestrator extends MediatorUser {
 				return new Promise((resolve, reject) => {
 
 					if (null === SwaggerParser) {
-						SwaggerParser = require("swagger-parser");
+						SwaggerParser = require("@apidevtools/swagger-parser");
 					}
 
 					SwaggerParser.validate(this._descriptorFile, (err) => {

lib/components/Server.js

@@ -90,6 +90,11 @@ module.exports = class Server extends MediatorUser {
 					req.headers["content-length"] = parseInt(req.headers["content-length"], 10);
 				}
 
+				// set default content-typ
+				if ("string" !== typeof req.headers["content-length"]) {
+					req.headers["content-type"] = "application/json";
+				}
+
 				if (!req.pattern || !this._Descriptor.paths[req.pattern] || !this._Descriptor.paths[req.pattern][req.method]) {
 					return next();
 				}
@@ -99,7 +104,7 @@ module.exports = class Server extends MediatorUser {
 				this._log("info", "" +
 					"=> [" + req.validatedIp + "] " + req.url + " (" + req.method.toUpperCase() + ")" +
 					(operationId ? EOL + "operationId    : " + operationId : "") +
-					(req.headers["content-type"] ? EOL + "content-type   : " + req.headers["content-type"] : "") +
+					EOL + "content-type   : " + req.headers["content-type"] +
 					(
 						"get" !== req.method && req.headers["content-length"] && 4 < req.headers["content-length"] ?
 							EOL + "content-length : " + req.headers["content-length"] : ""
@@ -112,7 +117,7 @@ module.exports = class Server extends MediatorUser {
 					new Promise((resolve, reject) => {
 
 						if (null === SwaggerParser) {
-							SwaggerParser = require("swagger-parser");
+							SwaggerParser = require("@apidevtools/swagger-parser");
 						}
 
 						SwaggerParser.validate(this._Descriptor, (err, api) => {
@@ -177,21 +182,6 @@ module.exports = class Server extends MediatorUser {
 
 				}
 
-				// no "Content-Type" header found
-				else if (null !== checkNonEmptyString(
-					"headers[\"content-type\"]", req.headers["content-type"], false
-				)) {
-
-					const result = {
-						"code": "MISSING_HEADER",
-						"message": "No \"Content-Type\" header found"
-					};
-
-					this._log("error", "<= [" + req.validatedIp + "] " + JSON.stringify(result));
-					send(req, res, result, 400, this._cors);
-
-				}
-
 				// no "Content-Length" header found
 				else if ("get" !== req.method && null !== checkInteger(
 					"headers[\"content-length\"]", req.headers["content-length"], false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pluginsmanager-plugin",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "An abstract parent plugin for node-pluginsmanager",
   "main": "lib/main.js",
   "typings": "lib/index.d.ts",
@@ -35,7 +35,7 @@
     "url": "https://github.com/Psychopoulet/node-pluginsmanager-plugin/issues"
   },
   "dependencies": {
-    "swagger-parser": "~8.0.4",
+    "@apidevtools/swagger-parser": "~9.0.1",
     "express-openapi-validate": "~0.5.0"
   },
   "devDependencies": {

test/utils/DescriptorUser/Descriptor.json

@@ -2,7 +2,7 @@
 	"openapi": "3.0.2",
 	"info": {
 		"title": "node-pluginsmanager-plugin",
-		"version": "4.2.1",
+		"version": "4.2.2",
 		"description": "An abstract parent plugin for node-pluginsmanager",
 		"contact": {
 			"name": "Sébastien VIDAL",

test/utils/Server/tests.js

@@ -17,7 +17,6 @@
 		const checkUrlHeaderParameters = require(join(__dirname, "checkUrlHeaderParameters.js"));
 
 		const checkBodyBasics = require(join(__dirname, "checkBodyBasics.js"));
-		const checkBodyContentType = require(join(__dirname, "checkBodyContentType.js"));
 		const checkBodyContentLength = require(join(__dirname, "checkBodyContentLength.js"));
 		const checkBodyParameters = require(join(__dirname, "checkBodyParameters.js"));
 
@@ -43,7 +42,6 @@ module.exports = function test (descriptor) {
 	describe("check body", () => {
 
 		checkBodyBasics(URL_API);
-		checkBodyContentType(URL_API);
 		checkBodyContentLength(URL_API);
 		checkBodyParameters(URL_API);