Fix #136

telefonicaid · May 23, 2013 · df03b19 · df03b19
1 parent ab9344c
commit df03b19
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/lib/agentLogic.js b/lib/agentLogic.js
@@ -186,16 +186,17 @@ function putTransMeta(req, res) {
 
 function postQueue(req, res) {
 
-  var errors = [];//validate.errorsTrans(req.body);
-  var ev = {};
-  var queue = req.body.queue,
-      user = req.body.user,
-      passwd = req.body.password;
-  var appPrefix = req.prefix;
+    var errors = [],//validate.errorsTrans(req.body);
+        ev = {},
+        queue = req.body.queue,
+        user = req.body.user,
+        passwd = req.body.password,
+        appPrefix = req.prefix,
+        statusCode = 0;
 
-  if (errors.length === 0) {
     dataSrv.setSecHash(appPrefix, queue, user, passwd, function (err) {
       if (err) {
+        statusCode = err.statusCode || 500;
         ev = {
           'queue': queue,
           'postdata': req.body,
@@ -204,14 +205,12 @@ function postQueue(req, res) {
           'error': err
         };
         emitter.emit('ACTION', ev);
-        logger.info('putTransMeta', [
+        logger.info('postQueue', [
           {errors: [String(err)]},
-          400,
+          statusCode,
           req.info
         ]);
-        res.send(500, [
-          {errors: [String(err)]}
-        ]);
+        res.send(statusCode, {errors: [String(err)]});
       } else {
         ev = {
           'queue': queue,
@@ -220,21 +219,13 @@ function postQueue(req, res) {
           'timestamp': new Date()
         };
         emitter.emit('ACTION', ev);
-        logger.info('putTransMeta', [
+        logger.info('postQueue', [
           {ok: true},
           req.info
         ]);
         res.send({ok: true});
       }
     });
-  } else {
-    logger.info('putTransMeta', [
-      {errors: errors},
-      400,
-      req.info
-    ]);
-    res.send(400, {errors: errors});
-  }
 }
 
 

diff --git a/lib/dataHelper.js b/lib/dataHelper.js
@@ -35,6 +35,7 @@ var createKey = function(db, id, value, callback) {
         }
         else if(val === 0) {
             err = new Error(id + " exists");
+            err.statusCode = 403;
         }
         if (callback) {
             return callback(err);