nodebb-plugin-session-sharing 7.0.1 → 7.1.1

package/library.js

@@ -420,13 +420,12 @@ plugin.addMiddleware = async function ({ req, res }) {
 	if (Object.keys(req.cookies).length && req.cookies.hasOwnProperty(plugin.settings.cookieName) && req.cookies[plugin.settings.cookieName].length) {
 		try {
 			const uid = await plugin.process(req.cookies[plugin.settings.cookieName]);
-			winston.verbose('[session-sharing] Processing login for uid ' + uid + ', path ' + req.originalUrl);
-			req.uid = uid;
-
-			if (plugin.settings.behaviour === 'revalidate' || plugin.settings.behaviour === 'update') {
-				res.locals.reroll = false;	// disable session rerolling in core
+			if (uid === req.uid) {
+				winston.verbose(`[session-sharing] Re-validated login for uid ${uid}, path ${req.originalUrl}`);
+				return;
 			}
 
+			winston.verbose('[session-sharing] Processing login for uid ' + uid + ', path ' + req.originalUrl);
 			await nbbAuthController.doLogin(req, uid);
 
 			req.session.loginLock = true;
@@ -467,6 +466,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)) {
+			winston.verbose(`[session-sharing] Found login session but no cookie, logging out user (was uid ${req.uid})`);
 			await logoutAsync(req);
 			res.locals.fullRefresh = true;
 			return handleGuest(req, res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-session-sharing",
-  "version": "7.0.1",
+  "version": "7.1.1",
   "description": "Allows login sessions from your app to persist in NodeBB",
   "main": "library.js",
   "repository": {

package/static/lib/admin.js

@@ -2,22 +2,14 @@
 
 /* globals define, $, socket, config */
 
-define('admin/plugins/session-sharing', ['settings', 'alerts'], function (Settings, alerts) {
+define('admin/plugins/session-sharing', ['settings'], function (Settings) {
 	var ACP = {};
 
 	ACP.init = function () {
 		Settings.load('session-sharing', $('.session-sharing-settings'));
 
 		$('#save').on('click', function () {
-			Settings.save('session-sharing', $('.session-sharing-settings'), function () {
-				alerts.alert({
-					type: 'success',
-					alert_id: 'session-sharing-saved',
-					title: 'Settings Saved',
-					message: 'No restart/reload is required',
-					timeout: 5000,
-				});
-			});
+			Settings.save('session-sharing', $('.session-sharing-settings'));
 		});
 
 		$('#search').on('keyup', ACP.showUserId);
@@ -35,14 +27,17 @@ define('admin/plugins/session-sharing', ['settings', 'alerts'], function (Settin
 		ACP._searchDelay = setTimeout(function () {
 			delete ACP._searchDelay;
 
+			const resultEl = $('#result');
+			if (!element.val()) {
+				return resultEl.text('');
+			}
+
 			var qs = decodeURIComponent($.param({
 				query: element.val(),
 			}));
 
 			$.get(config.relative_path + '/api/admin/manage/users?' + qs)
 				.then(function (results) {
-					var resultEl = $('#result');
-
 					if (results.users.length) {
 						socket.emit('plugins.sessionSharing.showUserIds', {
 							uids: results.users.map(function (user) {
@@ -79,6 +74,10 @@ define('admin/plugins/session-sharing', ['settings', 'alerts'], function (Settin
 		ACP._searchDelay = setTimeout(function () {
 			delete ACP._searchDelay;
 
+			if (!element.val()) {
+				return $('#local_result').text('');
+			}
+
 			socket.emit('plugins.sessionSharing.findUserByRemoteId', {
 				remoteId: element.val(),
 			}, function (err, results) {

package/static/templates/admin/plugins/session-sharing.tpl

@@ -263,10 +263,8 @@
 		</div>
 		<div class="col-md-3">
 			<div class="card">
-				<div class="card-header">
-					<span class="fs-4">User Search</span>
-				</div>
 				<div class="card-body">
+					<h5 class="card-title">User Search</h5>
 					<input type="text" class="form-control" id="search" />
 					<p class="form-text">
 						Search for a username here to find their associated unique ID.
@@ -275,10 +273,8 @@
 				</div>
 			</div>
 			<div class="card">
-				<div class="card-header">
-					<span class="fs-4">Remote ID Search</span>
-				</div>
 				<div class="card-body">
+					<h5 class="card-title">Remote ID Search</h5>
 					<input type="text" class="form-control" id="remote_search" />
 					<p class="form-text">
 						Enter a remote ID here to find their NodeBB user profile.
@@ -290,6 +286,5 @@
 	</div>
 </form>
 
-<button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-	<i class="material-icons">save</i>
-</button>
+<!-- IMPORT admin/partials/save_button.tpl -->
+