hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DURACOM-191] Refactoring in order to remove nested subscriptions

Browse Source
This commit is contained in:
Giuseppe Digilio
2024-03-13 12:26:14 +01:00
parent 0ff19db071
commit e03f68d239
1 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/app/core/google-recaptcha/google-recaptcha.service.ts
View File

@@ -8,6 +8,7 @@ import {
import {
BehaviorSubject,
combineLatest,
EMPTY,
Observable,
of,
} from 'rxjs';
@@ -15,6 +16,7 @@ import {
map,
switchMap,
take,
tap,
} from 'rxjs/operators';
import { isNotEmpty } from '../../shared/empty.util';
@@ -84,14 +86,12 @@ export class GoogleRecaptchaService {
return res.hasSucceeded && res.payload && isNotEmpty(res.payload.values) && res.payload.values[0].toLowerCase() === 'true';
}),
);
registrationVerification$.subscribe(registrationVerification => {
if (registrationVerification) {
this.loadRecaptchaProperties();
}
});
registrationVerification$.pipe(
switchMap((registrationVerification: boolean) => registrationVerification ? this.loadRecaptchaProperties() : EMPTY),
).subscribe();
}
loadRecaptchaProperties() {
loadRecaptchaProperties(): Observable<any> {
const recaptchaKeyRD$ = this.configService.findByPropertyName('google.recaptcha.key.site').pipe(
getFirstCompletedRemoteData(),
);
@@ -101,40 +101,42 @@ export class GoogleRecaptchaService {
const recaptchaModeRD$ = this.configService.findByPropertyName('google.recaptcha.mode').pipe(
getFirstCompletedRemoteData(),
);
combineLatest([recaptchaVersionRD$, recaptchaModeRD$, recaptchaKeyRD$]).subscribe(([recaptchaVersionRD, recaptchaModeRD, recaptchaKeyRD]) => {
return combineLatest([recaptchaVersionRD$, recaptchaModeRD$, recaptchaKeyRD$]).pipe(
tap(([recaptchaVersionRD, recaptchaModeRD, recaptchaKeyRD]) => {
if (
this.cookieService.get('klaro-anonymous') && this.cookieService.get('klaro-anonymous')[CAPTCHA_NAME] &&
recaptchaKeyRD.hasSucceeded && recaptchaVersionRD.hasSucceeded &&
isNotEmpty(recaptchaVersionRD.payload?.values) && isNotEmpty(recaptchaKeyRD.payload?.values)
) {
const key = recaptchaKeyRD.payload?.values[0];
const version = recaptchaVersionRD.payload?.values[0];
this.captchaKeySubject$.next(key);
this.captchaVersionSubject$.next(version);
if (
this.cookieService.get('klaro-anonymous') && this.cookieService.get('klaro-anonymous')[CAPTCHA_NAME] &&
recaptchaKeyRD.hasSucceeded && recaptchaVersionRD.hasSucceeded &&
isNotEmpty(recaptchaVersionRD.payload?.values) && isNotEmpty(recaptchaKeyRD.payload?.values)
) {
const key = recaptchaKeyRD.payload?.values[0];
const version = recaptchaVersionRD.payload?.values[0];
this.captchaKeySubject$.next(key);
this.captchaVersionSubject$.next(version);
let captchaUrl;
switch (version) {
case 'v3':
if (recaptchaKeyRD.hasSucceeded && isNotEmpty(recaptchaKeyRD.payload?.values)) {
captchaUrl = this.buildCaptchaUrl(key);
this.captchaModeSubject$.next('invisible');
}
break;
case 'v2':
if (recaptchaModeRD.hasSucceeded && isNotEmpty(recaptchaModeRD.payload?.values)) {
captchaUrl = this.buildCaptchaUrl();
this.captchaModeSubject$.next(recaptchaModeRD.payload?.values[0]);
}
break;
default:
// TODO handle error
let captchaUrl;
switch (version) {
case 'v3':
if (recaptchaKeyRD.hasSucceeded && isNotEmpty(recaptchaKeyRD.payload?.values)) {
captchaUrl = this.buildCaptchaUrl(key);
this.captchaModeSubject$.next('invisible');
}
break;
case 'v2':
if (recaptchaModeRD.hasSucceeded && isNotEmpty(recaptchaModeRD.payload?.values)) {
captchaUrl = this.buildCaptchaUrl();
this.captchaModeSubject$.next(recaptchaModeRD.payload?.values[0]);
}
break;
default:
// TODO handle error
}
if (captchaUrl) {
this.loadScript(captchaUrl);
}
}
if (captchaUrl) {
this.loadScript(captchaUrl);
}
}
});
}),
);
}
/**
@@ -188,7 +190,7 @@ export class GoogleRecaptchaService {
}
refreshCaptchaScript = () => {
this.loadRecaptchaProperties();
this.loadRecaptchaProperties().subscribe();
};
}