jwtbutler 2.0.2 → 2.0.3

package/README.md

@@ -62,14 +62,13 @@ const api = new jwtbutler({
 });
 ```
 
-if your auth server uses [hCaptcha](https://www.hcaptcha.com), \
-add the public sitekey:
+`jwtbutler` can also render captchas (currently `hCaptcha` and `Cloudflare Turnstile`). note that `jwtbutler` only renders the widget and sends the resulting token to `/login` — your auth server must verify that token (e.g. [simpleauth](https://github.com/vielhuber/simpleauth) supports this out of the box):
 
 ```js
 const api = new jwtbutler({
     /* ... */
     captcha: {
-        provider: 'hcaptcha',
+        provider: '...', // 'turnstile'|'hcaptcha'
         sitekey: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
         theme: 'light'
     }

package/_js/_build/script.js

@@ -411,7 +411,30 @@ var jwtbutler = class {
 		if ("login_form_rendered" in this.config && this.config.login_form_rendered != "" && typeof this.config.login_form_rendered === "function") this.config.login_form_rendered(document.querySelector("." + this.config.login_form_class));
 	}
 	captchaEnabled() {
-		return this.config.captcha !== false && typeof this.config.captcha === "object" && (!("provider" in this.config.captcha) || this.config.captcha.provider === "hcaptcha") && "sitekey" in this.config.captcha && this.config.captcha.sitekey !== "";
+		return this.config.captcha !== false && typeof this.config.captcha === "object" && (!("provider" in this.config.captcha) || this.captchaProvider() in this.captchaVendors()) && "sitekey" in this.config.captcha && this.config.captcha.sitekey !== "";
+	}
+	captchaProvider() {
+		return this.config.captcha && this.config.captcha.provider || "hcaptcha";
+	}
+	captchaVendors() {
+		return {
+			hcaptcha: {
+				script: "https://js.hcaptcha.com/1/api.js?render=explicit",
+				langKey: "hl",
+				field: "h-captcha-response"
+			},
+			turnstile: {
+				script: "https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit",
+				langKey: "language",
+				field: "cf-turnstile-response"
+			}
+		};
+	}
+	captchaVendor() {
+		return this.captchaVendors()[this.captchaProvider()] || this.captchaVendors().hcaptcha;
+	}
+	captchaApi() {
+		return window[this.captchaProvider()];
 	}
 	passkeyEnabled() {
 		return this.config.passkeys !== false;
@@ -486,8 +509,8 @@ var jwtbutler = class {
 					sitekey: this.config.captcha.sitekey,
 					theme: this.config.captcha.theme || "light"
 				};
-				if (this.config.language !== "") options.hl = this.config.language;
-				captcha.setAttribute("data-widget-id", window.hcaptcha.render(captcha, options));
+				if (this.config.language !== "") options[this.captchaVendor().langKey] = this.config.language;
+				captcha.setAttribute("data-widget-id", this.captchaApi().render(captcha, options));
 				resolve();
 			}).catch((error) => {
 				reject(error);
@@ -496,20 +519,21 @@ var jwtbutler = class {
 	}
 	captchaLoad() {
 		return new Promise((resolve, reject) => {
-			if (!this.captchaEnabled() || "hcaptcha" in window) {
+			if (!this.captchaEnabled() || this.captchaProvider() in window) {
 				resolve();
 				return;
 			}
-			if (document.querySelector("script[data-jwtbutler-hcaptcha]") !== null) {
-				document.querySelector("script[data-jwtbutler-hcaptcha]").addEventListener("load", () => resolve());
-				document.querySelector("script[data-jwtbutler-hcaptcha]").addEventListener("error", (error) => reject(error));
+			let selector = "script[data-jwtbutler-captcha=\"" + this.captchaProvider() + "\"]";
+			if (document.querySelector(selector) !== null) {
+				document.querySelector(selector).addEventListener("load", () => resolve());
+				document.querySelector(selector).addEventListener("error", (error) => reject(error));
 				return;
 			}
 			let script = document.createElement("script");
-			script.setAttribute("src", "https://js.hcaptcha.com/1/api.js?render=explicit");
+			script.setAttribute("src", this.captchaVendor().script);
 			script.setAttribute("async", "async");
 			script.setAttribute("defer", "defer");
-			script.setAttribute("data-jwtbutler-hcaptcha", "true");
+			script.setAttribute("data-jwtbutler-captcha", this.captchaProvider());
 			script.addEventListener("load", () => resolve());
 			script.addEventListener("error", (error) => reject(error));
 			document.head.appendChild(script);
@@ -522,14 +546,14 @@ var jwtbutler = class {
 				return;
 			}
 			let captcha = form.querySelector("." + this.config.login_form_class + "__captcha");
-			if (captcha === null || !("hcaptcha" in window)) {
+			if (captcha === null || !(this.captchaProvider() in window)) {
 				reject({
 					message: "captcha not successful",
 					public_message: "Captcha not successful"
 				});
 				return;
 			}
-			let token = window.hcaptcha.getResponse(captcha.getAttribute("data-widget-id"));
+			let token = this.captchaApi().getResponse(captcha.getAttribute("data-widget-id"));
 			if (token === "") {
 				reject({
 					message: "captcha not successful",
@@ -541,10 +565,10 @@ var jwtbutler = class {
 		});
 	}
 	captchaReset(form) {
-		if (!this.captchaEnabled() || !("hcaptcha" in window)) return;
+		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;
-		window.hcaptcha.reset(captcha.getAttribute("data-widget-id"));
+		this.captchaApi().reset(captcha.getAttribute("data-widget-id"));
 	}
 	bindLoginFormSubmit() {
 		return new Promise((resolve, reject) => {
@@ -558,7 +582,7 @@ var jwtbutler = class {
 					password: form.querySelector("input[name=\"password\"]").value
 				};
 				this.captchaToken(form).then((captchaToken) => {
-					if (captchaToken !== null) body["h-captcha-response"] = captchaToken;
+					if (captchaToken !== null) body[this.captchaVendor().field] = captchaToken;
 					return fetch(this.config.auth_server + "/login", {
 						method: "POST",
 						body: JSON.stringify(body),

package/package.json

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