From 547beac19ff054e24354d05cd9bd1378e2e8b521 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Tue, 15 Mar 2022 23:07:06 +0100
Subject: [PATCH 1/2] feat: add logging

chore: simplify code
---
 lib/middlewares/authorize.js | 12 +++++++-----
 lib/middlewares/ca.js        |  6 +++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/middlewares/authorize.js b/lib/middlewares/authorize.js
index d8781882..a76a7438 100644
--- a/lib/middlewares/authorize.js
+++ b/lib/middlewares/authorize.js
@@ -1,19 +1,21 @@
 const pairing = require('../pairing')
+const logger = require('../logger')
 
 const authorize = function (req, res, next) {
-  const deviceId = req.deviceId
-
-  return pairing.isPaired(deviceId)
+  return pairing.isPaired(req.deviceId)
     .then(deviceName => {
       if (deviceName) {
-        req.deviceId = deviceId
         req.deviceName = deviceName
         return next()
       }
 
+      logger.error(`Device ${req.deviceId} not found`)
       return res.status(403).json({ error: 'Forbidden' })
     })
-    .catch(next)
+    .catch(error => {
+      logger.error(error)
+      return next()
+    })
 }
 
 module.exports = authorize
diff --git a/lib/middlewares/ca.js b/lib/middlewares/ca.js
index a43af019..0c202d0a 100644
--- a/lib/middlewares/ca.js
+++ b/lib/middlewares/ca.js
@@ -1,11 +1,15 @@
 const pairing = require('../pairing')
+const logger = require('../logger')
 
 function ca (req, res) {
   const token = req.query.token
 
   return pairing.authorizeCaDownload(token)
     .then(ca => res.json({ ca }))
-    .catch(() => res.status(403).json({ error: 'forbidden' }))
+    .catch(error => {
+      logger.error(error.message)
+      res.status(403).json({ error: 'forbidden' })
+    })
 }
 
 module.exports = ca

From 07b914111db735f1ea17bdb8eb32cb53fd76b960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Ubavi=C4=87?=
 <53820106+ubavic@users.noreply.github.com>
Date: Thu, 17 Mar 2022 22:34:21 +0100
Subject: [PATCH 2/2] fix: return

---
 lib/middlewares/ca.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/middlewares/ca.js b/lib/middlewares/ca.js
index 0c202d0a..04b3dbc0 100644
--- a/lib/middlewares/ca.js
+++ b/lib/middlewares/ca.js
@@ -8,7 +8,7 @@ function ca (req, res) {
     .then(ca => res.json({ ca }))
     .catch(error => {
       logger.error(error.message)
-      res.status(403).json({ error: 'forbidden' })
+      return res.status(403).json({ error: 'forbidden' })
     })
 }