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

config-validator to consider default values from schema (#139)

Browse source 
* config-validator to consider default values from schema

* fix with relative json schema path

* remove lamassuServerPath config on lamassu-migrate-options
This commit is contained in:
Fabio Cigliano 2018-08-14 17:46:09 +02:00 • committed by Josh Harvey
parent d28c6ae691
commit 6fdb3e8834
7 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/admin/admin-server.js
View file

@ -100,8 +100,10 @@ app.post('/api/account', (req, res) => {
.then(() => dbNotify())
})
app.get('/api/config/:config', (req, res) =>
config.fetchConfigGroup(req.params.config).then(c => res.json(c)))
app.get('/api/config/:config', (req, res, next) =>
config.fetchConfigGroup(req.params.config)
.then(c => res.json(c))
.catch(next))
app.post('/api/config', (req, res, next) => {
config.saveConfigGroup(req.body)

10
lib/admin/config.js
View file

@ -1,6 +1,3 @@
const pify = require('pify')
const fs = pify(require('fs'))
const path = require('path')
const _ = require('lodash/fp')
const currencies = require('../../currencies.json')
@ -9,16 +6,13 @@ const countries = require('../../countries.json')
const settingsLoader = require('../settings-loader')
const db = require('../db')
const options = require('../options')
const configManager = require('../config-manager')
const configValidate = require('../config-validate')
const machineLoader = require('../machine-loader')
const jsonSchema = require('../../lamassu-schema.json')
function fetchSchema () {
const schemaPath = path.resolve(options.lamassuServerPath, 'lamassu-schema.json')
return fs.readFile(schemaPath)
.then(JSON.parse)
return _.cloneDeep(jsonSchema)
}
function fetchConfig () {