jwtbutler 2.0.8 → 2.1.0

package/_js/_build/script.js

@@ -358,11 +358,6 @@ var jwtbutler = class {
 				reject(error);
 			});
 			this.captchaRender().then(() => {
-				let submit = document.querySelector("." + this.config.login_form_class + " form")?.querySelector("button[type=\"submit\"], input[type=\"submit\"]");
-				if (submit !== null && submit !== void 0) {
-					submit.disabled = false;
-					submit.removeAttribute("aria-busy");
-				}
 				this.triggerLoginFormRenderedEvent();
 			}).catch((error) => {
 				reject(error);
@@ -518,21 +513,23 @@ var jwtbutler = class {
 					sitekey: this.config.captcha.sitekey,
 					theme: this.config.captcha.theme || "light"
 				};
+				if (this.captchaProvider() === "turnstile") options.size = "flexible";
+				let setSubmitBlocked = (blocked) => {
+					let submit = document.querySelector("." + this.config.login_form_class + " form")?.querySelector("button[type=\"submit\"], input[type=\"submit\"]");
+					if (submit === null || submit === void 0) return;
+					submit.disabled = blocked;
+					if (blocked) {
+						submit.setAttribute("aria-busy", "true");
+						return;
+					}
+					submit.removeAttribute("aria-busy");
+				};
+				options.callback = () => setSubmitBlocked(false);
+				options["expired-callback"] = () => setSubmitBlocked(true);
+				options["error-callback"] = () => setSubmitBlocked(true);
 				if (this.config.language !== "") options[this.captchaVendor().langKey] = this.config.language;
-				let widgetLoaded = new Promise((resolveWidget) => {
-					let observer = new MutationObserver(() => {
-						let iframe = captcha.querySelector("iframe");
-						if (iframe === null) return;
-						observer.disconnect();
-						iframe.addEventListener("load", () => resolveWidget(), { once: true });
-					});
-					observer.observe(captcha, {
-						childList: true,
-						subtree: true
-					});
-				});
 				captcha.setAttribute("data-widget-id", this.captchaApi().render(captcha, options));
-				widgetLoaded.then(() => resolve());
+				resolve();
 			}).catch((error) => {
 				reject(error);
 			});
@@ -589,6 +586,11 @@ var jwtbutler = class {
 		if (!this.captchaEnabled() || !(this.captchaProvider() in window)) return;
 		let captcha = form.querySelector("." + this.config.login_form_class + "__captcha");
 		if (captcha === null || captcha.getAttribute("data-widget-id") === null) return;
+		let submit = form.querySelector("button[type=\"submit\"], input[type=\"submit\"]");
+		if (submit !== null) {
+			submit.disabled = true;
+			submit.setAttribute("aria-busy", "true");
+		}
 		this.captchaApi().reset(captcha.getAttribute("data-widget-id"));
 	}
 	bindLoginFormSubmit() {
@@ -616,7 +618,6 @@ var jwtbutler = class {
 						cache: "no-cache"
 					});
 				}).then((res) => res.json()).catch((error) => error).then((response) => {
-					if (submit !== null) submit.disabled = false;
 					if (response !== void 0 && response !== null && "success" in response && response.success === true) {
 						helpers.remove(document.querySelector("." + this.config.login_form_class));
 						this.setCookies(response.data.access_token).then(() => {
@@ -626,6 +627,7 @@ var jwtbutler = class {
 							reject(error);
 						});
 					} else {
+						if (submit !== null && !this.captchaEnabled()) submit.disabled = false;
 						this.removeLoadingStates();
 						this.addLoadingState("login-form-visible");
 						this.captchaReset(form);

package/package.json

@@ -65,7 +65,7 @@
         "uuid": "^11.1.1"
     },
     "name": "jwtbutler",
-    "version": "2.0.8",
+    "version": "2.1.0",
     "description": "",
     "main": "_js/_build/script.js",
     "files": [