@everymatrix/user-login 1.94.20 → 1.94.22

package/dist/collection/components/user-login/user-login.js

@@ -3,8 +3,7 @@ import { getTranslations, translate } from "../../utils/locale.utils";
 import { setClientStyling, setClientStylingURL, setStreamStyling } from "../../../../../../../../libs/common/src/styling/index";
 import { getSlottedElement } from "../../../../../../../../libs/common/src/utils/index";
 import { dispatchCustomEvent } from "../../../../../../../../libs/custom-events/src/index";
-import { createRecaptcha, createTurnstile, } from "../../../../../../../../libs/common/src/captcha/index";
-import { CAPTCHA_CONTAINER_SLOT } from "../../utils/utils";
+import { createRecaptcha, createTurnstile, RECAPTCHA_TOKEN_RESPONSE_HEADER, TURNSTILE_TOKEN_RESPONSE_HEADER, TURNSTILE_IS_VISIBLE_HEADER, CAPTCHA_CONTAINER_SLOT, } from "../../../../../../../../libs/common/src/captcha/index";
 import "../../../../../../../libs/vaadin-facade/index";
 export class UserLogin {
     constructor() {
@@ -48,7 +47,7 @@ export class UserLogin {
          * Login API call for Gm 1.7
          */
         this.userLoginGm17 = async () => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e;
             let headers = {
                 'Content-Type': 'application/json'
             };
@@ -60,11 +59,13 @@ export class UserLogin {
                 let token;
                 if (typeof ((_a = this.captchaInstance) === null || _a === void 0 ? void 0 : _a.ensureToken) === "function") {
                     token = await ((_c = (_b = this.captchaInstance) === null || _b === void 0 ? void 0 : _b.ensureToken) === null || _c === void 0 ? void 0 : _c.call(_b));
+                    headers[TURNSTILE_TOKEN_RESPONSE_HEADER] = token !== null && token !== void 0 ? token : "";
+                    headers[TURNSTILE_IS_VISIBLE_HEADER] = "false";
                 }
                 else {
                     token = this.captchaToken;
+                    headers[RECAPTCHA_TOKEN_RESPONSE_HEADER] = token !== null && token !== void 0 ? token : "";
                 }
-                headers['cf-captcha-response'] = token !== null && token !== void 0 ? token : "";
             }
             const options = {
                 method: 'POST',
@@ -93,6 +94,7 @@ export class UserLogin {
             }
             finally {
                 this.isLoginLoading = false;
+                (_e = (_d = this.captchaInstance) === null || _d === void 0 ? void 0 : _d.reset) === null || _e === void 0 ? void 0 : _e.call(_d);
             }
         };
         /**
@@ -155,15 +157,17 @@ export class UserLogin {
                 try {
                     const turnstileToken = await ((_b = (_a = this.captchaInstance) === null || _a === void 0 ? void 0 : _a.ensureToken) === null || _b === void 0 ? void 0 : _b.call(_a));
                     if (turnstileToken) {
-                        headers.append('cf-captcha-response', turnstileToken);
-                        headers.append('cfCaptchaIsVisible', 'false');
+                        headers.append(TURNSTILE_TOKEN_RESPONSE_HEADER, turnstileToken);
+                        headers.append(TURNSTILE_IS_VISIBLE_HEADER, 'false');
                     }
                 }
                 catch (error) {
                     this.hasError = true;
-                    this.errorMessage = translate('genericError', this.lang) || `${error}`;
-                    this.sendErrorNotification(this.errorMessage);
                     this.isLoginLoading = false;
+                    if (error !== null) {
+                        this.errorMessage = translate('genericError', this.lang) || `${error}`;
+                        this.sendErrorNotification(this.errorMessage);
+                    }
                     return;
                 }
             }
@@ -228,7 +232,9 @@ export class UserLogin {
                 this.sendErrorNotification(this.errorMessage);
             })
                 .finally(() => {
+                var _a, _b;
                 this.isLoginLoading = false;
+                (_b = (_a = this.captchaInstance) === null || _a === void 0 ? void 0 : _a.reset) === null || _b === void 0 ? void 0 : _b.call(_a);
             });
         };
         /**
@@ -349,8 +355,6 @@ export class UserLogin {
         this.biometricactionmode = 'switch';
         this.isFromLogin = true;
         this.turnstileSiteKey = undefined;
-        this.turnstileEnableFallback = false;
-        this.turnstileRetryCount = undefined;
         this.userNameEmail = '';
         this.userPassword = '';
         this.isValidUserEmail = true;
@@ -366,7 +370,6 @@ export class UserLogin {
         this.isLoginLoading = false;
         this.isNativeApp = false;
         this.biometricsLoaded = false;
-        this.isTurnstileLoading = false;
     }
     /**
      * Watch for changes in the translation URL and fetch new translations
@@ -467,7 +470,6 @@ export class UserLogin {
                 isEnabled: true,
                 provider: "cloudflare",
                 siteKey: this.turnstileSiteKey,
-                enableFallback: this.turnstileEnableFallback
             });
         }
     }
@@ -500,8 +502,7 @@ export class UserLogin {
         });
     }
     async initializeCaptcha({ provider, siteKey, enableFallback }) {
-        const slotElement = getSlottedElement(this.host, CAPTCHA_CONTAINER_SLOT);
-        this.captchaContainerEl = slotElement;
+        const captchaContainerEl = getSlottedElement(this.host, CAPTCHA_CONTAINER_SLOT);
         const captchaCreator = {
             "google": createRecaptcha,
             "cloudflare": createTurnstile
@@ -512,7 +513,7 @@ export class UserLogin {
             enableFallback,
             callback: provider === "google" ? (token) => { this.captchaToken = token; } : undefined
         });
-        await this.captchaInstance.render(this.captchaContainerEl);
+        await this.captchaInstance.render(captchaContainerEl);
     }
     /**
      * Lifecycle method: Clean up event listeners when the component is removed
@@ -522,7 +523,8 @@ export class UserLogin {
         this.stylingSubscription && this.stylingSubscription.unsubscribe();
         window.removeEventListener('LoginCredentials', this.autofillCredentialsHandler);
         window.removeEventListener('message', this.messageHandler);
-        (_b = (_a = this.captchaInstance) === null || _a === void 0 ? void 0 : _a.cleanup) === null || _b === void 0 ? void 0 : _b.call(_a);
+        if (this.turnstileSiteKey)
+            (_b = (_a = this.captchaInstance) === null || _a === void 0 ? void 0 : _a.cleanup) === null || _b === void 0 ? void 0 : _b.call(_a);
     }
     /**
      * Send error notification as a post message
@@ -604,7 +606,7 @@ export class UserLogin {
      * Render function
     */
     render() {
-        return (h("section", { key: 'c72b94ac2e6cde988ae4798402680a527e4a004e', ref: el => this.stylingContainer = el }, this.renderUserIdentification(), h("slot", { key: '36c64bfcc9d5e19ae7b22d50638bf3c720167606', name: CAPTCHA_CONTAINER_SLOT })));
+        return (h("section", { key: 'd53f60a484827fbb28b2ec8a907ac21e0781427a', ref: el => this.stylingContainer = el }, this.renderUserIdentification(), h("slot", { key: '8b42ec462b580ffb0d1448bbe185febada0bcd22', name: CAPTCHA_CONTAINER_SLOT })));
     }
     static get is() { return "user-login"; }
     static get encapsulation() { return "shadow"; }
@@ -1012,41 +1014,6 @@ export class UserLogin {
                 },
                 "attribute": "turnstile-site-key",
                 "reflect": false
-            },
-            "turnstileEnableFallback": {
-                "type": "boolean",
-                "mutable": false,
-                "complexType": {
-                    "original": "boolean",
-                    "resolved": "boolean",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [],
-                    "text": "Enable Turnstile fallback behavior."
-                },
-                "attribute": "turnstile-enable-fallback",
-                "reflect": false,
-                "defaultValue": "false"
-            },
-            "turnstileRetryCount": {
-                "type": "number",
-                "mutable": false,
-                "complexType": {
-                    "original": "number",
-                    "resolved": "number",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [],
-                    "text": "Number of retry attempts for Turnstile."
-                },
-                "attribute": "turnstile-retry-count",
-                "reflect": false
             }
         };
     }
@@ -1066,8 +1033,7 @@ export class UserLogin {
             "phoneCodes": {},
             "isLoginLoading": {},
             "isNativeApp": {},
-            "biometricsLoaded": {},
-            "isTurnstileLoading": {}
+            "biometricsLoaded": {}
         };
     }
     static get methods() {

package/dist/collection/utils/utils.js

@@ -1,4 +1,3 @@
 export function format(first, middle, last) {
     return ((first || '') + (middle ? ` ${middle}` : '') + (last ? ` ${last}` : ''));
 }
-export const CAPTCHA_CONTAINER_SLOT = "captchaContainer";

package/dist/esm/loader.js

@@ -5,7 +5,7 @@ import { g as globalScripts } from './app-globals-0f993ce5.js';
 const defineCustomElements = async (win, options) => {
   if (typeof window === 'undefined') return undefined;
   await globalScripts();
-  return bootstrapLazy([["user-login",[[1,"user-login",{"endpoint":[513],"minPassLength":[514,"min-pass-length"],"lang":[1537],"clientStyling":[513,"client-styling"],"clientStylingUrl":[513,"client-styling-url"],"translationUrl":[513,"translation-url"],"passwordReset":[513,"password-reset"],"userEmailRegex":[513,"user-email-regex"],"userEmailRegexOptions":[513,"user-email-regex-options"],"userPhoneRegex":[513,"user-phone-regex"],"userPhoneRegexOptions":[513,"user-phone-regex-options"],"passwordRegex":[513,"password-regex"],"passwordRegexOptions":[513,"password-regex-options"],"version":[513],"loginByPhoneNumber":[513,"login-by-phone-number"],"defaultPrefix":[513,"default-prefix"],"isPrefixEditable":[513,"is-prefix-editable"],"mbSource":[513,"mb-source"],"biometricEnabled":[513,"biometric-enabled"],"biometricactionmode":[1],"isFromLogin":[4,"is-from-login"],"turnstileSiteKey":[1,"turnstile-site-key"],"turnstileEnableFallback":[4,"turnstile-enable-fallback"],"turnstileRetryCount":[2,"turnstile-retry-count"],"userNameEmail":[32],"userPassword":[32],"isValidUserEmail":[32],"userPhone":[32],"userPrefix":[32],"isValidPassword":[32],"isValidUserPhone":[32],"isPasswordVisible":[32],"errorMessage":[32],"errorForFields":[32],"hasError":[32],"phoneCodes":[32],"isLoginLoading":[32],"isNativeApp":[32],"biometricsLoaded":[32],"isTurnstileLoading":[32],"autofillCredentials":[64]},null,{"translationUrl":["handleNewTranslations"],"clientStyling":["handleClientStylingChange"],"clientStylingUrl":["handleClientStylingChangeURL"]}]]]], options);
+  return bootstrapLazy([["user-login",[[1,"user-login",{"endpoint":[513],"minPassLength":[514,"min-pass-length"],"lang":[1537],"clientStyling":[513,"client-styling"],"clientStylingUrl":[513,"client-styling-url"],"translationUrl":[513,"translation-url"],"passwordReset":[513,"password-reset"],"userEmailRegex":[513,"user-email-regex"],"userEmailRegexOptions":[513,"user-email-regex-options"],"userPhoneRegex":[513,"user-phone-regex"],"userPhoneRegexOptions":[513,"user-phone-regex-options"],"passwordRegex":[513,"password-regex"],"passwordRegexOptions":[513,"password-regex-options"],"version":[513],"loginByPhoneNumber":[513,"login-by-phone-number"],"defaultPrefix":[513,"default-prefix"],"isPrefixEditable":[513,"is-prefix-editable"],"mbSource":[513,"mb-source"],"biometricEnabled":[513,"biometric-enabled"],"biometricactionmode":[1],"isFromLogin":[4,"is-from-login"],"turnstileSiteKey":[1,"turnstile-site-key"],"userNameEmail":[32],"userPassword":[32],"isValidUserEmail":[32],"userPhone":[32],"userPrefix":[32],"isValidPassword":[32],"isValidUserPhone":[32],"isPasswordVisible":[32],"errorMessage":[32],"errorForFields":[32],"hasError":[32],"phoneCodes":[32],"isLoginLoading":[32],"isNativeApp":[32],"biometricsLoaded":[32],"autofillCredentials":[64]},null,{"translationUrl":["handleNewTranslations"],"clientStyling":["handleClientStylingChange"],"clientStylingUrl":["handleClientStylingChangeURL"]}]]]], options);
 };
 
 export { defineCustomElements };