[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
@@ -107,10 +107,8 @@ export class GoogleRecaptchaService {
       tap(([recaptchaVersionRD, recaptchaModeRD, recaptchaKeyRD]) => {
 
         if (
-          this.cookieService.get('orejime-anonymous') && (
-            this.cookieService.get('orejime-anonymous')[CAPTCHA_REGISTRATION_NAME] ||
-          this.cookieService.get('klaro-anonymous')[CAPTCHA_NAME]
-          ) &&
+          this.cookieService.get('orejime-anonymous') &&
+          (this.cookieService.get('orejime-anonymous')[CAPTCHA_FEEDBACK_NAME] || this.cookieService.get('orejime-anonymous')[CAPTCHA_REGISTRATION_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

@@ -56,6 +56,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { OrejimeService } from '../../../shared/cookies/orejime.service';
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { CookieService } from '../../../core/services/cookie.service';
+import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model';
 
 @Component({
   selector: 'ds-base-feedback-form',
@@ -120,6 +121,17 @@ export class FeedbackFormComponent extends GoogleRecaptchaBaseComponent implemen
     @Optional() public orejimeService: OrejimeService,
   ) {
     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

@@ -39,7 +39,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';
@@ -251,7 +251,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
    */
   isRecaptchaCookieAccepted(): boolean {
     const orejimeAnonymousCookie = this.cookieService.get('orejime-anonymous');
-    return isNotEmpty(orejimeAnonymousCookie) ? orejimeAnonymousCookie[CAPTCHA_NAME] : false;
+    return isNotEmpty(orejimeAnonymousCookie) ? orejimeAnonymousCookie[CAPTCHA_FEEDBACK_NAME] : false;
   }
 
   /**

src/app/shared/cookies/browser-orejime.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,
@@ -212,7 +212,7 @@ export class BrowserOrejimeService extends OrejimeService {
           appsToHideArray.push(this.GOOGLE_ANALYTICS_SERVICE_NAME);
         }
         if (hideRegistrationVerification && hideFeedbackVerification) {
-          appsToHideArray.push(CAPTCHA_NAME);
+          appsToHideArray.push(CAPTCHA_FEEDBACK_NAME);
         }
         if (hideMatomo) {
           appsToHideArray.push(MATOMO_OREJIME_KEY);

src/app/shared/cookies/orejime-configuration.ts

@@ -6,7 +6,8 @@ import {
 import { TOKENITEM } from '../../core/auth/models/auth-token-info.model';
 import {
   CAPTCHA_COOKIE,
-  CAPTCHA_NAME,
+  CAPTCHA_FEEDBACK_NAME,
+  CAPTCHA_REGISTRATION_NAME,
 } from '../../core/google-recaptcha/google-recaptcha.service';
 import { LANG_COOKIE } from '../../core/locale/locale.service';
 import { NativeWindowRef } from '../../core/services/window.service';
@@ -212,7 +213,7 @@ export function getOrejimeConfiguration(_window: NativeWindowRef): any {
         onlyOnce: true,
       },
       {
-        name: CAPTCHA_NAME,
+        name: CAPTCHA_REGISTRATION_NAME,
         purposes: ['registration-password-recovery'],
         required: false,
         cookies: [
@@ -223,6 +224,18 @@ export function getOrejimeConfiguration(_window: NativeWindowRef): any {
         },
         onlyOnce: true,
       },
+      {
+        name: CAPTCHA_FEEDBACK_NAME,
+        purposes: ['feedback-form-submission'],
+        required: false,
+        cookies: [
+          CAPTCHA_COOKIE,
+        ],
+        callback: (consent: boolean) => {
+          _window?.nativeWindow.refreshCaptchaScript?.call();
+        },
+        onlyOnce: true,
+      },
       {
         name: 'accessibility',
         purposes: ['functional'],