Staging (#276)

* increase poolSize for mongoclient

* mongodb conn string

* remove certs

* Encryption (#272)

* Import Data

* Import Data

* Import Data

* Import API Update

* Import API Fix

* Update

* Updates Import API

* Updates Import API

* Updates Import API

* Import API Update

* Update

* Import API Update

* Import API Update

* chaging rolling update to api

* Import API Fix

* Import API Fix

* Import API Test

* Import API Test

* Import API Fix

* Update README.md

* Import Export API

* Import Export API (#262)

* Import Export API

* Import API

* Import Export API (#263)

* Import Export API

* Import Export API

* Import API

* fixed realTime for multiple tables on a single client

* added cache-control for app-icon images (#269)

* Update README.md

* added cache-control for app-icon images

* Encryption

* Encryption

* Encryption

* Resolve

* Encryption Changes

* Encryption Changes

Author: shubhamqweasd

api/app/App.js

@@ -26,6 +26,7 @@ module.exports = function () {
 
                     global.appService.createDefaultTables(appId).then(function () {
                         console.log("Success : App Successfully Created.");
+                        delete app.keys.encryption_key;
                         res.status(200).send(app);
                     }, function (err) {
                         console.log("Error : Cannot create an app.");

api/pages/Page.js

@@ -33,6 +33,7 @@ module.exports = function() {
 
             appKeys.masterKey=list[0].keys.master;
             var appSettingsObject=list[1];
+            list[0].keys.encryption_key ? delete list[0].keys.encryption_key : null;
 
             var general=_.first(_.where(appSettingsObject, {category: "general"}));
             var auth=_.first(_.where(appSettingsObject, {category: "auth"}));
@@ -75,13 +76,15 @@ module.exports = function() {
                 "message": "New Password is required."
             });
         }
-            
-        global.userService.resetUserPassword(appId, username, newPassword, resetKey, customHelper.getAccessList(req), true)
-        .then(function(result) {
-            res.json({message : "Password changed successfully."});
-        }, function(error) {
-            res.json(400, {
-                error: error
+        
+        global.appService.getApp(appId).then(function (application) {
+            global.userService.resetUserPassword(appId, username, newPassword, resetKey, customHelper.getAccessList(req), true, application.keys.encryption_key)
+            .then(function(result) {
+                res.json({message : "Password changed successfully."});
+            }, function(error) {
+                res.json(400, {
+                    error: error
+                });
             });
         });