Merge pull request #28 from Necroskillz/protractor_timeout_fix

Render/execute recaptcha outside angular zone to prevent protractor from getting stuck on timeouts
Enngage · Oct 2, 2018 · 0577418 · 0577418
2 parents 58e4c29 + f9e5dd9
commit 0577418
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/projects/ngx-captcha-lib/src/lib/components/invisible-recaptcha.component.ts b/projects/ngx-captcha-lib/src/lib/components/invisible-recaptcha.component.ts
@@ -64,7 +64,7 @@ export class InvisibleReCaptchaComponent extends BaseReCaptchaComponent implemen
    */
   execute(): void {
     // execute captcha
-    this.reCaptchaApi.execute(this.captchaId);
+    this.zone.runOutsideAngular(() => this.reCaptchaApi.execute(this.captchaId));
   }
 
   protected captchaSpecificSetup(): void {

diff --git a/projects/ngx-captcha-lib/src/lib/services/recaptcha_v3.service.ts b/projects/ngx-captcha-lib/src/lib/services/recaptcha_v3.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@angular/core';
+import { Injectable, NgZone } from '@angular/core';
 
 import { ScriptService } from './script.service';
 
 @Injectable()
 export class ReCaptchaV3Service {
 
     constructor(
-        protected scriptService: ScriptService
+        protected scriptService: ScriptService,
+        protected zone: NgZone
     ) {
     }
 
@@ -21,10 +22,12 @@ export class ReCaptchaV3Service {
      */
     execute(siteKey: string, action: string, callback: (token: string) => void): void {
         this.scriptService.registerCaptchaScript(siteKey, (grecaptcha) => {
-            grecaptcha.execute(siteKey, {
-                action: action
-            }).then((token) => {
-                callback(token);
+            this.zone.runOutsideAngular(() => {
+                grecaptcha.execute(siteKey, {
+                    action: action
+                }).then((token) => {
+                    this.zone.run(() => callback(token));
+                });
             });
         });
     }