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

create auth routes only after plugin system is enabled and auth.init hook is fired

Browse Source
This commit is contained in:
psychobunny
2013-11-28 11:13:03 -05:00
parent 78b65c0b12
commit b7aea63c53
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/authentication.js
View File

@@ -24,6 +24,8 @@
if (err) { if (err) {
winston.error('filter:auth.init - plugin failure'); winston.error('filter:auth.init - plugin failure');
} }
Auth.createRoutes(Auth.app);
}); });
}); });
@@ -31,7 +33,7 @@
passport.use(new passportTwitter({ passport.use(new passportTwitter({
consumerKey: meta.config['social:twitter:key'], consumerKey: meta.config['social:twitter:key'],
consumerSecret: meta.config['social:twitter:secret'], consumerSecret: meta.config['social:twitter:secret'],
callbackURL: nconf.get('url') + 'auth/twitter/callback' callbackURL: 'auth/twitter/callback'
}, function(token, tokenSecret, profile, done) { }, function(token, tokenSecret, profile, done) {
login_module.loginViaTwitter(profile.id, profile.username, profile.photos, function(err, user) { login_module.loginViaTwitter(profile.id, profile.username, profile.photos, function(err, user) {
if (err) { if (err) {
@@ -44,7 +46,7 @@
login_strategies.push({ login_strategies.push({
name: 'twitter', name: 'twitter',
url: '/auth/twitter', url: '/auth/twitter',
callbackURL: nconf.get('url') + '/auth/twitter/callback', callbackURL: '/auth/twitter/callback',
icon: 'twitter', icon: 'twitter',
scope: '' scope: ''
}); });
@@ -54,7 +56,7 @@
passport.use(new passportGoogle({ passport.use(new passportGoogle({
clientID: meta.config['social:google:id'], clientID: meta.config['social:google:id'],
clientSecret: meta.config['social:google:secret'], clientSecret: meta.config['social:google:secret'],
callbackURL: nconf.get('url') + 'auth/google/callback' callbackURL: 'auth/google/callback'
}, function(accessToken, refreshToken, profile, done) { }, function(accessToken, refreshToken, profile, done) {
login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) { login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
if (err) { if (err) {
@@ -116,6 +118,10 @@
return login_strategies; return login_strategies;
} }
Auth.registerApp = function(app) {
Auth.app = app;
}
Auth.createRoutes = function(app) { Auth.createRoutes = function(app) {
app.post('/logout', function(req, res) { app.post('/logout', function(req, res) {
if (req.user && req.user.uid > 0) { if (req.user && req.user.uid > 0) {

2
src/webserver.js
View File

@@ -348,7 +348,7 @@ var path = require('path'),
app.namespace(nconf.get('relative_path'), function () { app.namespace(nconf.get('relative_path'), function () {
auth.createRoutes(app); auth.registerApp(app);
admin.createRoutes(app); admin.createRoutes(app);
userRoute.createRoutes(app); userRoute.createRoutes(app);
apiRoute.createRoutes(app); apiRoute.createRoutes(app);