From 97f7c956385d9f181a3297ed2ca75a41a60b9beb Mon Sep 17 00:00:00 2001 From: emad-salah Date: Fri, 7 Feb 2020 19:54:47 +0100 Subject: [PATCH 1/2] Removed blocking `console.log`s --- services/gunDB/Mediator/index.js | 1 - src/routes.js | 8 ++------ src/server.js | 2 +- utils/encryptionStore.js | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/services/gunDB/Mediator/index.js b/services/gunDB/Mediator/index.js index 3bd236a3..18d8f401 100644 --- a/services/gunDB/Mediator/index.js +++ b/services/gunDB/Mediator/index.js @@ -392,7 +392,6 @@ class Mediator { deviceId }) : data - console.log('Sending Message...', eventName, data, encryptedMessage) socket.emit(eventName, encryptedMessage) } catch (err) { console.error(err) diff --git a/src/routes.js b/src/routes.js index 89254ec4..f1a8d2f2 100644 --- a/src/routes.js +++ b/src/routes.js @@ -213,7 +213,7 @@ module.exports = async ( field: "deviceId", message: "Please specify a device ID" }; - console.error(error) + logger.error("Please specify a device ID") return res.status(401).json(error); } @@ -222,19 +222,15 @@ module.exports = async ( field: "deviceId", message: "Please specify a device ID" }; - console.error("Unknown Device", error) + logger.error("Unknown Device") return res.status(401).json(error); } if (req.method === "GET") { - console.log("Method:", req.method); return next(); } - console.log("Body:", req.body) - console.log("Decrypt params:", { deviceId, message: req.body.encryptionKey }) const decryptedKey = Encryption.decryptKey({ deviceId, message: req.body.encryptionKey }); - console.log("decryptedKey", decryptedKey) const decryptedMessage = Encryption.decryptMessage({ message: req.body.data, key: decryptedKey, iv: req.body.iv }) req.body = JSON.parse(decryptedMessage); return next(); diff --git a/src/server.js b/src/server.js index f0f1dbe7..648db777 100644 --- a/src/server.js +++ b/src/server.js @@ -48,7 +48,7 @@ const server = program => { if (!nonEncryptedRoutes.includes(req.path)) { res.send = (...args) => { if (args[0] && args[0].encryptedData && args[0].encryptionKey) { - console.log('Response loop detected', req.path, args[0]) + logger.warn('Response loop detected!') oldSend.apply(res, args) } else { // arguments[0] (or `data`) contains the response body diff --git a/utils/encryptionStore.js b/utils/encryptionStore.js index d892642c..6505c0cb 100644 --- a/utils/encryptionStore.js +++ b/utils/encryptionStore.js @@ -39,7 +39,7 @@ const Encryption = { }, data ) - console.log('Decrypted Data:', encryptedData) + return encryptedData.toString() }, encryptMessage: ({ deviceId, message }) => { @@ -74,7 +74,7 @@ const Encryption = { Buffer.from(cipher.final()) ]) const decryptedData = decryptedBuffer.toString() - console.log('Decrypted Data:', decryptedData) + return decryptedData.toString() }, isAuthorizedDevice: ({ deviceId }) => { From abd13325d4dd2fd5451fa0c91cdb69de071d313f Mon Sep 17 00:00:00 2001 From: Emad-salah Date: Sun, 9 Feb 2020 12:28:40 +0100 Subject: [PATCH 2/2] Empty secrets file --- services/auth/secrets.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 services/auth/secrets.json diff --git a/services/auth/secrets.json b/services/auth/secrets.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/services/auth/secrets.json @@ -0,0 +1 @@ +{}