From 51b38c4c55da11191bdffc01f74b3756d709f79c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 28 Nov 2013 10:30:29 -0500 Subject: [PATCH] plugins - added filter:auth.init hook to add additional login strategies; fixed callbackURL --- src/routes/authentication.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/routes/authentication.js b/src/routes/authentication.js index 7f21ee3cac..39aacba9e5 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -8,6 +8,7 @@ nconf = require('nconf'), meta = require('../meta'), user = require('../user'), + plugins = require('../plugins'), winston = require('winston'), login_module = require('./../login.js'); @@ -18,6 +19,14 @@ }); })); + plugins.ready(function() { + plugins.fireHook('filter:auth.init', login_strategies, function(err) { + if (err) { + winston.error('filter:auth.init - plugin failure'); + } + }); + }); + if (meta.config['social:twitter:key'] && meta.config['social:twitter:secret']) { passport.use(new passportTwitter({ consumerKey: meta.config['social:twitter:key'], @@ -35,7 +44,7 @@ login_strategies.push({ name: 'twitter', url: '/auth/twitter', - callbackURL: '/auth/twitter/callback', + callbackURL: nconf.get('url') + '/auth/twitter/callback', icon: 'twitter', scope: '' }); @@ -58,7 +67,7 @@ login_strategies.push({ name: 'google', url: '/auth/google', - callbackURL: '/auth/google/callback', + callbackURL: nconf.get('url') + '/auth/google/callback', icon: 'google-plus', scope: 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email' }); @@ -81,7 +90,7 @@ login_strategies.push({ name: 'facebook', url: '/auth/facebook', - callbackURL: '/auth/facebook/callback', + callbackURL: nconf.get('url') + '/auth/facebook/callback', icon: 'facebook', scope: 'email' }); @@ -133,7 +142,6 @@ })); } - app.get('/reset/:code', function(req, res) { app.build_header({ req: req,