From 16513a823848f3b36d44af721eed67d20c807e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Tue, 5 Oct 2021 14:46:21 +0100 Subject: [PATCH] feat: add nil UUID to match new machine pairing logic --- lib/new-admin/services/pairing.js | 3 ++- lib/routes.js | 2 +- lib/routes/txRoutes.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/new-admin/services/pairing.js b/lib/new-admin/services/pairing.js index ffe2ceed..14effa24 100644 --- a/lib/new-admin/services/pairing.js +++ b/lib/new-admin/services/pairing.js @@ -3,6 +3,7 @@ const pify = require('pify') const readFile = pify(fs.readFile) const crypto = require('crypto') const baseX = require('base-x') +const { NIL } = require('uuid') const options = require('../../options') const db = require('../../db') @@ -19,7 +20,7 @@ function totem (name) { return readFile(caPath) .then(data => { const caHash = crypto.createHash('sha256').update(data).digest() - const token = crypto.randomBytes(32) + const token = Buffer.concat([crypto.randomBytes(32), NIL]) const hexToken = token.toString('hex') const caHexToken = crypto.createHash('sha256').update(hexToken).digest('hex') const buf = Buffer.concat([caHash, token, Buffer.from(options.hostname)]) diff --git a/lib/routes.js b/lib/routes.js index 0ed9c557..22b72bf2 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -25,7 +25,7 @@ const phoneCodeRoutes = require('./routes/phoneCodeRoutes') const pollingRoutes = require('./routes/pollingRoutes') const stateRoutes = require('./routes/stateRoutes') const termsAndConditionsRoutes = require('./routes/termsAndConditionsRoutes') -const txRoutes = require('./routes/txRoutes') +const { router: txRoutes } = require('./routes/txRoutes') const verifyUserRoutes = require('./routes/verifyUserRoutes') const verifyTxRoutes = require('./routes/verifyTxRoutes') const verifyPromoCodeRoutes = require('./routes/verifyPromoCodeRoutes') diff --git a/lib/routes/txRoutes.js b/lib/routes/txRoutes.js index 218d223f..0bfbfd07 100644 --- a/lib/routes/txRoutes.js +++ b/lib/routes/txRoutes.js @@ -66,4 +66,4 @@ router.post('/', postTx) router.get('/:id', getTx) router.get('/', getPhoneTx) -module.exports = router +module.exports = { postTx, getTx, getPhoneTx, router }