Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 12:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

one final push, cleanup + organize + lint; made feeds/meta/plugins routes follow same pattern as other route files

Browse Source
This commit is contained in:
psychobunny
2014-03-05 17:06:24 -05:00
parent 1dbc47b890
commit c0cd6148f4
9 changed files with 663 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/middleware/index.js
View File

@@ -16,9 +16,7 @@ var templates = require('./../../public/src/templates'),
var middleware = {};
/*
* Helper functions
*/
function routeThemeScreenshots(app, themes) {
var screenshotPath;
@@ -170,6 +168,9 @@ function catch404(req, res, next) {
}
}
module.exports = function(app, data) {
middleware = require('./middleware')(app);

210
src/routes/admin.js
View File

@@ -22,7 +22,6 @@ var nconf = require('nconf'),
utils = require('./../../public/src/utils'),
templates = require('./../../public/src/templates');
var Admin = {};
function uploadImage(filename, req, res) {
function done(err, image) {
@@ -45,6 +44,89 @@ function uploadImage(filename, req, res) {
}
}
function uploadCategoryPicture(req, res, next) {
if (!req.user) {
return res.redirect('/403');
}
var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'],
params = null, er;
try {
params = JSON.parse(req.body.params);
} catch (e) {
er = {
error: 'Error uploading file! Error :' + e.message
};
return res.send(req.xhr ? er : JSON.stringify(er));
}
if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
er = {
error: 'Allowed image types are png, jpg and gif!'
};
res.send(req.xhr ? er : JSON.stringify(er));
return;
}
var filename = 'category-' + params.cid + path.extname(req.files.userPhoto.name);
uploadImage(filename, req, res);
}
function uploadFavicon(req, res, next) {
if (!req.user) {
return res.redirect('/403');
}
var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon'],
er;
if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
er = {error: 'You can only upload icon file type!'};
res.send(req.xhr ? er : JSON.stringify(er));
return;
}
file.saveFileToLocal('favicon.ico', req.files.userPhoto.path, function(err, image) {
fs.unlink(req.files.userPhoto.path);
if(err) {
er = {error: err.message};
return res.send(req.xhr ? er : JSON.stringify(er));
}
var rs = {path: image.url};
res.send(req.xhr ? rs : JSON.stringify(rs));
});
}
function uploadLogo(req, res, next) {
if (!req.user) {
return res.redirect('/403');
}
var allowedTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif'],
er;
if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
er = {error: 'Allowed image types are png, jpg and gif!'};
res.send(req.xhr ? er : JSON.stringify(er));
return;
}
var filename = 'site-logo' + path.extname(req.files.userPhoto.name);
uploadImage(filename, req, res);
}
function getUsersCSV(req, res, next) {
user.getUsersCSV(function(err, data) {
res.attachment('users.csv');
res.setHeader('Content-Type', 'text/csv');
res.end(data);
});
}
module.exports = function(app, middleware, controllers) {
app.all('/api/admin/*', middleware.admin.isAdmin, middleware.prepareAPI);
app.all('/admin/*', middleware.admin.isAdmin);
@@ -104,129 +186,11 @@ module.exports = function(app, middleware, controllers) {
app.get('/api/admin/groups', controllers.admin.groups.get);
app.namespace('/admin', function () {
app.post('/category/uploadpicture', function(req, res) {
if (!req.user) {
return res.redirect('/403');
}
app.get('/users/csv', getUsersCSV);
var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'],
params = null, er;
try {
params = JSON.parse(req.body.params);
} catch (e) {
er = {
error: 'Error uploading file! Error :' + e.message
};
return res.send(req.xhr ? er : JSON.stringify(er));
}
if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
er = {
error: 'Allowed image types are png, jpg and gif!'
};
res.send(req.xhr ? er : JSON.stringify(er));
return;
}
var filename = 'category-' + params.cid + path.extname(req.files.userPhoto.name);
uploadImage(filename, req, res);
});
app.post('/uploadfavicon', function(req, res) {
if (!req.user) {
return res.redirect('/403');
}
var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon'],
er;
if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
er = {error: 'You can only upload icon file type!'};
res.send(req.xhr ? er : JSON.stringify(er));
return;
}
file.saveFileToLocal('favicon.ico', req.files.userPhoto.path, function(err, image) {
fs.unlink(req.files.userPhoto.path);
if(err) {
er = {error: err.message};
return res.send(req.xhr ? er : JSON.stringify(er));
}
var rs = {path: image.url};
res.send(req.xhr ? rs : JSON.stringify(rs));
});
});
app.post('/uploadlogo', function(req, res) {
if (!req.user) {
return res.redirect('/403');
}
var allowedTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif'],
er;
if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
er = {error: 'Allowed image types are png, jpg and gif!'};
res.send(req.xhr ? er : JSON.stringify(er));
return;
}
var filename = 'site-logo' + path.extname(req.files.userPhoto.name);
uploadImage(filename, req, res);
});
app.get('/users/csv', function(req, res) {
user.getUsersCSV(function(err, data) {
res.attachment('users.csv');
res.setHeader('Content-Type', 'text/csv');
res.end(data);
});
});
});
var custom_routes = {
'routes': [],
'api': []
};
plugins.ready(function() {
plugins.fireHook('filter:admin.create_routes', custom_routes, function(err, custom_routes) {
var route, routes = custom_routes.routes;
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
Admin.buildHeader(req, res, function (err, header) {
res.send(header + options.content + templates['admin/footer']);
});
});
});
}(route));
}
}
var apiRoutes = custom_routes.api;
for (route in apiRoutes) {
if (apiRoutes.hasOwnProperty(route)) {
(function(route) {
app[apiRoutes[route].method || 'get']('/api/admin' + apiRoutes[route].route, function(req, res) {
apiRoutes[route].callback(req, res, function(data) {
res.json(data);
});
});
}(route));
}
}
});
app.post('/category/uploadpicture', uploadCategoryPicture);
app.post('/uploadfavicon', uploadFavicon);
app.post('/uploadlogo', uploadLogo);
});
};

80
src/routes/api.js
View File

@@ -13,31 +13,12 @@ var path = require('path'),
meta = require('./../meta'),
plugins = require('./../plugins'),
utils = require('./../../public/src/utils'),
pkg = require('./../../package.json');
pkg = require('./../../package.json'),
customTemplates = [];
module.exports = function(app, middleware, controllers) {
app.namespace('/api', function () {
app.all('*', middleware.updateLastOnlineTime, middleware.prepareAPI);
app.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID);
app.get('/get_templates_listing', function (req, res) {
utils.walk(nconf.get('views_dir'), function (err, data) {
data = data.concat(app.get_custom_templates())
.filter(function(value, index, self) {
return self.indexOf(value) === index;
}).map(function(el) {
return el.replace(nconf.get('views_dir') + '/', '');
});
res.json(data);
});
});
app.get('/config', controllers.api.getConfig);
app.get('/search/:term', function (req, res, next) {
function searchTerm(req, res, next) {
if (!plugins.hasListeners('filter:search.query')) {
return res.redirect('/404');
}
@@ -93,9 +74,9 @@ module.exports = function(app, middleware, controllers) {
} else {
res.send(403);
}
});
}
function upload(req, res, filesIterator, next) {
function upload(req, res, filesIterator, next) {
if(!req.user) {
return res.json(403, {message:'not allowed'});
}
@@ -105,7 +86,6 @@ module.exports = function(app, middleware, controllers) {
return res.json(500, {message: 'invalid files'});
}
// multiple files
if(Array.isArray(files[0])) {
files = files[0];
}
@@ -123,18 +103,13 @@ module.exports = function(app, middleware, controllers) {
return res.send(500, err.message);
}
// if this was not a XMLHttpRequest (hence the req.xhr check http://expressjs.com/api.html#req.xhr)
// then most likely it's submit via the iFrame workaround, via the jquery.form plugin's ajaxSubmit()
// we need to send it as text/html so IE8 won't trigger a file download for the json response
// IE8 - send it as text/html so browser won't trigger a file download for the json response
// malsup.com/jquery/form/#file-upload
// Also, req.send is safe for both types, if the response was an object, res.send will automatically submit as application/json
// expressjs.com/api.html#res.send
res.send(200, req.xhr ? images : JSON.stringify(images));
});
}
}
app.post('/post/upload', function(req, res, next) {
function uploadPost(req, res, next) {
upload(req, res, function(file, next) {
if(file.type.match(/image./)) {
posts.uploadPostImage(file, next);
@@ -142,9 +117,9 @@ module.exports = function(app, middleware, controllers) {
posts.uploadPostFile(file, next);
}
}, next);
});
}
app.post('/topic/thumb/upload', function(req, res, next) {
function uploadThumb(req, res, next) {
upload(req, res, function(file, next) {
if(file.type.match(/image./)) {
topics.uploadTopicThumb(file, next);
@@ -152,13 +127,42 @@ module.exports = function(app, middleware, controllers) {
res.json(500, {message: 'Invalid File'});
}
}, next);
});
}
app.get('/categories/:cid/moderators', function(req, res) {
function getModerators(req, res, next) {
categories.getModerators(req.params.cid, function(err, moderators) {
res.json({moderators: moderators});
});
}
function getTemplatesListing(req, res, next) {
utils.walk(nconf.get('views_dir'), function (err, data) {
data = data.concat(customTemplates)
.filter(function(value, index, self) {
return self.indexOf(value) === index;
}).map(function(el) {
return el.replace(nconf.get('views_dir') + '/', '');
});
res.json(data);
});
}
module.exports = function(app, middleware, controllers) {
app.namespace('/api', function () {
app.all('*', middleware.updateLastOnlineTime, middleware.prepareAPI);
customTemplates = app.get_custom_templates();
app.get('/config', controllers.api.getConfig);
app.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID);
app.get('/get_templates_listing', getTemplatesListing);
app.get('/search/:term', searchTerm);
app.get('/categories/:cid/moderators', getModerators);
app.post('/post/upload', uploadPost);
app.post('/topic/thumb/upload', uploadThumb);
});
// this should be in the API namespace

16
src/routes/debug.js
View File

@@ -1,17 +1,16 @@
"use strict";
var user = require('./../user'),
categories = require('./../categories'),
topics = require('./../topics'),
posts = require('./../posts');
var DebugRoute = function(app) {
module.exports = function(app, middleware, controllers) {
app.namespace('/debug', function() {
app.get('/uid/:uid', function (req, res) {
if (!req.params.uid)
if (!req.params.uid) {
return res.redirect('/404');
}
user.getUserData(req.params.uid, function (err, data) {
if (data) {
@@ -53,12 +52,5 @@ var DebugRoute = function(app) {
}
});
});
app.get('/test', function(req, res) {
res.send(200);
});
});
};
module.exports = DebugRoute;

49
src/routes/feeds.js
View File

@@ -1,5 +1,6 @@
(function (Feeds) {
var posts = require('../posts'),
"use strict";
var posts = require('../posts'),
topics = require('../topics'),
categories = require('../categories'),
@@ -9,15 +10,7 @@
ThreadTools = require('../threadTools'),
CategoryTools = require('../categoryTools');
Feeds.createRoutes = function(app){
app.get('/topic/:topic_id.rss', hasTopicPrivileges, generateForTopic);
app.get('/category/:category_id.rss', hasCategoryPrivileges, generateForCategory);
app.get('/recent.rss', generateForRecent);
app.get('/popular.rss', generateForPopular);
};
function hasTopicPrivileges(req, res, next) {
function hasTopicPrivileges(req, res, next) {
var tid = req.params.topic_id;
var uid = req.user ? req.user.uid || 0 : 0;
@@ -32,9 +25,9 @@
return next();
});
}
}
function hasCategoryPrivileges(req, res, next) {
function hasCategoryPrivileges(req, res, next) {
var cid = req.params.category_id;
var uid = req.user ? req.user.uid || 0 : 0;
@@ -49,10 +42,10 @@
return next();
});
}
}
function generateForTopic(req, res, next) {
function generateForTopic(req, res, next) {
var tid = req.params.topic_id;
topics.getTopicWithPosts(tid, 0, 0, 25, function (err, topicData) {
@@ -98,9 +91,9 @@
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
});
};
}
function generateForCategory(req, res, next) {
function generateForCategory(req, res, next) {
var cid = req.params.category_id;
categories.getCategoryById(cid, 0, 25, 0, function (err, categoryData) {
@@ -117,7 +110,9 @@
});
// Add pubDate if category has topics
if (categoryData.topics.length > 0) feed.pubDate = new Date(parseInt(categoryData.topics[0].lastposttime, 10)).toUTCString();
if (categoryData.topics.length > 0) {
feed.pubDate = new Date(parseInt(categoryData.topics[0].lastposttime, 10)).toUTCString();
}
categoryData.topics.forEach(function(topicData) {
feed.item({
@@ -131,9 +126,9 @@
var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
});
};
}
function generateForRecent(req, res, next) {
function generateForRecent(req, res, next) {
topics.getLatestTopics(0, 0, 19, 'month', function (err, recentData) {
if(err){
return next(err);
@@ -164,9 +159,9 @@
var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
});
};
}
function generateForPopular(req, res, next) {
function generateForPopular(req, res, next) {
topics.getTopicsFromSet(0, 'topics:posts', 0, 19, function (err, popularData) {
if(err){
return next(err);
@@ -197,5 +192,11 @@
var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
});
};
}(exports));
}
module.exports = function(app, middleware, controllers){
app.get('/topic/:topic_id.rss', hasTopicPrivileges, generateForTopic);
app.get('/category/:category_id.rss', hasCategoryPrivileges, generateForCategory);
app.get('/recent.rss', generateForRecent);
app.get('/popular.rss', generateForPopular);
};

96
src/routes/index.js
View File

@@ -5,20 +5,19 @@ var nconf = require('nconf'),
meta = require('./../meta'),
plugins = require('./../plugins'),
metaRoute = require('./meta'),
apiRoute = require('./api'),
admin = require('./admin'),
feedsRoute = require('./feeds');
metaRoutes = require('./meta'),
apiRoutes = require('./api'),
adminRoutes = require('./admin'),
feedRoutes = require('./feeds'),
pluginRoutes = require('./plugins');
module.exports = function(app, middleware) {
app.namespace(nconf.get('relative_path'), function() {
//temp
metaRoute.createRoutes(app);
feedsRoute.createRoutes(app);
admin(app, middleware, controllers);
apiRoute(app, middleware, controllers);
adminRoutes(app, middleware, controllers);
metaRoutes(app, middleware, controllers);
apiRoutes(app, middleware, controllers);
feedRoutes(app, middleware, controllers);
/**
* Every view has an associated API route.
@@ -122,83 +121,10 @@ module.exports = function(app, middleware) {
app.get('/users/search', middleware.buildHeader, middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
app.get('/api/users/search', middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
/* Misc */
app.get('/sitemap.xml', controllers.sitemap);
app.get('/robots.txt', controllers.robots);
pluginRoutes(app, middleware, controllers);
// Other routes
require('./plugins')(app);
// Debug routes
if (process.env.NODE_ENV === 'development') {
require('./debug')(app);
require('./debug')(app, middleware, controllers);
}
var custom_routes = {
'routes': [],
'api': [],
'templates': []
};
app.get_custom_templates = function() {
return custom_routes.templates.map(function(tpl) {
return tpl.template;
});
};
plugins.ready(function() {
/*
* TO BE DEPRECATED post 0.4x
*/
plugins.fireHook('filter:server.create_routes', custom_routes, function(err, custom_routes) {
var route,
routes = custom_routes.routes;
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get'](routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
app.build_header({
req: options.req || req,
res: options.res || res
}, function (err, header) {
//res.send(header + options.content + templates.footer);
});
});
});
}(route));
}
}
var apiRoutes = custom_routes.api;
for (route in apiRoutes) {
if (apiRoutes.hasOwnProperty(route)) {
(function(route) {
app[apiRoutes[route].method || 'get']('/api' + apiRoutes[route].route, function(req, res) {
apiRoutes[route].callback(req, res, function(data) {
res.json(data);
});
});
}(route));
}
}
var templateRoutes = custom_routes.templates;
for (route in templateRoutes) {
if (templateRoutes.hasOwnProperty(route)) {
(function(route) {
app.get('/templates/' + templateRoutes[route].template, function(req, res) {
res.send(templateRoutes[route].content);
});
}(route));
}
}
});
});
});
};

63
src/routes/meta.js
View File

@@ -1,14 +1,38 @@
"use strict";
var path = require('path'),
nconf = require('nconf'),
less = require('less'),
meta = require('../meta'),
db = require('../database'),
plugins = require('../plugins');
plugins = require('../plugins'),
(function (Meta) {
Meta.createRoutes = function(app) {
app.get('/stylesheet.css', function(req, res) {
minificationEnabled = false;
function sendMinifiedJS(req, res, next) {
function sendCached() {
return res.type('text/javascript').send(meta.js.cache);
}
if (meta.js.cache) {
sendCached();
} else {
if (minificationEnabled) {
meta.js.minify(function() {
sendCached();
});
} else {
// Compress only
meta.js.concatenate(function() {
sendCached();
});
}
}
}
function sendStylesheet(req, res, next) {
if (meta.css.cache) {
res.type('text/css').send(200, meta.css.cache);
return;
@@ -42,26 +66,13 @@ var path = require('path'),
res.type('text/css').send(200, meta.css.cache);
});
});
});
}
app.get('/nodebb.min.js', function(req, res) {
var sendCached = function() {
return res.type('text/javascript').send(meta.js.cache);
}
if (meta.js.cache) {
sendCached();
} else {
if (app.enabled('minification')) {
meta.js.minify(function() {
sendCached();
});
} else {
// Compress only
meta.js.concatenate(function() {
sendCached();
});
}
}
});
};
})(exports);
module.exports = function(app, middleware, controllers) {
minificationEnabled = app.enabled('minification');
app.get('/stylesheet.css', sendStylesheet);
app.get('/nodebb.min.js', sendMinifiedJS);
app.get('/sitemap.xml', controllers.sitemap);
app.get('/robots.txt', controllers.robots);
};

119
src/routes/plugins.js
View File

@@ -6,9 +6,119 @@ var nconf = require('nconf'),
validator = require('validator'),
_ = require('underscore'),
async = require('async'),
plugins = require('../plugins'),
PluginRoutes = function(app) {
plugins = require('../plugins');
function setupPluginRoutes(app) {
var custom_routes = {
'routes': [],
'api': [],
'templates': []
};
app.get_custom_templates = function() {
return custom_routes.templates.map(function(tpl) {
return tpl.template;
});
};
plugins.ready(function() {
/*
* TO BE DEPRECATED post 0.4x and replaced with something that isn't as complicated as this...
*/
plugins.fireHook('filter:server.create_routes', custom_routes, function(err, custom_routes) {
var route,
routes = custom_routes.routes;
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get'](routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
app.build_header({
req: options.req || req,
res: options.res || res
}, function (err, header) {
//res.send(header + options.content + templates.footer);
});
});
});
}(route));
}
}
var apiRoutes = custom_routes.api;
for (route in apiRoutes) {
if (apiRoutes.hasOwnProperty(route)) {
(function(route) {
app[apiRoutes[route].method || 'get']('/api' + apiRoutes[route].route, function(req, res) {
apiRoutes[route].callback(req, res, function(data) {
res.json(data);
});
});
}(route));
}
}
var templateRoutes = custom_routes.templates;
for (route in templateRoutes) {
if (templateRoutes.hasOwnProperty(route)) {
(function(route) {
app.get('/templates/' + templateRoutes[route].template, function(req, res) {
res.send(templateRoutes[route].content);
});
}(route));
}
}
});
});
}
function setupPluginAdminRoutes(app) {
var custom_routes = {
'routes': [],
'api': []
};
plugins.ready(function() {
/*
* TO BE DEPRECATED post 0.4x and replaced with something that isn't as complicated as this...
*/
plugins.fireHook('filter:admin.create_routes', custom_routes, function(err, custom_routes) {
var route, routes = custom_routes.routes;
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
Admin.buildHeader(req, res, function (err, header) {
//res.send(header + options.content + templates['admin/footer']);
});
});
});
}(route));
}
}
var apiRoutes = custom_routes.api;
for (route in apiRoutes) {
if (apiRoutes.hasOwnProperty(route)) {
(function(route) {
app[apiRoutes[route].method || 'get']('/api/admin' + apiRoutes[route].route, function(req, res) {
apiRoutes[route].callback(req, res, function(data) {
res.json(data);
});
});
}(route));
}
}
});
});
}
module.exports = function(app, middleware, controllers) {
/**
* GET/PUT /plugins/fireHook to be deprecated after 0.4.x
*
@@ -73,6 +183,7 @@ var nconf = require('nconf'),
res.redirect('/404');
}
});
};
module.exports = PluginRoutes;
setupPluginRoutes(app);
setupPluginAdminRoutes(app);
};

7
src/webserver.js
View File

@@ -14,12 +14,7 @@ var path = require('path'),
plugins = require('./plugins'),
logger = require('./logger'),
middleware = require('./middleware'),
routes = require('./routes'),
admin = require('./routes/admin'),
apiRoute = require('./routes/api'),
feedsRoute = require('./routes/feeds'),
metaRoute = require('./routes/meta');
routes = require('./routes');
if(nconf.get('ssl')) {
server = require('https').createServer({