jwtbutler 2.0.6 → 2.0.8

package/_js/_build/script.js

@@ -352,12 +352,17 @@ var jwtbutler = class {
 	renderLoginFormWithPromise() {
 		return new Promise((resolve, reject) => {
 			this.buildUpLoginFormHtml();
+			this.bindLoginFormSubmit().then(() => {
+				resolve();
+			}).catch((error) => {
+				reject(error);
+			});
 			this.captchaRender().then(() => {
-				this.bindLoginFormSubmit().then(() => {
-					resolve();
-				}).catch((error) => {
-					reject(error);
-				});
+				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);
@@ -392,7 +397,11 @@ var jwtbutler = class {
             </div>`;
 		let dom = new DOMParser().parseFromString(this.config.login_form, "text/html").body.childNodes[0];
 		this.config.login_form_class = dom.getAttribute("class").split(" ")[0];
-		let submit = dom.querySelector("input[type=\"submit\"]");
+		let submit = dom.querySelector("button[type=\"submit\"], input[type=\"submit\"]");
+		if (this.captchaEnabled() && submit !== null) {
+			submit.disabled = true;
+			submit.setAttribute("aria-busy", "true");
+		}
 		let submitItem = submit !== null ? submit.closest("." + this.config.login_form_class + "__item") || submit.closest("li") || submit.parentElement : null;
 		let itemTag = submitItem !== null && submitItem.tagName.toLowerCase() === "li" ? "li" : "div";
 		if (this.captchaEnabled() && dom.querySelector("." + this.config.login_form_class + "__captcha") === null) {
@@ -510,8 +519,20 @@ var jwtbutler = class {
 					theme: this.config.captcha.theme || "light"
 				};
 				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));
-				resolve();
+				widgetLoaded.then(() => resolve());
 			}).catch((error) => {
 				reject(error);
 			});
@@ -574,8 +595,13 @@ var jwtbutler = class {
 		return new Promise((resolve, reject) => {
 			let dom = document.querySelector("." + this.config.login_form_class), form = dom.querySelector("form");
 			form.addEventListener("submit", (e) => {
+				let submit = form.querySelector("button[type=\"submit\"], input[type=\"submit\"]");
+				if (submit?.getAttribute("aria-busy") === "true") {
+					e.preventDefault();
+					return;
+				}
 				this.addLoadingState("logging-in");
-				if (form.querySelector("input[type=\"submit\"]") !== null) form.querySelector("input[type=\"submit\"]").disabled = true;
+				if (submit !== null) submit.disabled = true;
 				helpers.remove(dom.querySelector("." + this.config.login_form_class + "__error"));
 				let body = {
 					[this.config.auth_login]: form.querySelector("input[name=\"" + this.config.auth_login + "\"]").value,
@@ -590,7 +616,7 @@ var jwtbutler = class {
 						cache: "no-cache"
 					});
 				}).then((res) => res.json()).catch((error) => error).then((response) => {
-					if (form.querySelector("input[type=\"submit\"]") !== null) form.querySelector("input[type=\"submit\"]").disabled = false;
+					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(() => {

package/package.json

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