[DSC-1786] [DSC-1786] fix captcha cookie old ref to klaro, fix missing subscribe + minor refactor

 Porting of [CST-26767]

Author: FrancescoMauto

src/app/core/google-recaptcha/google-recaptcha-base.component.ts

@@ -15,7 +15,7 @@ import { CookieService } from '../services/cookie.service';
 import { isNotEmpty } from './../../shared/empty.util';
 import { NotificationsService } from './../../shared/notifications/notifications.service';
 import {
-  CAPTCHA_NAME,
+  CAPTCHA_FEEDBACK_NAME,
   GoogleRecaptchaService,
 } from './google-recaptcha.service';
 
@@ -81,7 +81,7 @@ export abstract class GoogleRecaptchaBaseComponent {
   isRecaptchaCookieAccepted(): boolean {
     const orejimeAnonymousCookie = this.cookieService.get('orejime-anonymous');
     return isNotEmpty(orejimeAnonymousCookie)
-      ? orejimeAnonymousCookie[CAPTCHA_NAME]
+      ? orejimeAnonymousCookie[CAPTCHA_FEEDBACK_NAME]
       : false;
   }
 

src/app/core/google-recaptcha/google-recaptcha.service.ts

@@ -33,7 +33,7 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 export const CAPTCHA_COOKIE = '_GRECAPTCHA';
 export const CAPTCHA_REGISTRATION_NAME = 'google-recaptcha-registration';
 
-export const CAPTCHA_NAME = 'google-recaptcha';
+export const CAPTCHA_FEEDBACK_NAME = 'google-recaptcha';
 
 /**
  * A GoogleRecaptchaService used to send action and get a token from REST
@@ -109,7 +109,7 @@ export class GoogleRecaptchaService {
         if (
           this.cookieService.get('klaro-anonymous') && (
             this.cookieService.get('klaro-anonymous')[CAPTCHA_REGISTRATION_NAME] ||
-          this.cookieService.get('klaro-anonymous')[CAPTCHA_NAME]
+          this.cookieService.get('klaro-anonymous')[CAPTCHA_FEEDBACK_NAME]
           ) &&
           recaptchaKeyRD.hasSucceeded && recaptchaVersionRD.hasSucceeded &&
           isNotEmpty(recaptchaVersionRD.payload?.values) && isNotEmpty(recaptchaKeyRD.payload?.values)

src/app/info/feedback/feedback-form/feedback-form.component.html

@@ -59,14 +59,14 @@ <h1>{{ 'info.feedback.head' | translate }}</h1>
         }
       </fieldset>
 
-      @if (submissionVerification && !isRecaptchaCookieAccepted()) {
+      @let captchaCookieAccepted = isRecaptchaCookieAccepted();
+      @if (submissionVerification && !captchaCookieAccepted) {
         <ds-alert [type]="AlertTypeEnum.Warning">
           <p class="m-0" [innerHTML]="MESSAGE_PREFIX + '.google-recaptcha.must-accept-cookies' | translate"></p>
           <p class="m-0"><a href="javascript:void(0);" (click)="openCookieSettings()">{{ MESSAGE_PREFIX + '.google-recaptcha.open-cookie-settings' | translate }}</a></p>
         </ds-alert>
       }
-
-      @if (isRecaptchaCookieAccepted() && (captchaVersion() | async) === 'v2') {
+      @if (captchaCookieAccepted && (googleRecaptchaService.captchaVersion() | async) === 'v2') {
         <div class="my-3">
           <ds-google-recaptcha [captchaMode]="(captchaMode() | async)"
             (executeRecaptcha)="submitFeedback($event)" (checkboxChecked)="onCheckboxChecked($event)"
@@ -79,7 +79,7 @@ <h1>{{ 'info.feedback.head' | translate }}</h1>
           <div class="control-group col-sm-12 text-end">
             @if (!((captchaVersion() | async) === 'v2' && (captchaMode() | async) === 'invisible')) {
               <button class="btn btn-primary"
-                [dsBtnDisabled]="feedbackForm.invalid || submissionVerification && !isRecaptchaCookieAccepted() || disableUntilChecked"
+                [dsBtnDisabled]="feedbackForm.invalid || submissionVerification && !captchaCookieAccepted || disableUntilChecked"
                 (click)="submitFeedback()">
                 {{ 'info.feedback.send' | translate }}
               </button>

src/app/info/feedback/feedback-form/feedback-form.component.ts

@@ -57,6 +57,7 @@ import { ConfigurationDataService } from '../../../core/data/configuration-data.
 import { CookieService } from '../../../core/services/cookie.service';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { KlaroService } from 'src/app/shared/cookies/klaro.service';
+import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model';
 
 @Component({
   selector: 'ds-base-feedback-form',
@@ -113,6 +114,17 @@ export class FeedbackFormComponent extends GoogleRecaptchaBaseComponent implemen
     @Optional() public klaroService: KlaroService,
   ) {
     super(googleRecaptchaService, cookieService, notificationsService, translate);
+
+    this.subscriptions.push(
+      this.configService.findByPropertyName('feedback.verification.enabled').pipe(
+        getFirstSucceededRemoteDataPayload(),
+        map((res: ConfigurationProperty) => res?.values[0].toLowerCase() === 'true'),
+      ).subscribe((res: boolean) => {
+        this.submissionVerification = res;
+        if (res) {
+          this.googleRecaptchaService.loadRecaptchaProperties().subscribe();
+        }
+      }));
   }
 
   /**

src/app/register-email-form/register-email-form.component.ts

@@ -42,7 +42,7 @@ import { ConfigurationDataService } from '../core/data/configuration-data.servic
 import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { RemoteData } from '../core/data/remote-data';
 import {
-  CAPTCHA_NAME,
+  CAPTCHA_FEEDBACK_NAME,
   GoogleRecaptchaService,
 } from '../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../core/services/cookie.service';
@@ -247,7 +247,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
    */
   isRecaptchaCookieAccepted(): boolean {
     const klaroAnonymousCookie = this.cookieService.get('klaro-anonymous');
-    return isNotEmpty(klaroAnonymousCookie) ? klaroAnonymousCookie[CAPTCHA_NAME] : false;
+    return isNotEmpty(klaroAnonymousCookie) ? klaroAnonymousCookie[CAPTCHA_FEEDBACK_NAME] : false;
   }
 
   /**

src/app/shared/cookies/browser-klaro.service.ts

@@ -29,7 +29,7 @@ import { AuthService } from '../../core/auth/auth.service';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
+import { CAPTCHA_FEEDBACK_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../../core/services/cookie.service';
 import {
   NativeWindowRef,
@@ -210,7 +210,7 @@ export class BrowserKlaroService extends KlaroService {
           servicesToHideArray.push(this.GOOGLE_ANALYTICS_SERVICE_NAME);
         }
         if (hideRegistrationVerification && hideFeedbackVerification) {
-          servicesToHideArray.push(CAPTCHA_NAME);
+          servicesToHideArray.push(CAPTCHA_FEEDBACK_NAME);
         }
         if (hideMatomo) {
           servicesToHideArray.push(MATOMO_KLARO_KEY);