From 899a5e6159277c7734164f95032d2194dffc6104 Mon Sep 17 00:00:00 2001
From: Francesco Durighetto <francesco.durighetto@bandyer.com>
Date: Wed, 20 Dec 2017 17:42:03 +0100
Subject: [PATCH 1/2] handle addToken error

---
 nuve/nuveAPI/mdb/tokenRegistry.js       |  8 +++++---
 nuve/nuveAPI/resource/tokensResource.js | 10 ++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/nuve/nuveAPI/mdb/tokenRegistry.js b/nuve/nuveAPI/mdb/tokenRegistry.js
index 0712ea3ed1..f653a5bf61 100644
--- a/nuve/nuveAPI/mdb/tokenRegistry.js
+++ b/nuve/nuveAPI/mdb/tokenRegistry.js
@@ -40,7 +40,6 @@ var hasToken = exports.hasToken = function (id, callback) {
             callback(true);
         }
     });
-
 };
 
 /*
@@ -48,8 +47,11 @@ var hasToken = exports.hasToken = function (id, callback) {
  */
 exports.addToken = function (token, callback) {
     db.tokens.save(token, function (error, saved) {
-        if (error) log.warn('message: addToken error, ' + logger.objectToLog(error));
-        callback(saved._id);
+        if (error) {
+          log.warn('message: addToken error, ' + logger.objectToLog(error));
+          return callback(null, true);
+        }
+        callback(saved._id, false);
     });
 };
 
diff --git a/nuve/nuveAPI/resource/tokensResource.js b/nuve/nuveAPI/resource/tokensResource.js
index 5ba1e3db0b..b57cc55747 100644
--- a/nuve/nuveAPI/resource/tokensResource.js
+++ b/nuve/nuveAPI/resource/tokensResource.js
@@ -90,8 +90,11 @@ var generateToken = function (req, callback) {
 
             log.info('message: generateTestToken');
 
-            tokenRegistry.addToken(token, function (id) {
+            tokenRegistry.addToken(token, function (id, err) {
 
+                if (err) {
+                  return callback('error');
+                }
                 token._id = id;
                 currentService.testToken = token;
                 serviceRegistry.updateService(currentService);
@@ -130,8 +133,11 @@ var generateToken = function (req, callback) {
 
             token.host += ':' + ec.port;
 
-            tokenRegistry.addToken(token, function (id) {
+            tokenRegistry.addToken(token, function (id, err) {
 
+                if (err) {
+                  return callback('error')
+                }
                 var tokenS = getTokenString(id, token);
                 callback(tokenS);
             });

From 96df5a452229ee4dcc20363b8c3aa91bf6d11b1f Mon Sep 17 00:00:00 2001
From: Francesco Durighetto <francesco.durighetto@bandyer.com>
Date: Wed, 20 Dec 2017 18:07:40 +0100
Subject: [PATCH 2/2] fix lint

---
 nuve/nuveAPI/resource/tokensResource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuve/nuveAPI/resource/tokensResource.js b/nuve/nuveAPI/resource/tokensResource.js
index b57cc55747..cee9e73210 100644
--- a/nuve/nuveAPI/resource/tokensResource.js
+++ b/nuve/nuveAPI/resource/tokensResource.js
@@ -136,7 +136,7 @@ var generateToken = function (req, callback) {
             tokenRegistry.addToken(token, function (id, err) {
 
                 if (err) {
-                  return callback('error')
+                  return callback('error');
                 }
                 var tokenS = getTokenString(id, token);
                 callback(tokenS);