nodebb-plugin-sso-facebook 4.0.3 → 4.0.5

package/library.js

@@ -26,18 +26,15 @@
 	};
 
 	Facebook.init = function (params, callback) {
-		var hostHelpers = require.main.require('./src/routes/helpers');
+		const hostHelpers = require.main.require('./src/routes/helpers');
 
-		function render(req, res) {
+		hostHelpers.setupAdminPageRoute(params.router, '/admin/plugins/sso-facebook', function (req, res) {
 			res.render('admin/plugins/sso-facebook', {
 				baseUrl: nconf.get('url'),
 			});
-		}
-
-		params.router.get('/admin/plugins/sso-facebook', params.middleware.admin.buildHeader, render);
-		params.router.get('/api/admin/plugins/sso-facebook', render);
+		});
 
-		hostHelpers.setupPageRoute(params.router, '/deauth/facebook', params.middleware, [params.middleware.requireUser], function (req, res) {
+		hostHelpers.setupPageRoute(params.router, '/deauth/facebook', [params.middleware.requireUser], function (req, res) {
 			res.render('plugins/sso-facebook/deauth', {
 				service: "Facebook",
 			});
@@ -227,6 +224,7 @@
 
 	Facebook.login = function (fbid, name, email, picture, accessToken, refreshToken, profile, callback) {
 		winston.verbose("Facebook.login fbid, name, email, picture: " + fbid + ", " + name + ", " + email + ", " + picture);
+		const autoConfirm = Facebook.settings && Facebook.settings.autoconfirm === "on" ? 1 : 0;
 
 		Facebook.getUidByFbid(fbid, function (err, uid) {
 			if (err) {
@@ -242,14 +240,14 @@
 				});
 			} else {
 				// New User
-				var success = function (uid) {
+				var success = async (uid) => {
 					// Save facebook-specific information to the user
 					user.setUserField(uid, 'fbid', fbid);
 					db.setObjectField('fbid:uid', fbid, uid);
-					var autoConfirm = Facebook.settings && Facebook.settings.autoconfirm === "on" ? 1 : 0;
 
 					if (autoConfirm) {
-						user.email.confirmByUid(uid);
+						await user.setUserField(uid, 'email', email);
+						await user.email.confirmByUid(uid);
 					}
 
 					// Save their photo, if present
@@ -276,7 +274,7 @@
 							return callback(new Error('[[error:sso-registration-disabled, Facebook]]'));
 						}
 
-						user.create({ username: name, email: email }, function (err, uid) {
+						user.create({ username: name, email: !autoConfirm ? email : undefined }, function (err, uid) {
 							if (err) {
 								return callback(err);
 							}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-sso-facebook",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "NodeBB Facebook SSO",
   "main": "library.js",
   "repository": {