lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix exception on clock skew (#202)

Browse source 
* Fix exception on clock skew

* Return device name instead of db object
This commit is contained in:
Rafael Taranto 2018-11-01 18:07:47 -03:00 • committed by Josh Harvey
parent a35cb5c78d
commit bd75194526
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pairing.js
View file

@ -74,14 +74,7 @@ function isPaired (deviceId) {
const sql = 'select device_id, name from devices where device_id=$1 and paired=TRUE' const sql = 'select device_id, name from devices where device_id=$1 and paired=TRUE'
return db.oneOrNone(sql, [deviceId]) return db.oneOrNone(sql, [deviceId])
.then(row => { .then(row => row && row.device_id === deviceId ? row.name : false)
const deviceName = row.name
const isDevicePaired = row && row.device_id === deviceId
return {
deviceName: deviceName,
isDevicePaired: isDevicePaired
}
})
} }
module.exports = {pair, unpair, authorizeCaDownload, isPaired} module.exports = {pair, unpair, authorizeCaDownload, isPaired}

6
lib/routes.js
View file

@ -311,10 +311,10 @@ function authorize (req, res, next) {
const deviceId = req.deviceId const deviceId = req.deviceId
return pairing.isPaired(deviceId) return pairing.isPaired(deviceId)
.then(r => { .then(deviceName => {
if (r.isDevicePaired) { if (deviceName) {
req.deviceId = deviceId req.deviceId = deviceId
req.deviceName = r.deviceName req.deviceName = deviceName
return next() return next()
} }