From 49080b04126f1ce9826fe2c359a1fee09aa907ca Mon Sep 17 00:00:00 2001
From: siiky <github-siiky@net-c.cat>
Date: Tue, 3 Jun 2025 11:32:52 +0100
Subject: [PATCH] refactor: move `pairing.js:isPaired()` to
 `machine-loader.js:getPairedMachineName()`

---
 packages/server/lib/machine-loader.js        |  8 ++++++++
 packages/server/lib/middlewares/authorize.js |  5 ++---
 packages/server/lib/pairing.js               | 11 +----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/server/lib/machine-loader.js b/packages/server/lib/machine-loader.js
index b3d3c43a..174ddeb1 100644
--- a/packages/server/lib/machine-loader.js
+++ b/packages/server/lib/machine-loader.js
@@ -173,6 +173,13 @@ function getMachineName(machineId) {
   return db.oneOrNone(sql, [machineId]).then(it => it?.name)
 }
 
+const getPairedMachineName = deviceId =>
+  db.oneOrNone(
+    'SELECT name FROM devices WHERE device_id = $1 AND paired = TRUE',
+    [deviceId],
+    machine => machine?.name,
+  )
+
 function getMachine(machineId, config) {
   const sql = `${MACHINE_WITH_CALCULATED_FIELD_SQL} WHERE d.device_id = $1`
 
@@ -750,6 +757,7 @@ const batchRecordPendingPings = () => {
 
 module.exports = {
   getMachineName,
+  getPairedMachineName,
   getMachines,
   getUnpairedMachines,
   getMachine,
diff --git a/packages/server/lib/middlewares/authorize.js b/packages/server/lib/middlewares/authorize.js
index 1a4d24df..30b95e93 100644
--- a/packages/server/lib/middlewares/authorize.js
+++ b/packages/server/lib/middlewares/authorize.js
@@ -1,9 +1,8 @@
-const pairing = require('../pairing')
+const { getPairedMachineName } = require('../machine-loader')
 const logger = require('../logger')
 
 const authorize = function (req, res, next) {
-  return pairing
-    .isPaired(req.deviceId)
+  return getPairedMachineName(req.deviceId)
     .then(deviceName => {
       if (deviceName) {
         req.deviceName = deviceName
diff --git a/packages/server/lib/pairing.js b/packages/server/lib/pairing.js
index 38eecc9b..b21012e3 100644
--- a/packages/server/lib/pairing.js
+++ b/packages/server/lib/pairing.js
@@ -81,13 +81,4 @@ function authorizeCaDownload(caToken) {
   })
 }
 
-function isPaired(deviceId) {
-  const sql =
-    'select device_id, name from devices where device_id=$1 and paired=TRUE'
-
-  return db
-    .oneOrNone(sql, [deviceId])
-    .then(row => (row && row.device_id === deviceId ? row.name : false))
-}
-
-module.exports = { pair, unpair, authorizeCaDownload, isPaired }
+module.exports = { pair, unpair, authorizeCaDownload }