Merge branch 'master' into chat-improvements

services/auth/secrets.json

@@ -0,0 +1 @@
+{}

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();

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

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 }) => {