IcyNetwork/nodebb-plugin-sso-oauth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
Julian Lam 2014-08-15 22:41:49 -04:00
parent 08338c9467
commit 3efedd0eed
2 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
library.js
View File

@ -27,22 +27,21 @@
tokenURL: '', tokenURL: '',
clientID: '', clientID: '',
clientSecret: '' clientSecret: ''
} },
userRoute: ''
}), }),
configOk = false, configOk = false,
OAuth = {}, passportOAuth; OAuth = {}, passportOAuth, opts;
OAuth.init = function(app, middleware, controller, callback) { if (!constants.name) {
if (!constants.name) { winston.error('[sso-oauth] Please specify a name for your OAuth provider (library.js:17)');
winston.error('[sso-oauth] Please specify a name for your OAuth provider (library.js:17)'); } else if (!constants.type || (constants.type !== 'oauth' && constants.type !== 'oauth2')) {
} else if (!constants.type || (constants.type !== 'oauth' && constants.type !== 'oauth2')) { winston.error('[sso-oauth] Please specify an OAuth strategy to utilise (library.js:16)');
winston.error('[sso-oauth] Please specify an OAuth strategy to utilise (library.js:16)'); } else if (!constants.userRoute) {
} else { winston.error('[sso-oauth] User Route required (library.js:31)');
configOk = true; } else {
} configOk = true;
}
callback();
};
OAuth.getStrategy = function(strategies, callback) { OAuth.getStrategy = function(strategies, callback) {
if (configOk) { if (configOk) {
@ -51,15 +50,18 @@
if (constants.type === 'oauth') { if (constants.type === 'oauth') {
// OAuth options // OAuth options
opts = constants.oauth; opts = constants.oauth;
opts.callbackURL = nconf.get('url') + '/auth/' + constants.name + '/callback';
passportOAuth.Strategy.prototype.userProfile = function(token, secret, params, done) { passportOAuth.Strategy.prototype.userProfile = function(token, secret, params, done) {
this._oauth.get(settings['oauth:userProfileUrl'], token, secret, function(err, body, res) { this._oauth.get(constants.userRoute, token, secret, function(err, body, res) {
if (err) { return done(new InternalOAuthError('failed to fetch user profile', err)); } if (err) { return done(new InternalOAuthError('failed to fetch user profile', err)); }
try { try {
var json = JSON.parse(body); var json = JSON.parse(body);
OAuth.parseUserReturn(body, function(err, profile) { OAuth.parseUserReturn(body, function(err, profile) {
profile.provider = constants.name if (err) return done(err);
profile.provider = constants.name;
done(null, profile);
}); });
} catch(e) { } catch(e) {
done(e); done(e);
@ -68,17 +70,19 @@
}; };
} else if (constants.type === 'oauth2') { } else if (constants.type === 'oauth2') {
// OAuth 2 options // OAuth 2 options
opts = constants.settings.oauth2; opts = constants.oauth2;
opts.callbackURL = nconf.get('url') + '/auth/' + constants.name + '/callback'; opts.callbackURL = nconf.get('url') + '/auth/' + constants.name + '/callback';
passportOAuth.Strategy.prototype.userProfile = function(accessToken, done) { passportOAuth.Strategy.prototype.userProfile = function(accessToken, done) {
this._oauth2.get(settings['oauth:userProfileUrl'], accessToken, function(err, body, res) { this._oauth2.get(constants.userRoute, accessToken, function(err, body, res) {
if (err) { return done(new InternalOAuthError('failed to fetch user profile', err)); } if (err) { return done(new InternalOAuthError('failed to fetch user profile', err)); }
try { try {
var json = JSON.parse(body); var json = JSON.parse(body);
OAuth.parseUserReturn(body, function(err, profile) { OAuth.parseUserReturn(body, function(err, profile) {
profile.provider = constants.name if (err) return done(err);
profile.provider = constants.name;
done(null, profile);
}); });
} catch(e) { } catch(e) {
done(e); done(e);
@ -105,7 +109,7 @@
name: constants.name, name: constants.name,
url: '/auth/' + constants.name, url: '/auth/' + constants.name,
callbackURL: '/auth/' + constants.name + '/callback', callbackURL: '/auth/' + constants.name + '/callback',
icon: 'check', icon: 'fa-check-square',
scope: (constants.scope || '').split(',') scope: (constants.scope || '').split(',')
}); });
@ -133,9 +137,9 @@
// Delete or comment out the next TWO (2) lines when you are ready to proceed // Delete or comment out the next TWO (2) lines when you are ready to proceed
process.stdout.write('===\nAt this point, you\'ll need to customise the above section to id, displayName, and emails into the "profile" object.\n==='); process.stdout.write('===\nAt this point, you\'ll need to customise the above section to id, displayName, and emails into the "profile" object.\n===');
return done(new Error('Congrats! So far so good -- please see server log for details')); return callback(new Error('Congrats! So far so good -- please see server log for details'));
done(null, profile); callback(null, profile);
} }
OAuth.login = function(payload, callback) { OAuth.login = function(payload, callback) {
@ -202,16 +206,6 @@
}); });
}; };
OAuth.addMenuItem = function(custom_header, callback) {
custom_header.authentication.push({
"route": constants.admin.route,
"icon": constants.admin.icon,
"name": constants.name
});
callback(null, custom_header);
};
OAuth.deleteUserData = function(uid, callback) { OAuth.deleteUserData = function(uid, callback) {
async.waterfall([ async.waterfall([
async.apply(User.getUserField, uid, constants.name + 'Id'), async.apply(User.getUserField, uid, constants.name + 'Id'),

1
plugin.json
View File

@ -5,7 +5,6 @@
"url": "https://github.com/julianlam/nodebb-plugin-sso-oauth", "url": "https://github.com/julianlam/nodebb-plugin-sso-oauth",
"library": "./library.js", "library": "./library.js",
"hooks": [ "hooks": [
{ "hook": "static:app.load", "method": "init" },
{ "hook": "filter:user.delete", "method": "deleteUserData" }, { "hook": "filter:user.delete", "method": "deleteUserData" },
{ "hook": "filter:auth.init", "method": "getStrategy" } { "hook": "filter:auth.init", "method": "getStrategy" }
], ],