From 108ae616cd8d1299092f8b4e51d56951d70a1f41 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 15:16:16 +0530 Subject: [PATCH] BOTs Search Issue --- .../dashboard/bots/view/editParams.html | 6 +- server/app/lib/utils/apiUtil.js | 5 +- server/app/routes/v1.0/routes_bots.js | 17 ----- server/app/services/botsService.js | 63 ++++++++++--------- 4 files changed, 38 insertions(+), 53 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 6bc3ca30d..050684498 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -96,9 +96,9 @@

Add Parameters:

- - - + + + diff --git a/server/app/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js index 2c285dbb8..24326b86e 100644 --- a/server/app/lib/utils/apiUtil.js +++ b/server/app/lib/utils/apiUtil.js @@ -253,10 +253,7 @@ var ApiUtil = function() { } if(data.search){ - var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - var encrypt=cryptography.encryptText(data.search, cryptoConfig.encryptionEncoding,cryptoConfig.decryptionEncoding); - var decrypt=cryptography.decryptText(encrypt, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - request['search']=decrypt; + request['search']=data.search; } if (typeof callback === 'function') { callback(null, request); diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 066a04e49..fd662e3e1 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -100,23 +100,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { scriptParams: req.body.scriptParams } } - /*var paramOptions = { - cookbookAttributes: req.body.cookbookAttributes, - scriptParams: req.body.scriptParams - }; - - if (paramOptions.scriptParams && paramOptions.scriptParams.length) { - var cryptoConfig = appConfig.cryptoSettings; - var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - var encryptedParams = []; - for (var i = 0; i < paramOptions.scriptParams.length; i++) { - var encryptedText = cryptography.encryptText(paramOptions.scriptParams[i], cryptoConfig.encryptionEncoding, - cryptoConfig.decryptionEncoding); - encryptedParams.push(encryptedText); - } - paramOptions.scriptParams = encryptedParams; - } - reqBody.paramOptions=paramOptions;*/ } if(reqBody !== null) { botsService.executeBots(req.params.botId, reqBody, function (err, data) { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 134f3008a..5677b1069 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -388,40 +388,45 @@ function filterScriptBotsData(data,callback){ var botsList = []; var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - for(var i = 0; i < data.docs.length; i++){ - (function(bots){ - if ((bots.botLinkedSubCategory === 'script') - && ('scriptDetails' in bots.botConfig) - && (bots.botConfig.scriptDetails.length > 0)) { - var scriptCount = 0; - for (var j = 0; j < bots.botConfig.scriptDetails.length; j++) { - (function (scriptBot) { - if (scriptBot.scriptParameters.length > 0) { - scriptCount++; - for (var k = 0; k < scriptBot.scriptParameters.length; k++) { - if(scriptBot.scriptParameters[k].paramType === '' || scriptBot.scriptParameters[k].paramType === 'Default' || scriptBot.scriptParameters[k].paramType === 'Password'){ - scriptBot.scriptParameters[k].paramVal = cryptography.decryptText(scriptBot.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, - cryptoConfig.encryptionEncoding); - }else { - scriptBot.scriptParameters[k].paramVal = ''; + if(data.docs.length === 0){ + callback(null,data); + return; + }else { + for (var i = 0; i < data.docs.length; i++) { + (function (bots) { + if ((bots.botLinkedSubCategory === 'script') + && ('scriptDetails' in bots.botConfig) + && (bots.botConfig.scriptDetails.length > 0)) { + var scriptCount = 0; + for (var j = 0; j < bots.botConfig.scriptDetails.length; j++) { + (function (scriptBot) { + if (scriptBot.scriptParameters.length > 0) { + scriptCount++; + for (var k = 0; k < scriptBot.scriptParameters.length; k++) { + if (scriptBot.scriptParameters[k].paramType === '' || scriptBot.scriptParameters[k].paramType === 'Default' || scriptBot.scriptParameters[k].paramType === 'Password') { + scriptBot.scriptParameters[k].paramVal = cryptography.decryptText(scriptBot.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, + cryptoConfig.encryptionEncoding); + } else { + scriptBot.scriptParameters[k].paramVal = ''; + } } + } else { + scriptCount++; } - } else { - scriptCount++; - } - })(bots.botConfig.scriptDetails[j]); - } - if(scriptCount === bots.botConfig.scriptDetails.length) { + })(bots.botConfig.scriptDetails[j]); + } + if (scriptCount === bots.botConfig.scriptDetails.length) { + botsList.push(bots); + } + } else { botsList.push(bots); } - } else { - botsList.push(bots); + })(data.docs[i]); + if (botsList.length === data.docs.length) { + data.docs = botsList; + callback(null, data); + return; } - })(data.docs[i]); - if(botsList.length === data.docs.length){ - data.docs = botsList; - callback(null,data); - return; } } }