nodebb-plugin-session-sharing 5.1.2 → 5.1.5

package/commitlint.config.js

@@ -1,3 +1,26 @@
 'use strict';
 
-module.exports = { extends: ['@commitlint/config-angular'] };
+module.exports = {
+	extends: ['@commitlint/config-angular'],
+	rules: {
+		'header-max-length': [1, 'always', 72],
+		'type-enum': [
+			2,
+			'always',
+			[
+				'breaking',
+				'build',
+				'chore',
+				'ci',
+				'docs',
+				'feat',
+				'fix',
+				'perf',
+				'refactor',
+				'revert',
+				'style',
+				'test',
+			],
+		],
+	},
+};

package/library.js

@@ -392,7 +392,7 @@ plugin.addMiddleware = async function ({ req, res }) {
 		return;
 	}
 
-	if (editOverride && hasSession && req.originalUrl.match(/\/user\/.*\/edit$/)) {
+	if (editOverride && hasSession && req.originalUrl.match(/\/user\/.*\/edit(\/\w+)?$/)) {
 		return res.redirect(editOverride.replace('%1', encodeURIComponent(req.protocol + '://' + req.get('host') + req.originalUrl)));
 	}
 	if (loginOverride && req.originalUrl.match(/\/login$/)) {
@@ -569,7 +569,7 @@ plugin.reloadSettings = async (data) => {
 };
 
 plugin.appendTemplate = async (data) => {
-	if (!data.req.session.sessionSharing || !data.req.session.sessionSharing.banned) {
+	if (!data.req.session || !data.req.session.sessionSharing || !data.req.session.sessionSharing.banned) {
 		return data;
 	}
 

package/package.json

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

package/plugin.json

@@ -18,9 +18,9 @@
 	"scripts": [
 		"static/lib/main.js"
 	],
-	"acpScripts": [
-		"static/lib/admin.js"
-	],
+	"modules": {
+		"../admin/plugins/session-sharing.js": "./static/lib/admin.js"
+	},
 	"upgrades": [
 		"upgrades/session_sharing_hash_to_zset.js"
 	],

package/static/lib/admin.js

@@ -1,16 +1,17 @@
 'use strict';
 
-/* globals define, $, app, socket, config */
+/* globals define, $, socket, config */
 
-define('admin/plugins/session-sharing', ['settings'], function (Settings) {
+define('admin/plugins/session-sharing', ['settings', 'alerts'], function (Settings, alerts) {
 	var ACP = {};
 
 	ACP.init = function () {
+		console.log('derpy derp');
 		Settings.load('session-sharing', $('.session-sharing-settings'));
 
 		$('#save').on('click', function () {
 			Settings.save('session-sharing', $('.session-sharing-settings'), function () {
-				app.alert({
+				alerts.alert({
 					type: 'success',
 					alert_id: 'session-sharing-saved',
 					title: 'Settings Saved',
@@ -34,11 +35,11 @@ define('admin/plugins/session-sharing', ['settings'], function (Settings) {
 
 		ACP._searchDelay = setTimeout(function () {
 			delete ACP._searchDelay;
-			
+
 			var qs = decodeURIComponent($.param({
 				query: element.val(),
 			}));
-			
+
 			$.get(config.relative_path + '/api/admin/manage/users?' + qs)
 				.then(function (results) {
 					var resultEl = $('#result');

package/static/lib/main.js

@@ -20,7 +20,7 @@ $(document).ready(function () {
 	}
 
 	function isEditUrl(url) {
-		return url.match(/^user\/.*\/edit$/);
+		return url.match(/^user\/.*\/edit(\/\w+)?$/);
 	}
 
 	$(window).on('action:app.loggedOut', function (evt, data) {