diff options
Diffstat (limited to 'controllers')
| -rw-r--r-- | controllers/albumsController.js | 10 | ||||
| -rw-r--r-- | controllers/tokenController.js | 12 | ||||
| -rw-r--r-- | controllers/uploadController.js | 17 |
3 files changed, 21 insertions, 18 deletions
diff --git a/controllers/albumsController.js b/controllers/albumsController.js index 9c666be..55885f5 100644 --- a/controllers/albumsController.js +++ b/controllers/albumsController.js @@ -6,16 +6,16 @@ let albumsController = {} albumsController.list = function(req, res, next){ if(req.headers.auth !== config.adminToken) - return res.status(401).send('not-authorized') + return res.status(401).json({ success: false, description: 'not-authorized'}) let fields = ['id', 'name'] - if(req.headers.extended !== undefined) + if(req.params.sidebar === undefined) fields.push('timestamp') db.table('albums').select(fields).where('enabled', 1).then((albums) => { - if(req.headers.extended === undefined) + if(req.params.sidebar !== undefined) return res.json({ success: true, albums }) let ids = [] @@ -42,9 +42,9 @@ albumsController.list = function(req, res, next){ albumsController.create = function(req, res, next){ if(req.headers.auth !== config.adminToken) - return res.status(401).send('not-authorized') + return res.status(401).json({ success: false, description: 'not-authorized'}) - let name = req.headers.name + let name = req.body.name if(name === undefined || name === '') return res.json({ success: false, description: 'No album name specified' }) diff --git a/controllers/tokenController.js b/controllers/tokenController.js index 91cc292..e302869 100644 --- a/controllers/tokenController.js +++ b/controllers/tokenController.js @@ -4,8 +4,8 @@ const db = require('knex')(config.database) let tokenController = {} tokenController.verify = function(req, res, next){ - let type = req.headers.type - let token = req.headers.token + let type = req.body.type + let token = req.body.token if(type === undefined) return res.json({ success: false, description: 'No type provided.' }) if(token === undefined) return res.json({ success: false, description: 'No token provided.' }) @@ -26,7 +26,7 @@ tokenController.verify = function(req, res, next){ tokenController.list = function(req, res, next){ if(req.headers.auth !== config.adminToken) - return res.status(401).send('not-authorized') + return res.status(401).json({ success: false, description: 'not-authorized'}) return res.json({ clientToken: config.clientToken, @@ -36,10 +36,10 @@ tokenController.list = function(req, res, next){ tokenController.change = function(req, res, next){ if(req.headers.auth !== config.adminToken) - return res.status(401).send('not-authorized') + return res.status(401).json({ success: false, description: 'not-authorized'}) - let type = req.headers.type - let token = req.headers.token + let type = req.body.type + let token = req.body.token if(type === undefined) return res.json({ success: false, description: 'No type provided.' }) if(token === undefined) return res.json({ success: false, description: 'No token provided.' }) diff --git a/controllers/uploadController.js b/controllers/uploadController.js index 6b962c3..499bdb7 100644 --- a/controllers/uploadController.js +++ b/controllers/uploadController.js @@ -24,13 +24,13 @@ uploadsController.upload = function(req, res, next){ if(config.private === true) if(req.headers.auth !== config.clientToken) - return res.status(401).send('not-authorized') + return res.status(401).json({ success: false, description: 'not-authorized'}) - let album = req.headers.album + let album = req.body.album if(album !== undefined) if(req.headers.adminauth !== config.adminToken) - return res.status(401).send('not-authorized') + return res.status(401).json({ success: false, description: 'not-authorized'}) upload(req, res, function (err) { if (err) { @@ -81,14 +81,14 @@ uploadsController.upload = function(req, res, next){ uploadsController.list = function(req, res){ if(req.headers.auth !== config.adminToken) - return res.status(401).send('not-authorized') + return res.status(401).json({ success: false, description: 'not-authorized'}) db.table('files') .where(function(){ - if(req.headers.albumid === undefined) + if(req.params.id === undefined) this.where('id', '<>', '') else - this.where('albumid', req.headers.albumid) + this.where('albumid', req.params.id) }) .then((files) => { db.table('albums').then((albums) => { @@ -114,7 +114,10 @@ uploadsController.list = function(req, res){ } - return res.json(files) + return res.json({ + success: true, + files + }) }) }) |