nodebb-plugin-session-sharing 5.1.7 → 6.0.0

package/library.js

@@ -3,7 +3,10 @@
 const winston = module.parent.require('winston');
 const nconf = module.parent.require('nconf');
 
+const util = require('util');
+
 const _ = require('lodash');
+const jwt = require('jsonwebtoken');
 
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
@@ -12,10 +15,9 @@ const SocketPlugins = require.main.require('./src/socket.io/plugins');
 const db = require.main.require('./src/database');
 const plugins = require.main.require('./src/plugins');
 
-const jwt = require('jsonwebtoken');
-
 const controllers = require('./lib/controllers');
 const nbbAuthController = require.main.require('./src/controllers/authentication');
+const logoutAsync = util.promisify((req, callback) => req.logout(callback));
 
 /* all the user profile fields that can be passed to user.updateProfile */
 const profileFields = [
@@ -407,7 +409,7 @@ plugin.addMiddleware = async function ({ req, res }) {
 		await meta.blacklist.test(req.ip);
 	} catch (error) {
 		if (hasSession) {
-			req.logout();
+			await logoutAsync(req);
 			res.locals.fullRefresh = true;
 		}
 
@@ -421,7 +423,7 @@ plugin.addMiddleware = async function ({ req, res }) {
 			winston.verbose('[session-sharing] Processing login for uid ' + uid + ', path ' + req.originalUrl);
 			req.uid = uid;
 
-			if (plugin.settings.behaviour === 'revalidate') {
+			if (plugin.settings.behaviour === 'revalidate' || plugin.settings.behaviour === 'update') {
 				res.locals.reroll = false;	// disable session rerolling in core
 			}
 
@@ -465,7 +467,7 @@ plugin.addMiddleware = async function ({ req, res }) {
 		const isAdmin = await user.isAdministrator(req.user.uid);
 
 		if (plugin.settings.behaviour !== 'update' && (plugin.settings.adminRevalidate === 'on' || !isAdmin)) {
-			req.logout();
+			await logoutAsync(req);
 			res.locals.fullRefresh = true;
 			return handleGuest(req, res);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-session-sharing",
-  "version": "5.1.7",
+  "version": "6.0.0",
   "description": "Allows login sessions from your app to persist in NodeBB",
   "main": "library.js",
   "repository": {
@@ -21,7 +21,7 @@
   },
   "readmeFilename": "README.md",
   "nbbpm": {
-    "compatibility": "^1.17.2"
+    "compatibility": "^2.5.0"
   },
   "husky": {
     "hooks": {

package/plugin.json

@@ -1,6 +1,6 @@
 {
 	"id": "nodebb-plugin-session-sharing",
-	"url": "https://github.com/NodeBB/nodebb-plugin-session-sharing",
+	"url": "https://github.com/julianlam/nodebb-plugin-session-sharing",
 	"library": "./library.js",
 	"hooks": [
 		{ "hook": "response:router.page", "method": "addMiddleware" },