From f315adf574831e7b6e09c0565068c96ea38e6ccf Mon Sep 17 00:00:00 2001
From: emad-salah <emads14@gmail.com>
Date: Sat, 20 Jun 2020 22:11:49 +0100
Subject: [PATCH] Fixed encryption toggle always detected as "true"

---
 src/routes.js |  2 +-
 src/server.js | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/routes.js b/src/routes.js
index 9dd57c6e..918aadc0 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -229,7 +229,7 @@ module.exports = async (
     const deviceId = req.headers["x-shockwallet-device-id"];
     logger.debug("Decrypting route...")
     try {
-      if (nonEncryptedRoutes.includes(req.path) || process.env.DISABLE_SHOCK_ENCRYPTION) {
+      if (nonEncryptedRoutes.includes(req.path) || process.env.DISABLE_SHOCK_ENCRYPTION === "true") {
         return next();
       }
   
diff --git a/src/server.js b/src/server.js
index fca6bab3..c0a8b9b7 100644
--- a/src/server.js
+++ b/src/server.js
@@ -43,7 +43,7 @@ const server = program => {
 
   logger.info('Mainnet Mode:', !!program.mainnet)
 
-  if (process.env.DISABLE_SHOCK_ENCRYPTION) {
+  if (process.env.DISABLE_SHOCK_ENCRYPTION === 'true') {
     logger.error('Encryption Mode: false')
   } else {
     logger.info('Encryption Mode: true')
@@ -72,10 +72,7 @@ const server = program => {
     const deviceId = req.headers['x-shockwallet-device-id']
     const oldSend = res.send
 
-    if (
-      !nonEncryptedRoutes.includes(req.path) &&
-      !process.env.DISABLE_SHOCK_ENCRYPTION
-    ) {
+    if (!nonEncryptedRoutes.includes(req.path)) {
       res.send = (...args) => {
         if (args[0] && args[0].encryptedData && args[0].encryptionKey) {
           logger.warn('Response loop detected!')
@@ -260,7 +257,9 @@ const server = program => {
       // app.use(bodyParser.json({limit: '100000mb'}));
       app.use(bodyParser.json({ limit: '50mb' }))
       app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }))
-      app.use(modifyResponseBody)
+      if (process.env.DISABLE_SHOCK_ENCRYPTION !== 'true') {
+        app.use(modifyResponseBody)
+      }
 
       serverInstance.listen(module.serverPort, module.serverhost)