[UXP-10] Fix remove Recaptcha from klaro config

This commit is contained in:
Davide Negretti
2022-09-08 17:14:14 +02:00
parent 0b7cf23e3f
commit 05784bfec6

View File

@@ -7,7 +7,7 @@ import { environment } from '../../../environments/environment';
import { switchMap, take } from 'rxjs/operators'; import { switchMap, take } from 'rxjs/operators';
import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPerson } from '../../core/eperson/models/eperson.model';
import { KlaroService } from './klaro.service'; import { KlaroService } from './klaro.service';
import { hasValue, isNotEmpty } from '../empty.util'; import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
import { CookieService } from '../../core/services/cookie.service'; import { CookieService } from '../../core/services/cookie.service';
import { EPersonDataService } from '../../core/eperson/eperson-data.service'; import { EPersonDataService } from '../../core/eperson/eperson-data.service';
import { cloneDeep, debounce } from 'lodash'; import { cloneDeep, debounce } from 'lodash';
@@ -75,10 +75,8 @@ export class BrowserKlaroService extends KlaroService {
this.configService.findByPropertyName('registration.verification.enabled').pipe( this.configService.findByPropertyName('registration.verification.enabled').pipe(
getFirstCompletedRemoteData(), getFirstCompletedRemoteData(),
).subscribe((remoteData) => { ).subscribe((remoteData) => {
this.klaroConfig = klaroConfiguration; if (!remoteData.hasSucceeded || isEmpty(remoteData.payload?.values) || remoteData.payload.values[0].toLowerCase() !== 'true') {
// make sure we got a success response from the backend this.klaroConfig.services = klaroConfiguration.services.filter(config => config.name !== CAPTCHA_NAME);
if (!remoteData.hasSucceeded || !remoteData.payload || isEmpty(remoteData.payload.values) || remoteData.payload.values[0].toLowerCase() !== 'true') {
this.removeGoogleRecaptcha();
} }
}); });
this.translateService.setDefaultLang(environment.defaultLanguage); this.translateService.setDefaultLang(environment.defaultLanguage);
@@ -271,11 +269,4 @@ export class BrowserKlaroService extends KlaroService {
return 'klaro-' + identifier; return 'klaro-' + identifier;
} }
/**
* remove the google recaptcha from the services
*/
removeGoogleRecaptcha(): void {
this.klaroConfig.services = klaroConfiguration.services.filter(config => config.name !== CAPTCHA_NAME);
}
} }