hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
v1.18.x
Julian Lam 11 years ago
parent b6fdc5595d fda68bc5dd
commit f1412193ef
7 changed files with 98 additions and 78 deletions
Show Stats Download Patch File Download Diff File

2
app.js
Unescape Escape View File

@ -97,6 +97,8 @@
notifications = require('./src/notifications'),
upgrade = require('./src/upgrade');
templates.setGlobal('relative_path', nconf.get('relative_path'));
upgrade.check(function(schema_ok) {
if (schema_ok || nconf.get('check-schema') === false) {
websockets.init(SocketIO);

4
public/src/app.js
Unescape Escape View File

@ -23,7 +23,7 @@ var socket,
} else {
var max_reconnection_attemps = 5;
var reconnection_delay = 200;
socket = io.connect(RELATIVE_PATH, {
socket = io.connect('', {
'max reconnection attempts': max_reconnection_attemps,
'reconnection delay': reconnection_delay
});
@ -468,6 +468,8 @@ var socket,
app.alternatingTitle('');
});
templates.setGlobal('relative_path', RELATIVE_PATH);
});
showWelcomeMessage = location.href.indexOf('loggedin') !== -1;

15
public/src/templates.js
Unescape Escape View File

@ -6,7 +6,9 @@
available_templates = [],
parsed_variables = {};
module.exports = templates = {};
module.exports = templates = {
"globals": {}
};
try {
fs = require('fs');
@ -242,6 +244,10 @@
parsed_variables[key] = value;
}
templates.setGlobal = function(key, value) {
templates.globals[key] = value;
}
//modified from https://github.com/psychobunny/dcp.templates
var parse = function (data) {
var self = this;
@ -282,6 +288,13 @@
var template = this.html,
regex, block;
// registering globals
for (var g in templates.globals) {
if (templates.globals.hasOwnProperty(g)) {
data[g] = data[g] || templates.globals[g];
}
}
return (function parse(data, namespace, template, blockInfo) {
if (!data || data.length == 0) {
template = '';

2
src/routes/admin.js
Unescape Escape View File

@ -20,7 +20,7 @@ var nconf = require('nconf'),
Admin.isAdmin = function (req, res, next) {
user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) {
if (!isAdmin) {
res.redirect('/403');
res.redirect(403, '/403');
} else {
next();
}

1
src/routes/api.js
Unescape Escape View File

@ -18,6 +18,7 @@ var path = require('path'),
(function (Api) {
Api.createRoutes = function (app) {
app.namespace('/api', function () {
app.get('/get_templates_listing', function (req, res) {
utils.walk(path.join(__dirname, '../../', 'public/templates'), function (err, data) {

148
src/routes/authentication.js
Unescape Escape View File

@ -126,92 +126,94 @@
}
Auth.createRoutes = function(app) {
app.post('/logout', function(req, res) {
if (req.user && req.user.uid > 0) {
winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
app.namespace(nconf.get('relative_path'), function () {
app.post('/logout', function(req, res) {
if (req.user && req.user.uid > 0) {
winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
var ws = require('./../websockets');
ws.logoutUser(req.user.uid);
var ws = require('./../websockets');
ws.logoutUser(req.user.uid);
req.logout();
}
res.send(200)
});
req.logout();
}
for (var i in login_strategies) {
var strategy = login_strategies[i];
app.get(strategy.url, passport.authenticate(strategy.name, {
scope: strategy.scope
}));
app.get(strategy.callbackURL, passport.authenticate(strategy.name, {
successRedirect: '/',
failureRedirect: '/login'
}));
}
app.get('/reset/:code', function(req, res) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('reset/' + req.params.code) + templates['footer']);
res.send(200)
});
});
app.get('/reset', function(req, res) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('reset') + templates['footer']);
});
});
for (var i in login_strategies) {
var strategy = login_strategies[i];
app.get(strategy.url, passport.authenticate(strategy.name, {
scope: strategy.scope
}));
app.post('/login', function(req, res, next) {
passport.authenticate('local', function(err, user, info) {
if (err) {
return next(err);
}
if (!user) {
return res.send({
success: false,
message: info.message
});
}
req.login({
uid: user.uid
}, function() {
res.send({
success: true,
message: 'authentication succeeded'
});
app.get(strategy.callbackURL, passport.authenticate(strategy.name, {
successRedirect: '/',
failureRedirect: '/login'
}));
}
app.get('/reset/:code', function(req, res) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('reset/' + req.params.code) + templates['footer']);
});
})(req, res, next);
});
});
app.post('/register', function(req, res) {
if(meta.config.allowRegistration !== undefined && parseInt(meta.config.allowRegistration, 10) === 0) {
return res.send(403);
}
app.get('/reset', function(req, res) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('reset') + templates['footer']);
});
});
user.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
if (err === null && uid) {
app.post('/login', function(req, res, next) {
passport.authenticate('local', function(err, user, info) {
if (err) {
return next(err);
}
if (!user) {
return res.send({
success: false,
message: info.message
});
}
req.login({
uid: uid
uid: user.uid
}, function() {
require('./../websockets').emitUserCount();
if(req.body.referrer)
res.redirect(req.body.referrer);
else
res.redirect(nconf.get('relative_path') + '/');
res.send({
success: true,
message: 'authentication succeeded'
});
});
} else {
res.redirect(nconf.get('relative_path') + '/register');
})(req, res, next);
});
app.post('/register', function(req, res) {
if(meta.config.allowRegistration !== undefined && parseInt(meta.config.allowRegistration, 10) === 0) {
return res.send(403);
}
user.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
if (err === null && uid) {
req.login({
uid: uid
}, function() {
require('./../websockets').emitUserCount();
if(req.body.referrer)
res.redirect(req.body.referrer);
else
res.redirect(nconf.get('relative_path') + '/');
});
} else {
res.redirect(nconf.get('relative_path') + '/register');
}
});
});
});
}

4
src/webserver.js
Unescape Escape View File

@ -839,8 +839,8 @@ var path = require('path'),
app[routes[route].method || 'get'](routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
app.build_header({
req: options.req,
res: options.res
req: options.req || req,
res: options.res || res
}, function (err, header) {
res.send(header + options.content + templates.footer);
});

Write Preview
Loading…
Cancel
Save