Merge pull request #277 from ltonetwork/recaptcha-optional

No recaptcha for testnet bridge

Author: jasny

src/app/app.module.ts

@@ -76,7 +76,7 @@ import { environment } from '../environments/environment';
     {
       provide: RECAPTCHA_SETTINGS,
       useValue: {
-        siteKey: '6LebrZMUAAAAAEhsMU6H0QQChao1Ya3buSsBXunu',
+        siteKey: environment.recaptcha_site_key
       },
     },
     {

src/app/pages/bridge/bridge-swap/steps/deposit-erc/deposit-erc.component.html

@@ -5,7 +5,7 @@ <h2 mat-dialog-title>Your deposit address</h2>
   </ng-container>
   <ng-container *ngIf="shouldShowCaptcha && !captchaResponse; then captchaTpl;">
   </ng-container>
-  <ng-container *ngIf="captchaResponse; then addressTpl;">
+  <ng-container *ngIf="captchaResponse || (!shouldSpecifyToAddress && !shouldShowCaptcha); then addressTpl;">
   </ng-container>
 </mat-dialog-content>
 <mat-dialog-actions>

src/app/pages/bridge/bridge-swap/steps/deposit-erc/deposit-erc.component.ts

@@ -1,10 +1,11 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
 import { BridgeService, WalletService } from '../../../../../core';
 import { switchMap } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { SwapTokenType, SwapType } from '../../swap-type';
 import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import * as bech32 from 'bech32';
+import { RECAPTCHA_SETTINGS } from 'ng-recaptcha';
 
 @Component({
   selector: 'lto-wallet-deposit-erc',
@@ -81,13 +82,17 @@ export class DepositErcComponent implements OnInit {
 
   addressPlaceholder!: string;
 
-  constructor(private _bridge: BridgeService, private _wallet: WalletService) {}
+  constructor(
+    private _bridge: BridgeService,
+    private _wallet: WalletService,
+    @Inject(RECAPTCHA_SETTINGS) private _recaptchaSettings: { siteKey: string }
+  ) {}
 
   ngOnInit() {
     this.addressPlaceholder = this.swapType === SwapType.ERC20_BINANCE ? 'BEP-2' : 'LTO20';
     const addressValidators: ValidatorFn[] = [Validators.required];
 
-    this.shouldShowCaptcha = !this.shouldSpecifyToAddress;
+    this.shouldShowCaptcha = !!this._recaptchaSettings.siteKey && !this.shouldSpecifyToAddress;
 
     if (this.swapType === SwapType.ERC20_BINANCE) {
       addressValidators.push((ctrl: AbstractControl) => {
@@ -107,6 +112,8 @@ export class DepositErcComponent implements OnInit {
           };
         }
       });
+    } else if (!this.shouldShowCaptcha) {
+      this.resolveCaptcha('');
     }
 
     this.depositForm = new FormGroup({

src/environments/environment.local.ts

@@ -7,8 +7,9 @@ export const environment = {
   anchor_fee: 35000000,
   bridge: true,
   swapPageEnabled: false,
+  recaptcha_site_key: '',
   lto_api_url: 'https://testnet.lto.network/',
-  bridge_url: 'http://localhost:3002',
+  bridge_url: 'https://bridge.testnet.lto.network',
   mobile_auth: {
     ws: 'ws://localhost:3030/connect',
     url: 'http://localhost:3030/'

src/environments/environment.mainnet.ts

@@ -7,6 +7,7 @@ export const environment = {
   set_script_fee: 500000000,
   bridge: true,
   swapPageEnabled: true,
+  recaptcha_site_key: '6LebrZMUAAAAAEhsMU6H0QQChao1Ya3buSsBXunu',
   lto_api_url: 'https://nodes.lto.network/',
   bridge_url: 'https://bridge.lto.network',
   mobile_auth: {

src/environments/environment.testnet.ts

@@ -7,6 +7,7 @@ export const environment = {
   set_script_fee: 500000000,
   bridge: true,
   swapPageEnabled: false,
+  recaptcha_site_key: '',
   lto_api_url: 'https://testnet.lto.network/',
   bridge_url: 'https://bridge.testnet.lto.network',
   mobile_auth: {

src/environments/environment.ts

@@ -11,6 +11,7 @@ export const environment = {
   set_script_fee: 500000000,
   bridge: true,
   swapPageEnabled: true,
+  recaptcha_site_key: '',
   lto_api_url: 'https://testnet.lto.network/',
   bridge_url: 'https://bridge.testnet.lto.network',
   mobile_auth: {