From 0fffde67b5edad84fe545bc98ba66f24d7e61221 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 8 Feb 2017 14:24:09 -0700 Subject: [PATCH] Undeprecate `/uploads` --- src/routes/index.js | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/routes/index.js b/src/routes/index.js index 84e0ce5301..52d0735877 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -144,21 +144,25 @@ module.exports = function (app, middleware, hotswapIds) { app.use(middleware.privateUploads); + var statics = [ + { route: '/assets', path: path.join(__dirname, '../../build/public') }, + { route: '/assets', path: path.join(__dirname, '../../public') }, + { route: '/plugins', path: path.join(__dirname, '../../build/public/plugins') }, + ]; + var staticOptions = { + maxAge: app.enabled('cache') ? 5184000000 : 0, + }; + if (path.resolve(__dirname, '../../public/uploads') !== nconf.get('upload_path')) { - app.use(relativePath + '/assets/uploads', express.static(nconf.get('upload_path'), { - maxAge: app.enabled('cache') ? 5184000000 : 0 - })); + statics.unshift({ route: '/assets/uploads', path: nconf.get('upload_path') }); } - app.use(relativePath + '/assets', express.static(path.join(__dirname, '../../build/public'), { - maxAge: app.enabled('cache') ? 5184000000 : 0 - })); - app.use(relativePath + '/assets', express.static(path.join(__dirname, '../../public'), { - maxAge: app.enabled('cache') ? 5184000000 : 0 - })); - // TODO: deprecate? - app.use(relativePath + '/plugins', express.static(path.join(__dirname, '../../build/public/plugins'), { - maxAge: app.enabled('cache') ? 5184000000 : 0 - })); + + statics.forEach(function (obj) { + app.use(relativePath + obj.route, express.static(obj.path, staticOptions)); + }); + app.use(relativePath + '/uploads', function (req, res) { + res.redirect(relativePath + '/assets/uploads' + req.path + '?' + meta.config['cache-buster']); + }); // DEPRECATED var deprecatedPaths = [ @@ -170,7 +174,6 @@ module.exports = function (app, middleware, hotswapIds) { '/logo.png', '/favicon.ico', '/vendor/', - '/uploads/', '/templates/', '/src/', '/images/',