From e03f68d239557bd2053629a3b794ad250a755ef3 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Wed, 13 Mar 2024 12:26:14 +0100
Subject: [PATCH] [DURACOM-191] Refactoring in order to remove nested
 subscriptions

---
 .../google-recaptcha.service.ts               | 78 ++++++++++---------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.ts b/src/app/core/google-recaptcha/google-recaptcha.service.ts
index 5de8add85c..b4028f9835 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.ts
@@ -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();
   };
 
 }