@arnaudw38/nodebb-plugin-spam-be-gone 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arnaudw38/nodebb-plugin-spam-be-gone",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Anti-spam plugin for NodeBB 4.x using Akismet, StopForumSpam, ProjectHoneyPot, and Cloudflare Turnstile (Turnstile-only fork)",
   "main": "library.js",
   "scripts": {},

package/plugin.json

@@ -2,7 +2,7 @@
   "id": "nodebb-plugin-spam-be-gone",
   "name": "Spam Be Gone",
   "description": "Anti-spam using Akismet.com, StopForumSpam.com, ProjectHoneyPot.org and Cloudflare Turnstile",
-  "url": "https://github.com/aworobel/nodebb-plugin-spam-be-gone",
+  "url": "https://github.com/akhoury/nodebb-plugin-spam-be-gone",
   "scss": [
     "public/scss/styles.scss"
   ],

package/public/js/scripts.js

@@ -5,6 +5,10 @@
 $(function () {
 	var pluginName = 'spam-be-gone';
 	var turnstileScriptUrl = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';
+	var turnstileState = {
+		widgets: {},
+		loginBindingsAttached: false,
+	};
 
 	function getTurnstileArgs() {
 		return ajaxify.data && ajaxify.data.turnstileArgs;
@@ -25,6 +29,67 @@ $(function () {
 		});
 	}
 
+	function getCurrentTurnstileResponse() {
+		var input = document.querySelector('input[name="cf-turnstile-response"]');
+		return input && input.value;
+	}
+
+	function resetTurnstileWidget(targetId) {
+		if (typeof turnstile === 'undefined') {
+			return;
+		}
+		var widgetId = turnstileState.widgets[targetId];
+		if (widgetId === undefined || widgetId === null) {
+			return;
+		}
+		try {
+			turnstile.reset(widgetId);
+		} catch (err) {
+			// Ignore reset errors when the widget is already destroyed by navigation.
+		}
+	}
+
+	function scheduleLoginTurnstileReset(targetId) {
+		// Turnstile tokens are single-use. On failed login, NodeBB keeps the user on the
+		// same page, so we refresh the widget shortly after submit to allow a retry.
+		[1200, 3000].forEach(function (delay) {
+			window.setTimeout(function () {
+				if (ajaxify.data && ajaxify.data.template && ajaxify.data.template.name && ajaxify.data.template.name !== 'login') {
+					return;
+				}
+				if (!document.getElementById(targetId)) {
+					return;
+				}
+				if (getCurrentTurnstileResponse()) {
+					resetTurnstileWidget(targetId);
+				}
+			}, delay);
+		});
+	}
+
+	function bindLoginRetryReset(targetId) {
+		if (turnstileState.loginBindingsAttached) {
+			return;
+		}
+		turnstileState.loginBindingsAttached = true;
+
+		$(document)
+			.off('submit.spamBeGoneTurnstileLogin')
+			.on('submit.spamBeGoneTurnstileLogin', 'form[action="/login"], form[data-action="login"], #login', function () {
+				scheduleLoginTurnstileReset(targetId);
+			})
+			.off('click.spamBeGoneTurnstileLogin')
+			.on('click.spamBeGoneTurnstileLogin', '[component="login/submit"]', function () {
+				scheduleLoginTurnstileReset(targetId);
+			})
+			.off('input.spamBeGoneTurnstileLogin change.spamBeGoneTurnstileLogin')
+			.on('input.spamBeGoneTurnstileLogin change.spamBeGoneTurnstileLogin', 'input[name="username"], input[name="password"]', function () {
+				if (document.getElementById(targetId) && getCurrentTurnstileResponse()) {
+					resetTurnstileWidget(targetId);
+				}
+			});
+	}
+
 	function renderTurnstileIfNeeded(isLoginPage) {
 		var args = getTurnstileArgs();
 		if (!args || (isLoginPage && !args.addLoginTurnstile)) {
@@ -37,10 +102,18 @@ $(function () {
 					return;
 				}
 				var target = document.getElementById(args.targetId);
-				if (!target || target.dataset.turnstileRendered === '1') {
+				if (!target) {
+					return;
+				}
+
+				if (target.dataset.turnstileRendered === '1') {
+					if (isLoginPage) {
+						bindLoginRetryReset(args.targetId);
+					}
 					return;
 				}
-				turnstile.render('#' + args.targetId, {
+
+				var widgetId = turnstile.render('#' + args.targetId, {
 					sitekey: args.siteKey,
 					theme: args.theme || 'auto',
 					size: args.size || 'normal',
@@ -55,8 +128,18 @@ $(function () {
 					'error-callback': function () {
 						require(['alerts'], function (alerts) { alerts.error('[[spam-be-gone:captcha-not-verified]]'); });
 					},
+					'expired-callback': function () {
+						resetTurnstileWidget(args.targetId);
+					},
+					'timeout-callback': function () {
+						resetTurnstileWidget(args.targetId);
+					},
 				});
 				target.dataset.turnstileRendered = '1';
+				turnstileState.widgets[args.targetId] = widgetId;
+				if (isLoginPage) {
+					bindLoginRetryReset(args.targetId);
+				}
 			})
 			.catch(function () {
 				require(['alerts'], function (alerts) { alerts.error('Failed to load Cloudflare Turnstile'); });