nodebb-plugin-sso-facebook 4.1.0 → 4.1.2

package/library.js

@@ -40,17 +40,12 @@
 				service: "Facebook",
 			});
 		});
-		params.router.post('/deauth/facebook', [params.middleware.requireUser, params.middleware.applyCSRF], function (req, res, next) {
-			Facebook.deleteUserData({
+		params.router.post('/deauth/facebook', [params.middleware.requireUser, params.middleware.applyCSRF], hostHelpers.tryRoute(async function (req, res, next) {
+			await Facebook.deleteUserData({
 				uid: req.user.uid,
-			}, function (err) {
-				if (err) {
-					return next(err);
-				}
-
-				res.redirect(nconf.get('relative_path') + '/me/edit');
 			});
-		});
+			res.redirect(nconf.get('relative_path') + '/me/edit');
+		}));
 
 		callback();
 	};
@@ -206,9 +201,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),
@@ -309,24 +305,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.1.0",
+  "version": "4.1.2",
   "description": "NodeBB Facebook SSO",
   "main": "library.js",
   "repository": {
@@ -29,6 +29,6 @@
     "passport-facebook": "~1.0.2"
   },
   "nbbpm": {
-    "compatibility": "^3.2.0"
+    "compatibility": "^4.0.0"
   }
 }