nodebb-plugin-sso-facebook 4.0.5 → 4.1.1

package/library.js

@@ -30,6 +30,7 @@
 
 		hostHelpers.setupAdminPageRoute(params.router, '/admin/plugins/sso-facebook', function (req, res) {
 			res.render('admin/plugins/sso-facebook', {
+				title: constants.name,
 				baseUrl: nconf.get('url'),
 			});
 		});
@@ -205,9 +206,10 @@
 		async.waterfall([
 			// Reset email confirm throttle
 			async.apply(db.delete, 'uid:' + userData.uid + ':confirm:email:sent'),
-			async.apply(user.getUserField, userData.uid, 'email'),
+			function (next) {
+				user.getUserField(userData.uid, 'email', next);
+			},
 			function (email, next) {
-				// Remove the old email from sorted set reference
 				db.sortedSetRemove('email:uid', email, next);
 			},
 			async.apply(user.setUserField, userData.uid, 'email', data.email),
@@ -308,24 +310,13 @@
 		callback(null, custom_header);
 	};
 
-	Facebook.deleteUserData = function (data, callback) {
-		var uid = data.uid;
-
-		async.waterfall([
-			async.apply(user.getUserField, uid, 'fbid'),
-			function (oAuthIdToDelete, next) {
-				db.deleteObjectField('fbid:uid', oAuthIdToDelete, next);
-			},
-			function (next) {
-				db.deleteObjectField('user:' + uid, 'fbid', next);
-			},
-		], function (err) {
-			if (err) {
-				winston.error('[sso-facebook] Could not remove OAuthId data for uid ' + uid + '. Error: ' + err);
-				return callback(err);
-			}
-			callback(null, uid);
-		});
+	Facebook.deleteUserData = async function (data) {
+		const { uid } = data;
+		const fbid = await user.getUserField(uid, 'fbid');
+		if (fbid) {
+			await db.deleteObjectField('fbid:uid', oAuthIdToDelete);
+			await db.deleteObjectField('user:' + uid, 'fbid');
+		}
 	};
 
 	module.exports = Facebook;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-sso-facebook",
-  "version": "4.0.5",
+  "version": "4.1.1",
   "description": "NodeBB Facebook SSO",
   "main": "library.js",
   "repository": {
@@ -29,6 +29,6 @@
     "passport-facebook": "~1.0.2"
   },
   "nbbpm": {
-    "compatibility": "^3.0.0"
+    "compatibility": "^4.0.0"
   }
 }

package/static/lib/admin.js

@@ -1,4 +1,4 @@
-define('admin/plugins/sso-facebook', ['settings'], function(Settings) {
+define('admin/plugins/sso-facebook', ['settings', 'alerts'], function(Settings, alerts) {
 	'use strict';
 	/* globals $, app, socket, require */
 
@@ -9,7 +9,7 @@ define('admin/plugins/sso-facebook', ['settings'], function(Settings) {
 
 		$('#save').on('click', function() {
 			Settings.save('sso-facebook', $('.sso-facebook-settings'), function() {
-				app.alert({
+				alerts.alert({
 					type: 'success',
 					alert_id: 'sso-facebook-saved',
 					title: 'Settings Saved',

package/templates/admin/plugins/sso-facebook.tpl

@@ -1,54 +1,51 @@
-<div class="row">
-	<div class="col-12">
-		<div class="card">
-			<div class="card-header">Facebook Social Authentication</div>
-			<div class="card-body">
-				<p>
-					Create a <strong>Facebook Application</strong> via the
-					<a href="https://developers.facebook.com/apps/">Facebook Developers Page</a> and
-					then paste your application details here.
-				</p>
-				<ul>
-					<li>
-						You will need to enable <strong>"Client OAuth Login"</strong> and <strong>"Web OAuth Login"</strong>
-					from the "Facebook Login" product
-					</li>
-					<li>
-						You will need to paste <code>{baseUrl}/auth/facebook/callback</code> into the
-						<strong>"Valid OAuth Redirect URIs"</strong> field.
-					</li>
-				</ul>
+<div class="acp-page-container">
+	<!-- IMPORT admin/partials/settings/header.tpl -->
+
+	<div class="row m-0">
+		<div id="spy-container" class="col-12 px-0 mb-4" tabindex="0">
+			<p>
+				Create a <strong>Facebook Application</strong> via the
+				<a href="https://developers.facebook.com/apps/">Facebook Developers Page</a> and
+				then paste your application details here.
+			</p>
+			<ul>
+				<li>
+					You will need to enable <strong>"Client OAuth Login"</strong> and <strong>"Web OAuth Login"</strong>
+				from the "Facebook Login" product
+				</li>
+				<li>
+					You will need to paste <code>{baseUrl}/auth/facebook/callback</code> into the
+					<strong>"Valid OAuth Redirect URIs"</strong> field.
+				</li>
+			</ul>
+			</p>
+			<form role="form" class="sso-facebook-settings">
+				<div class="mb-3">
+					<label for="app_id">Application ID</label>
+					<input type="text" id="app_id" name="app_id" title="Application ID" class="form-control" placeholder="Application ID"><br />
+				</div>
+				<div class="mb-3">
+					<label for="secret">Secret</label>
+					<input type="text" id="secret" name="secret" title="Secret" class="form-control" placeholder="Secret">
+				</div>
+				<div class="form-check">
+					<input type="checkbox" class="form-check-input" id="autoconfirm" name="autoconfirm" />
+					<label for="autoconfirm" class="form-check-label">
+						Skip email verification for people who register using SSO?
+					</label>
+				</div>
+				<div class="form-check">
+					<input type="checkbox" class="form-check-input" id="disableRegistration" name="disableRegistration" />
+					<label for="disableRegistration" class="form-check-label">
+						Disable user registration via SSO
+					</label>
+				</div>
+				<p class="form-text">
+					Restricting registration means that only registered users can associate their account with this SSO strategy.
+					This restriction is useful if you have users bypassing registration controls by using social media accounts, or
+					if you wish to use the NodeBB registration queue.
 				</p>
-				<form role="form" class="sso-facebook-settings">
-					<div class="mb-3">
-						<label for="app_id">Application ID</label>
-						<input type="text" id="app_id" name="app_id" title="Application ID" class="form-control" placeholder="Application ID"><br />
-					</div>
-					<div class="mb-3">
-						<label for="secret">Secret</label>
-						<input type="text" id="secret" name="secret" title="Secret" class="form-control" placeholder="Secret">
-					</div>
-					<div class="form-check">
-						<input type="checkbox" class="form-check-input" id="autoconfirm" name="autoconfirm" />
-						<label for="autoconfirm" class="form-check-label">
-							Skip email verification for people who register using SSO?
-						</label>
-					</div>
-					<div class="form-check">
-						<input type="checkbox" class="form-check-input" id="disableRegistration" name="disableRegistration" />
-						<label for="disableRegistration" class="form-check-label">
-							Disable user registration via SSO
-						</label>
-					</div>
-					<p class="form-text">
-						Restricting registration means that only registered users can associate their account with this SSO strategy.
-						This restriction is useful if you have users bypassing registration controls by using social media accounts, or
-						if you wish to use the NodeBB registration queue.
-					</p>
-				</form>
-			</div>
+			</form>
 		</div>
 	</div>
 </div>
-
-<!-- IMPORT admin/partials/save_button.tpl -->