nodebb-plugin-session-sharing 7.2.3 → 8.0.1

package/lib/controllers.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const groups = require.main.require('./src/groups');
+const groups = nodebb.require('./src/groups');
 
-const Controllers = {};
+const Controllers = module.exports;
 
 Controllers.renderAdminPage = async (req, res) => {
 	const groupData = await groups.getGroupsFromSet('groups:visible:createtime', 0, -1);
@@ -58,5 +58,3 @@ Controllers.process = async (req, res) => {
 		});
 	}
 };
-
-module.exports = Controllers;

package/library.js

@@ -1,23 +1,23 @@
 'use strict';
 
-const winston = module.parent.require('winston');
-const nconf = module.parent.require('nconf');
+const winston = nodebb.require('winston');
+const nconf = nodebb.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');
-const groups = require.main.require('./src/groups');
-const SocketPlugins = require.main.require('./src/socket.io/plugins');
-const db = require.main.require('./src/database');
-const plugins = require.main.require('./src/plugins');
-const routeHelpers = require.main.require('./src/routes/helpers');
+const meta = nodebb.require('./src/meta');
+const user = nodebb.require('./src/user');
+const groups = nodebb.require('./src/groups');
+const SocketPlugins = nodebb.require('./src/socket.io/plugins');
+const db = nodebb.require('./src/database');
+const plugins = nodebb.require('./src/plugins');
+const routeHelpers = nodebb.require('./src/routes/helpers');
 
 const controllers = require('./lib/controllers');
-const nbbAuthController = require.main.require('./src/controllers/authentication');
+const nbbAuthController = nodebb.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 */
@@ -93,19 +93,27 @@ plugin.appendConfig = async (config) => {
 SocketPlugins.sessionSharing = {};
 
 SocketPlugins.sessionSharing.showUserIds = async (socket, data) => {
-	// Retrieve the hash and find matches
-	const { uids } = data;
-
-	if (!uids.length) {
-		throw new Error('no-uids-supplied');
+	if (!socket.uid || !data || !Array.isArray(data.uids)) {
+		throw new Error('[[error:invalid-data]]');
+	}
+	const isAdmin = await user.isAdministrator(socket.uid);
+	if (!isAdmin) {
+		throw new Error('[[error:no-privileges]]');
 	}
 
 	return Promise.all(
-		uids.map(async uid => db.getSortedSetRangeByScore(plugin.settings.name + ':uid', 0, -1, uid, uid))
+		data.uids.map(uid => db.getSortedSetRangeByScore(`${plugin.settings.name}:uid`, 0, -1, uid, uid))
 	);
 };
 
 SocketPlugins.sessionSharing.findUserByRemoteId = async (socket, data) => {
+	if (!socket.uid || !data || !Array.isArray(data.uids)) {
+		throw new Error('[[error:invalid-data]]');
+	}
+	const isAdmin = await user.isAdministrator(socket.uid);
+	if (!isAdmin) {
+		throw new Error('[[error:no-privileges]]');
+	}
 	if (!data.remoteId) {
 		throw new Error('no-remote-id-supplied');
 	}
@@ -262,7 +270,7 @@ plugin.findOrCreateUser = async (userData) => {
 
 plugin.updateUserProfile = async (uid, userData, isNewUser) => {
 	winston.debug('consider updateProfile?', isNewUser || plugin.settings.updateProfile === 'on');
-	let userObj = {};
+	let userObj;
 
 	/* even update the profile on a new account, since some fields are not initialized by NodeBB */
 	if (!isNewUser && plugin.settings.updateProfile !== 'on') {
@@ -439,6 +447,7 @@ plugin.addMiddleware = async function ({ req, res }) {
 			const uid = await plugin.process(req.cookies[plugin.settings.cookieName]);
 			if (uid === req.uid) {
 				winston.verbose(`[session-sharing] Re-validated login for uid ${uid}, path ${req.originalUrl}`);
+				await nbbAuthController.onSuccessfulLogin(req, uid);
 				return;
 			}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-session-sharing",
-  "version": "7.2.3",
+  "version": "8.0.1",
   "description": "Allows login sessions from your app to persist in NodeBB",
   "main": "library.js",
   "repository": {
@@ -24,7 +24,7 @@
   },
   "readmeFilename": "README.md",
   "nbbpm": {
-    "compatibility": "^3.2.0 || ^4.x"
+    "compatibility": "^4.14.0"
   },
   "husky": {
     "hooks": {
@@ -48,8 +48,8 @@
   "devDependencies": {
     "@commitlint/cli": "^9.1.2",
     "@commitlint/config-angular": "^7.1.2",
-    "eslint": "9.26.0",
-    "eslint-config-nodebb": "^1.1.4",
+    "eslint": "10.7.0",
+    "eslint-config-nodebb": "^2.0.3",
     "husky": "^2.4.0",
     "lint-staged": "^10.0.9",
     "request": "^2.88.2",

package/static/lib/admin.js

@@ -1,7 +1,7 @@
 'use strict';
 
 define('admin/plugins/session-sharing', ['settings'], function (Settings) {
-	var ACP = {};
+	const ACP = {};
 
 	ACP.init = function () {
 		Settings.load('session-sharing', $('.session-sharing-settings'));
@@ -20,7 +20,7 @@ define('admin/plugins/session-sharing', ['settings'], function (Settings) {
 			delete ACP._searchDelay;
 		}
 
-		var element = $(this);
+		const element = $(this);
 
 		ACP._searchDelay = setTimeout(function () {
 			delete ACP._searchDelay;
@@ -30,7 +30,7 @@ define('admin/plugins/session-sharing', ['settings'], function (Settings) {
 				return resultEl.text('');
 			}
 
-			var qs = decodeURIComponent($.param({
+			const qs = decodeURIComponent($.param({
 				query: element.val(),
 			}));
 
@@ -67,7 +67,7 @@ define('admin/plugins/session-sharing', ['settings'], function (Settings) {
 			delete ACP._searchDelay;
 		}
 
-		var element = $(this);
+		const element = $(this);
 
 		ACP._searchDelay = setTimeout(function () {
 			delete ACP._searchDelay;

package/static/lib/main.js

@@ -2,9 +2,9 @@
 
 $(document).ready(function () {
 	if (config.sessionSharing && config.sessionSharing.hostWhitelist) {
-		var hosts = config.sessionSharing.hostWhitelist.split(',') || [config.sessionSharing.hostWhitelist];
-		var whitelisted = false;
-		for (var host of hosts) {
+		const hosts = config.sessionSharing.hostWhitelist.split(',') || [config.sessionSharing.hostWhitelist];
+		let whitelisted = false;
+		for (const host of hosts) {
 			if (window && window.location && window.location.host && window.location.host.includes(host)) {
 				whitelisted = true;
 				break;
@@ -57,11 +57,13 @@ $(document).ready(function () {
 		}
 
 		if (ajaxify.data.sessionSharingBan) {
-			bootbox.alert({
-				title: '[[error:user-banned]]',
-				message: ajaxify.data.sessionSharingBan.ban.expiry > 0 ?
-					'[[error:user-banned-reason-until, ' + ajaxify.data.sessionSharingBan.ban.expiry_readable + ', ' + ajaxify.data.sessionSharingBan.ban.reason + ']]' :
-					'[[error:user-banned-reason, ' + ajaxify.data.sessionSharingBan.ban.reason + ']]',
+			require(['modals'], function (modals) {
+				modals.alert({
+					title: '[[error:user-banned]]',
+					message: ajaxify.data.sessionSharingBan.ban.expiry > 0 ?
+						'[[error:user-banned-reason-until, ' + ajaxify.data.sessionSharingBan.ban.expiry_readable + ', ' + ajaxify.data.sessionSharingBan.ban.reason + ']]' :
+						'[[error:user-banned-reason, ' + ajaxify.data.sessionSharingBan.ban.reason + ']]',
+				});
 			});
 		}
 

package/test/index.js

@@ -10,10 +10,10 @@ const url = require('url');
 const util = require('util');
 const request = require('request-promise-native');
 
-const db = require.main.require('./test/mocks/databasemock');
+const db = nodebb.require('./test/mocks/databasemock');
 
-const nconf = require.main.require('nconf');
-const meta = require.main.require('./src/meta');
+const nconf = nodebb.require('nconf');
+const meta = nodebb.require('./src/meta');
 
 describe('nodebb-plugin-session-sharing', () => {
 	const userJar = request.jar();

package/upgrades/session_sharing_hash_to_zset.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const winston = require.main.require('winston');
+const winston = nodebb.require('winston');
 
-const db = require.main.require('./src/database');
-const batch = require.main.require('./src/batch');
-const meta = require.main.require('./src/meta');
+const db = nodebb.require('./src/database');
+const batch = nodebb.require('./src/batch');
+const meta = nodebb.require('./src/meta');
 
 module.exports = {
 	name: 'Convert remote-to-local user ID from hash to sorted set',