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

chore: integrate new admin with l-s

Browse source
This commit is contained in:
Taranto 2020-05-06 22:11:55 +01:00
parent 6b3db134e7
commit bf8f1d991c
72 changed files with 1493 additions and 1611 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/pairing.js
View file

@ -4,7 +4,6 @@ const readFile = pify(fs.readFile)
const db = require('./db')
const options = require('./options')
const logger = require('./logger')
const settingsLoader = require('./settings-loader')
function pullToken (token) {
const sql = `delete from pairing_tokens
@ -13,33 +12,12 @@ function pullToken (token) {
return db.one(sql, [token])
}
function configureNewDevice (deviceId, machineName, machineModel) {
const scope = {crypto: 'global', machine: deviceId}
const newFields = [
settingsLoader.configAddField(scope, 'cashOutEnabled', 'onOff', null, false),
settingsLoader.configAddField(scope, 'machineName', 'string', null, machineName),
settingsLoader.configAddField(scope, 'machineModel', 'string', null, machineModel)
]
return settingsLoader.modifyConfig(newFields)
}
function removeDeviceConfig (deviceId) {
const scope = {crypto: 'global', machine: deviceId}
const newFields = [
settingsLoader.configDeleteField(scope, 'cashOutEnabled'),
settingsLoader.configDeleteField(scope, 'machineName'),
settingsLoader.configDeleteField(scope, 'machineModel')
]
return settingsLoader.modifyConfig(newFields)
}
function unpair (deviceId) {
const sql = 'delete from devices where device_id=$1'
const deleteMachinePings = 'delete from machine_pings where device_id=$1'
// TODO new-admin: We should remove all configs related to that device. This can get tricky.
return Promise.all([db.none(sql, [deviceId]), db.none(deleteMachinePings, [deviceId])])
.then(() => removeDeviceConfig(deviceId))
}
function pair (token, deviceId, machineModel) {
@ -51,8 +29,7 @@ function pair (token, deviceId, machineModel) {
on conflict (device_id)
do update set paired=TRUE, display=TRUE`
return configureNewDevice(deviceId, r.name, machineModel)
.then(() => db.none(insertSql, [deviceId, r.name]))
return db.none(insertSql, [deviceId, r.name])
.then(() => true)
})
.catch(err => {