Adds support for global domain

Enngage · Enngage · commit 1ffd8544ec47 · 2018-11-19T09:53:53.000+01:00
diff --git a/README.md b/README.md
@@ -78,6 +78,7 @@ your.template.html
     (expire)="handleExpire()"
     (load)="handleLoad()"
     (success)="handleSuccess($event)"
+    [useGlobalDomain]="false"
     [size]="size"
     [hl]="lang"
     [theme]="theme"
@@ -104,6 +105,8 @@ your.template.html
 
   this.reCaptchaV3Service.execute(this.siteKey, 'homepage', (token) => {
     console.log('This is your token: ', token);
+  }, {
+      useGlobalDomain: false
   });
  ```
 
@@ -117,6 +120,7 @@ your.template.html
     (ready)="handleReady()"
     (load)="handleLoad()"
     (success)="handleSuccess($event)"
+    [useGlobalDomain]="false"
     [type]="type"
     [badge]="badge"
     [ngModel]="recaptcha"
diff --git a/demo/src/installation.component.ts b/demo/src/installation.component.ts
@@ -29,6 +29,8 @@ export class AppModule { }
     [hl]="lang"
     [theme]="theme"
     [type]="type"
+    [useGlobalDomain]="false"
+    (reset)="handleReset()"
     (expire)="handleExpire()"
     (load)="handleLoad()"
     (success)="handleSuccess($event)"
diff --git a/demo/src/invisible-recaptcha-demo.component.html b/demo/src/invisible-recaptcha-demo.component.html
@@ -95,6 +95,7 @@ <h4>Live example</h4>
                                  (ready)="handleReady()"
                                  (load)="handleLoad()"
                                  (success)="handleSuccess($event)"
+                                 [useGlobalDomain]="false"
                                  [type]="type"
                                  [badge]="badge"
                                  [ngModel]="recaptcha"
diff --git a/demo/src/invisible-recaptcha-demo.component.ts b/demo/src/invisible-recaptcha-demo.component.ts
@@ -18,6 +18,7 @@ export class InvisibleReCaptchaDemoComponent implements AfterViewInit {
   (ready)="handleReady()"
   (load)="handleLoad()"
   (success)="handleSuccess($event)"
+  [useGlobalDomain]="false"
   [type]="type"
   [badge]="badge"
   [ngModel]="recaptcha"
diff --git a/demo/src/re-captcha-2-demo.component.html b/demo/src/re-captcha-2-demo.component.html
@@ -106,6 +106,7 @@ <h4>Live example</h4>
                           (expire)="handleExpire()"
                           (load)="handleLoad()"
                           (success)="handleSuccess($event)"
+                          [useGlobalDomain]="false"
                           [size]="size"
                           [hl]="lang"
                           [theme]="theme"
diff --git a/demo/src/re-captcha-2-demo.component.ts b/demo/src/re-captcha-2-demo.component.ts
@@ -40,6 +40,7 @@ import { NgxCaptchaModule } from 'ngx-captcha';
     (expire)="handleExpire()"
     (load)="handleLoad()"
     (success)="handleSuccess($event)"
+    [useGlobalDomain]="false"
     [size]="size"
     [hl]="lang"
     [theme]="theme"
diff --git a/demo/src/re-captcha-3-demo.component.ts b/demo/src/re-captcha-3-demo.component.ts
@@ -26,6 +26,8 @@ export class ReCaptcha3DemoComponent implements OnInit, AfterViewInit {
   public readonly methodCode = `
   this.reCaptchaV3Service.execute(this.siteKey, 'homepage', (token) => {
     console.log('This is your token: ', token);
+  }, {
+    useGlobalDomain: false // optional
   });
   `;
 
@@ -62,6 +64,8 @@ export class ReCaptcha3DemoComponent implements OnInit, AfterViewInit {
     this.reCaptchaV3Service.execute(this.siteKey, 'reCaptcha3DemoPage', (token) => {
       this.token = token;
       console.log('Your token is: ', token);
+    }, {
+      useGlobalDomain: false
     });
   }
 
diff --git a/projects/ngx-captcha-lib/README.md b/projects/ngx-captcha-lib/README.md
@@ -78,6 +78,7 @@ your.template.html
     (expire)="handleExpire()"
     (load)="handleLoad()"
     (success)="handleSuccess($event)"
+    [useGlobalDomain]="false"
     [size]="size"
     [hl]="lang"
     [theme]="theme"
@@ -104,6 +105,8 @@ your.template.html
 
   this.reCaptchaV3Service.execute(this.siteKey, 'homepage', (token) => {
     console.log('This is your token: ', token);
+  }, {
+      useGlobalDomain: false
   });
  ```
 
@@ -117,6 +120,7 @@ your.template.html
     (ready)="handleReady()"
     (load)="handleLoad()"
     (success)="handleSuccess($event)"
+    [useGlobalDomain]="false"
     [type]="type"
     [badge]="badge"
     [ngModel]="recaptcha"
diff --git a/projects/ngx-captcha-lib/src/lib/components/base-recaptcha.component.ts b/projects/ngx-captcha-lib/src/lib/components/base-recaptcha.component.ts
@@ -29,6 +29,11 @@ export abstract class BaseReCaptchaComponent implements OnChanges, ControlValueA
     */
     @Input() siteKey: string;
 
+    /**
+     * Indicates if global domain 'recaptcha.net' should be used instead of default domain ('google.com')
+     */
+    @Input() useGlobalDomain: boolean = false;
+
     /**
     * Type
     */
@@ -256,7 +261,7 @@ export abstract class BaseReCaptchaComponent implements OnChanges, ControlValueA
         // create captcha wrapper
         this.createAndSetCaptchaElem();
 
-        this.scriptService.registerCaptchaScript('explicit', (grecaptcha) => {
+        this.scriptService.registerCaptchaScript(this.useGlobalDomain, 'explicit', (grecaptcha) => {
             this.onloadCallback(grecaptcha);
         }, this.hl);
     }
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
@@ -20,8 +20,13 @@ export class ReCaptchaV3Service {
      * @param siteKey Site key found in your google admin panel
      * @param action Action to log
      */
-    execute(siteKey: string, action: string, callback: (token: string) => void): void {
-        this.scriptService.registerCaptchaScript(siteKey, (grecaptcha) => {
+    execute(siteKey: string, action: string, callback: (token: string) => void, config?: {
+        useGlobalDomain: boolean
+    }): void {
+
+        const useGlobalDomain = config && config.useGlobalDomain ? true : false;
+
+        this.scriptService.registerCaptchaScript(useGlobalDomain, siteKey, (grecaptcha) => {
             this.zone.runOutsideAngular(() => {
                 grecaptcha.execute(siteKey, {
                     action: action
diff --git a/projects/ngx-captcha-lib/src/lib/services/script.service.ts b/projects/ngx-captcha-lib/src/lib/services/script.service.ts
@@ -15,12 +15,16 @@ export class ScriptService {
     */
     protected readonly windowOnLoadCallbackProperty = 'ngx_captcha_onload_callback';
 
+    protected readonly globalDomain: string = 'recaptcha.net';
+
+    protected readonly defaultDomain: string = 'google.com';
+
     constructor(
         protected zone: NgZone,
     ) {
     }
 
-    registerCaptchaScript(render: string, onLoad: (grecaptcha: any) => void, language?: string): void {
+    registerCaptchaScript(useGlobalDomain: boolean, render: string, onLoad: (grecaptcha: any) => void, language?: string): void {
         if (this.grecaptchaScriptLoaded()) {
             // recaptcha script is already loaded
             // just call the callback
@@ -39,7 +43,7 @@ export class ScriptService {
         // prepare script elem
         const scriptElem = document.createElement('script');
         scriptElem.innerHTML = '';
-        scriptElem.src = this.getCaptchaScriptUrl(render, language);
+        scriptElem.src = this.getCaptchaScriptUrl(useGlobalDomain, render, language);
         scriptElem.async = true;
         scriptElem.defer = true;
 
@@ -76,9 +80,10 @@ export class ScriptService {
     /**
     * Url to google api script
     */
-    private getCaptchaScriptUrl(render: string, language?: string): string {
+    private getCaptchaScriptUrl(useGlobalDomain: boolean, render: string, language?: string): string {
+        const domain = useGlobalDomain ? this.globalDomain : this.defaultDomain;
         // tslint:disable-next-line:max-line-length
-        return `https://www.google.com/recaptcha/api.js?onload=${this.windowOnLoadCallbackProperty}&render=${render}${this.getLanguageParam(language)}`;
+        return `https://www.${domain}/recaptcha/api.js?onload=${this.windowOnLoadCallbackProperty}&render=${render}${this.getLanguageParam(language)}`;
     }
 
 }
