Merge pull request #171 from telefonicaid/bug/contentType

FIX Use express methods to check mime type
telefonicaid · Oct 20, 2015 · 2c9b3ad · 2c9b3ad
2 parents 70b23ef + adc70ac
commit 2c9b3ad
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,4 +1,5 @@
 - FIX 500 error while removing devices (#151)
 - FIX Change Device Not Found to 404 instead of 500 (#161).
 - ADD First version of the stats registry (#160).
-- FIX Reestructure files and folders (#164).
+- FIX Reestructure files and folders (#164).
+- FIX Use Express Methods to check content type (#170).
diff --git a/lib/services/ngsi/ngsiParser.js b/lib/services/ngsi/ngsiParser.js
@@ -193,7 +193,7 @@ function readQueryPayload(req, callback) {
 
 function readBody(parseFunction) {
     return function readMiddleware(req, res, next) {
-        if (req.headers['content-type'] === 'application/xml') {
+        if (req.is('xml')) {
             parseFunction(req, next);
         } else {
             next();

diff --git a/lib/services/northBound/contextServer.js b/lib/services/northBound/contextServer.js
@@ -304,7 +304,7 @@ function handleUpdate(req, res, next) {
             } else {
                 logger.debug(context, 'Update action from [%s] handled successfully.', req.get('host'));
 
-                if (req.is('application/xml')) {
+                if (req.is('xml')) {
                     res.set('Content-Type', 'application/xml');
                     res
                         .status(200)
@@ -390,7 +390,7 @@ function handleQuery(req, res, next) {
         } else {
             logger.debug(context, 'Query from [%s] handled successfully.', req.get('host'));
 
-            if (req.is('application/xml')) {
+            if (req.is('xml')) {
                 res.set('Content-Type', 'application/xml');
                 res.status(200)
                     .send(generateXmlResponse(queryTemplates)(createQueryResponse(req, res, result)));
@@ -462,7 +462,7 @@ function setQueryHandler(newHandler) {
 }
 
 function ensureType(req, res, next) {
-    if (req.headers['content-type'] === 'application/json' || req.headers['content-type'] === 'application/xml') {
+    if (req.is('json') || req.is('xml')) {
         next();
     } else {
         next(new errors.UnsupportedContentType(req.headers['content-type']));
@@ -471,7 +471,7 @@ function ensureType(req, res, next) {
 
 function validateJson(template) {
     return function validate(req, res, next) {
-        if (req.headers['content-type'] === 'application/json') {
+        if (req.is('json')) {
             var errorList = revalidator.validate(req.body, template);
 
             if (errorList.valid) {

diff --git a/lib/services/northBound/northboundServer.js b/lib/services/northBound/northboundServer.js
@@ -54,9 +54,9 @@ function handleError(error, req, res, next) {
 function traceRequest(req, res, next) {
     logger.debug(context, 'Request for path [%s] from [%s]', req.path, req.get('host'));
 
-    if (req.headers['content-type'] === 'application/json') {
+    if (req.is('json')) {
         logger.debug(context, 'Body:\n\n%s\n\n', JSON.stringify(req.body, null, 4));
-    } else if (req.headers['content-type'] === 'application/xml') {
+    } else if (req.is('xml')) {
         logger.debug(context, 'Body:\n\n%s\n\n', req.rawBody);
     } else {
         logger.debug(context, 'Unrecognized body type', req.headers['content-type']);

diff --git a/lib/services/northBound/restUtils.js b/lib/services/northBound/restUtils.js
@@ -69,10 +69,7 @@ function checkMandatoryQueryParams(mandatoryAttributes, body, callback) {
  * @param {Function} next        Invokes the next middleware in the chain.
  */
 function xmlRawBody(req, res, next) {
-    var contentType = req.headers['content-type'] || '',
-        mime = contentType.split(';')[0];
-
-    if (mime !== 'text/xml' && mime !== 'application/xml') {
+    if (!req.is('xml')) {
         next();
     } else {
         var data = '';