@descope/web-components-ui 1.0.308 → 1.0.309

package/dist/cjs/index.cjs.js

@@ -960,21 +960,8 @@ const componentNameValidationMixin = (superclass) =>
     }
   };
 
-// create a dispatch event function that also calls to the onevent function in case  it's set
-// usage example:
-// #dispatchSomething = createDispatchEvent.bind(this, 'something' { ...options })
-// this will dispatch a new event when called, but also call to "onsomething"
-function createDispatchEvent(eventName, options = {}) {
-  const event = new Event(eventName, options);
-
-  this[`on${eventName}`]?.(event); // in case we got an event callback as property
-  this.dispatchEvent(event);
-}
-
 const componentsContextMixin = (superclass) =>
   class ComponentsContextMixinClass extends superclass {
-    #dispatchComponentsContext = createDispatchEvent.bind(this, 'components-context');
-
     updateComponentsContext(componentsContext) {
       this.dispatchEvent(
         new CustomEvent('components-context', {
@@ -1117,6 +1104,17 @@ const createBaseClass = ({ componentName, baseSelector = '' }) => {
   )(DescopeBaseClass);
 };
 
+// create a dispatch event function that also calls to the onevent function in case  it's set
+// usage example:
+// #dispatchSomething = createDispatchEvent.bind(this, 'something' { ...options })
+// this will dispatch a new event when called, but also call to "onsomething"
+function createDispatchEvent(eventName, options = {}) {
+  const event = new Event(eventName, options);
+
+  this[`on${eventName}`]?.(event); // in case we got an event callback as property
+  this.dispatchEvent(event);
+}
+
 const createProxy = ({
   componentName,
   wrappedEleName,
@@ -11659,8 +11657,10 @@ class RawRecaptcha extends BaseClass {
 
   attributeChangedCallback(attrName, oldValue, newValue) {
     super.attributeChangedCallback?.(attrName, oldValue, newValue);
-    if (attrName === 'enabled') {
-      this.#toggleRecaptcha(newValue === 'true');
+    if (oldValue !== newValue) {
+      if (attrName === 'enabled') {
+        this.#toggleRecaptcha(newValue === 'true');
+      }
     }
   }
 
@@ -11730,73 +11730,89 @@ class RawRecaptcha extends BaseClass {
   #toggleRecaptcha(enabled) {
     this.renderRecaptcha(enabled);
     if (enabled) {
-      this.#loadRecaptchaScript();
       this.#createOnLoadScript();
+      if (!document.getElementById('recaptcha-script')) {
+        this.#loadRecaptchaScript();
+      } else {
+        window.onRecaptchaLoadCallback();
+      }
     }
   }
 
   #loadRecaptchaScript() {
-    if (!document.getElementById('recaptcha-script')) {
-      const script = document.createElement('script');
-      script.src = this.scriptURL;
-      script.async = true;
-      script.id = 'recaptcha-script';
-      script.defer = true;
-      document.body.appendChild(script);
-    } else {
-      window.onRecaptchaLoadCallback();
-    }
+    const script = document.createElement('script');
+    script.src = this.scriptURL;
+    script.async = true;
+    script.id = 'recaptcha-script';
+    script.defer = true;
+    document.body.appendChild(script);
   }
 
-  #createOnLoadScript() {
-    if (window.onRecaptchaLoadCallback) {
-      return;
-    }
+  get grecaptchaInstance() {
+    return this.enterprise ? window.grecaptcha?.enterprise : window.grecaptcha;
+  }
 
+  #createOnLoadScript() {
     window.onRecaptchaLoadCallback = () => {
       const currentNode = this.recaptchaEle;
+
       // if there are child nodes, it means that the recaptcha was already rendered
       if (currentNode.hasChildNodes()) {
         return;
       }
-      const grecaptchaInstance = this.enterprise
-        ? window.grecaptcha?.enterprise
-        : window.grecaptcha;
+
+      const { grecaptchaInstance } = this;
 
       if (!grecaptchaInstance) {
         return;
       }
 
       setTimeout(() => {
-        const view = grecaptchaInstance.render(currentNode, {
+        // returns recaptchaWidgetId
+        const recaptchaWidgetId = grecaptchaInstance.render(currentNode, {
           sitekey: this.siteKey,
           badge: 'inline',
           size: 'invisible',
         });
+
         grecaptchaInstance.ready(() => {
           // clone the node and append it to the body so that it can be used by the grepcaptcha script
-          const cloneNode = currentNode.querySelector('#g-recaptcha-response')?.cloneNode();
+          const cloneNode = currentNode
+            .querySelector('textarea[name^="g-recaptcha-response"]')
+            ?.cloneNode();
           if (cloneNode) {
             cloneNode.style.display = 'none';
             document.body.appendChild(cloneNode);
           }
+
+          // cleaning up the recaptcha element we added to the body
+          const removeCloneNode = () => {
+            cloneNode.remove();
+          };
+
           if (this.siteKey) {
-            grecaptchaInstance?.execute(view, { action: this.action }).then((token) => {
-              this.updateComponentsContext({
-                risktoken: token,
-                riskaction: this.action,
+            // we should pass recaptchaWidgetId, but this does not allow us to run execute multiple times
+            // also calling grecaptchaInstance.reset() does not work
+            const exec = grecaptchaInstance?.execute(recaptchaWidgetId, { action: this.action });
+            exec
+              .then((token) => {
+                this.updateComponentsContext({
+                  risktoken: token,
+                  riskaction: this.action,
+                });
+
+                removeCloneNode();
+              })
+              .catch((e) => {
+                removeCloneNode();
+                // eslint-disable-next-line no-console
+                console.warn('could not execute recaptcha', e);
               });
-            });
           }
         });
       }, 0);
     };
   }
-
-  connectedCallback() {
-    super.connectedCallback?.();
-    this.#toggleRecaptcha(this.enabled);
-  }
 }
 
 const RecaptchaClass = compose(draggableMixin)(RawRecaptcha);