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

fixes

Browse source
This commit is contained in:
Josh Harvey 2016-11-28 03:34:18 +02:00
parent ee0eecbd30
commit 48a9f9d204
14 changed files with 186 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/routes.js
View file

@ -9,7 +9,7 @@ const configManager = require('./config-manager')
const db = require('./db')
const dbm = require('./postgresql_interface')
const pairing = require('./pairing')
const settingsLoader = require('./settings')
const settingsLoader = require('./settings-loader')
let plugins
@ -27,12 +27,12 @@ function poll (req, res, next) {
const deviceId = req.deviceId
const deviceTime = req.deviceTime
const pid = req.query.pid
const settings = settingsLoader.settings
const settings = settingsLoader.settings()
const config = configManager.machineScoped(deviceId, settings.config)
pids[deviceId] = {pid, ts: Date.now()}
plugins.pollQueries(settings, deviceTime, deviceId, req.query)
plugins.pollQueries(deviceTime, deviceId, req.query)
.then(results => {
const cartridges = results.cartridges
@ -40,7 +40,7 @@ function poll (req, res, next) {
const langs = config.languages.machineLanguages
const locale = {
fiatCode: config.currencies.fiatCode,
fiatCode: config.currencies.fiatCurrency,
localeInfo: {
primaryLocale: langs[0],
primaryLocales: langs
@ -248,7 +248,10 @@ function updateCachedAction (req, body, status) {
}
function errorHandler (err, req, res, next) {
const statusCode = err.code || 500
const statusCode = err.name === 'HttpError'
? err.code || 500
: 500
const json = {error: err.message}
logger.error(err)
@ -301,9 +304,9 @@ function authorize (req, res, next) {
return next()
}
throw new Error('Unauthorized')
throw httpError('Unauthorized', 403)
})
.catch(e => res.status(403).end())
.catch(next)
}
function init (opts) {