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

error handling and proper handling of missing settings on first install

Browse Source
This commit is contained in:
Julian Lam 2014-03-19 08:42:01 -04:00
parent 18acd99a51
commit 95a2bdd950
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
library.js
View File

@ -28,18 +28,16 @@
app.get('/admin/plugins/sso-oauth', middleware.admin.buildHeader, render); app.get('/admin/plugins/sso-oauth', middleware.admin.buildHeader, render);
app.get('/api/admin/plugins/sso-oauth', render); app.get('/api/admin/plugins/sso-oauth', render);
meta.settings.get('sso-oauth', function(err, settings) {
if (settings['oauth:type'] === '2') {
passportOAuth = require('passport-oauth').OAuth2Strategy;
} else if (settings['oauth:type'] === '1') {
passportOAuth = require('passport-oauth').OAuthStrategy;
}
});
}; };
OAuth.getStrategy = function(strategies, callback) { OAuth.getStrategy = function(strategies, callback) {
meta.settings.get('sso-oauth', function(err, settings) { meta.settings.get('sso-oauth', function(err, settings) {
if (err) {
winston.error('[plugins/sso-oauth] Could not retrieve OAuth settings: ' + err.message);
} else if (!settings) {
settings = {};
}
var oAuthKeys = ['oauth:reqTokenUrl', 'oauth:accessTokenUrl', 'oauth:authUrl', 'oauth:key', 'oauth:secret'], var oAuthKeys = ['oauth:reqTokenUrl', 'oauth:accessTokenUrl', 'oauth:authUrl', 'oauth:key', 'oauth:secret'],
oAuth2Keys = ['oauth2:authUrl', 'oauth2:tokenUrl', 'oauth2:id', 'oauth2:secret'], oAuth2Keys = ['oauth2:authUrl', 'oauth2:tokenUrl', 'oauth2:id', 'oauth2:secret'],
configOk = oAuthKeys.every(function(key) { configOk = oAuthKeys.every(function(key) {
@ -49,6 +47,12 @@
}), }),
opts; opts;
if (settings['oauth:type'] === '2') {
passportOAuth = require('passport-oauth').OAuth2Strategy;
} else if (settings['oauth:type'] === '1') {
passportOAuth = require('passport-oauth').OAuthStrategy;
}
if (passportOAuth && configOk) { if (passportOAuth && configOk) {
if (settings['oauth:type'] === '1') { if (settings['oauth:type'] === '1') {
// OAuth options // OAuth options
@ -102,16 +106,16 @@
// Alter this section to include whatever data is necessary // Alter this section to include whatever data is necessary
// NodeBB requires the following: id, displayName, emails, e.g.: // NodeBB requires the following: id, displayName, emails, e.g.:
// profile.id = json.id; profile.id = json.id;
// profile.displayName = json.name; profile.displayName = json.name;
// profile.emails = [{ value: json.email }]; profile.emails = [{ value: json.email }];
// Find out what is available by uncommenting this line: // Find out what is available by uncommenting this line:
// console.log(json); // console.log(json);
// 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
console.log('===\nAt this point, you\'ll need to customise the above section to id, displayName, and emails into the "profile" object.\n==='); // console.log('===\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 done(new Error('Congrats! So far so good -- please see server log for details'));
done(null, profile); done(null, profile);
} catch(e) { } catch(e) {