diff --git a/app/util/auth.js b/app/util/auth.js index e710a2f..a87fbce 100644 --- a/app/util/auth.js +++ b/app/util/auth.js @@ -5,7 +5,6 @@ const ModelPath = '../models/'; const Key = require(ModelPath + 'Key.js'); const User = require(ModelPath + 'User.js'); -const wrap = require('./wrap.js'); const verifyScope = require('./verifyScope.js'); const rateLimit = require('express-rate-limit'); @@ -54,7 +53,7 @@ const apiLimiter = config.get('RateLimit.enable') // otherwise throws an error code. // If the user is banned, also throw an error. const requireAuth = scope => (req, res, next) => { - apiLimiter(req, res, wrap(async () => { + apiLimiter(req, res, async () => { const status = { authenticated: false, @@ -78,7 +77,7 @@ const requireAuth = scope => (req, res, next) => { return res.status(403).json({message: 'Forbidden.'}); next(); - })); + }); }; module.exports.checkSession = checkSession; diff --git a/app/util/upload/multipart.js b/app/util/upload/multipart.js index 1d06ae9..7b54476 100644 --- a/app/util/upload/multipart.js +++ b/app/util/upload/multipart.js @@ -2,12 +2,11 @@ const Busboy = require('busboy'); const is = require('type-is'); const config = require('config'); -const wrap = require('../wrap'); const auth = require('../auth'); const disk = require('./disk'); const identifier = require('./id'); -const uploadMultipart = wrap(async (req, res, next) => { +const uploadMultipart = async (req, res, next) => { if (!is(req, ['multipart'])) return res.status(400).json({message: 'Bad request.'}); @@ -108,6 +107,6 @@ const uploadMultipart = wrap(async (req, res, next) => { busboy.on('finished', () => done(null, {file: file})); req.pipe(busboy); -}); +}; module.exports = uploadMultipart; \ No newline at end of file diff --git a/app/util/verifyBody.js b/app/util/verifyBody.js index f96efe7..342f371 100644 --- a/app/util/verifyBody.js +++ b/app/util/verifyBody.js @@ -1,14 +1,13 @@ const verify = require('./verify.js'); -const wrap = require('./wrap.js'); // Verifies the entire request body is well formed -const verifyBody = expected => wrap(async (req, res, next) => { +const verifyBody = expected => async (req, res, next) => { try { await Promise.all(expected.map(e => verify(req.body[e.name], e))); next(); } catch(err) { res.status(err.code).json({message: err.message}); } -}); +}; module.exports = verifyBody; diff --git a/app/util/verifyQuery.js b/app/util/verifyQuery.js index b399bac..67fb8c4 100644 --- a/app/util/verifyQuery.js +++ b/app/util/verifyQuery.js @@ -1,14 +1,13 @@ const verify = require('./verify.js'); -const wrap = require('./wrap.js'); // Verifies the entire request query is well formed -const verifyQuery = expected => wrap(async (req, res, next) => { +const verifyQuery = expected => async (req, res, next) => { try { await Promise.all(expected.map(e => verify(req.query[e.name], e))); next(); } catch(err) { res.status(err.code).json({message: err.message}); } -}); +}; module.exports = verifyQuery; diff --git a/app/util/wrap.js b/app/util/wrap.js deleted file mode 100644 index dd57b0f..0000000 --- a/app/util/wrap.js +++ /dev/null @@ -1,5 +0,0 @@ -// Wraps an async middleware function to catch promise rejection -const wrap = fn => - (req, res, next) => Promise.resolve(fn(req, res, next)).catch(next); - -module.exports = wrap; \ No newline at end of file