fix: make userconfig.json checks dynamic

pull/243/head
Josh Moore 2 years ago
parent 26c6841dcd
commit 83c89a9e25

@ -4,8 +4,8 @@ import { Router, json as BodyParserJson } from 'express';
import { log } from '../log'; import { log } from '../log';
const router = Router({ caseSensitive: true }); const router = Router({ caseSensitive: true });
const userConfigExists = fs.pathExistsSync(path.join('userconfig.json')); const userConfigExists = () => fs.pathExistsSync(path.join('userconfig.json'));
router.get('/', (req, res) => userConfigExists ? res.render('index') : res.redirect('/setup')); router.get('/', (req, res) => userConfigExists() ? res.render('index') : res.redirect('/setup'));
export { router }; export { router };

@ -5,15 +5,15 @@ import { log } from '../log';
import { UserConfiguration } from 'ass'; import { UserConfiguration } from 'ass';
const router = Router({ caseSensitive: true }); const router = Router({ caseSensitive: true });
const userConfigExists = fs.pathExistsSync(path.join('userconfig.json')); const userConfigExists = () => fs.pathExistsSync(path.join('userconfig.json'));
// Static routes // Static routes
router.get('/', (req, res) => userConfigExists ? res.redirect('/') : res.render('setup')); router.get('/', (req, res) => userConfigExists() ? res.redirect('/') : res.render('setup'));
router.get('/ui.js', (req, res) => userConfigExists ? res.send('') : res.type('text').sendFile(path.join('dist-frontend/setup.mjs'))); router.get('/ui.js', (req, res) => userConfigExists() ? res.send('') : res.type('text').sendFile(path.join('dist-frontend/setup.mjs')));
// Setup route // Setup route
router.post('/', BodyParserJson(), (req, res) => { router.post('/', BodyParserJson(), (req, res) => {
if (userConfigExists) if (userConfigExists())
return res.status(409).json({ success: false, message: 'User config already exists' }); return res.status(409).json({ success: false, message: 'User config already exists' });
log.debug('Running setup'); log.debug('Running setup');

Loading…
Cancel
Save