Merged in task/dspace-cris-2024_02_x/DSC-1786 (pull request DSpace#4610)

[DSC-1786] fix: i18n missing labels

Approved-by: Andrea Barbasso

Author: Francesco Mauto

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

@@ -24,7 +24,10 @@ import {
 import { RestResponse } from '../core/cache/response.models';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { GoogleRecaptchaService } from '../core/google-recaptcha/google-recaptcha.service';
+import {
+  CAPTCHA_REGISTRATION_NAME,
+  GoogleRecaptchaService,
+} from '../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../core/services/cookie.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { AlertComponent } from '../shared/alert/alert.component';
@@ -209,5 +212,15 @@ describe('RegisterEmailFormComponent', () => {
       expect(notificationsService.error).toHaveBeenCalled();
       expect(router.navigate).not.toHaveBeenCalled();
     }));
+    it('isRecaptchaCookieAccepted should return true when registration recaptcha cookie is accepted', () => {
+      const cookieService = TestBed.inject(CookieService) as unknown as CookieServiceMock;
+      cookieService.set('klaro-anonymous', { [CAPTCHA_REGISTRATION_NAME]: true });
+      expect(comp.isRecaptchaCookieAccepted()).toBeTrue();
+    });
+    it('isRecaptchaCookieAccepted should return false when registration recaptcha cookie is not accepted', () => {
+      const cookieService = TestBed.inject(CookieService) as unknown as CookieServiceMock;
+      cookieService.set('klaro-anonymous', { [CAPTCHA_REGISTRATION_NAME]: false });
+      expect(comp.isRecaptchaCookieAccepted()).toBeFalse();
+    });
   });
 });

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_FEEDBACK_NAME,
+  CAPTCHA_REGISTRATION_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_FEEDBACK_NAME] : false;
+    return isNotEmpty(klaroAnonymousCookie) ? klaroAnonymousCookie[CAPTCHA_REGISTRATION_NAME] : false;
   }
 
   /**

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

@@ -29,7 +29,10 @@ 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_FEEDBACK_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
+import {
+  CAPTCHA_FEEDBACK_NAME,
+  CAPTCHA_REGISTRATION_NAME,
+} from '../../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../../core/services/cookie.service';
 import {
   NativeWindowRef,
@@ -79,7 +82,7 @@ const updateDebounce = 300;
 /**
  * By using this injection token instead of importing directly we can keep Klaro out of the main bundle
  */
-const LAZY_KLARO = new InjectionToken<Promise<any>>(
+export const LAZY_KLARO = new InjectionToken<Promise<any>>(
   'Lazily loaded Klaro',
   {
     providedIn: 'root',
@@ -209,7 +212,10 @@ export class BrowserKlaroService extends KlaroService {
         if (hideGoogleAnalytics) {
           servicesToHideArray.push(this.GOOGLE_ANALYTICS_SERVICE_NAME);
         }
-        if (hideRegistrationVerification && hideFeedbackVerification) {
+        if (hideRegistrationVerification) {
+          servicesToHideArray.push(CAPTCHA_REGISTRATION_NAME);
+        }
+        if (hideFeedbackVerification) {
           servicesToHideArray.push(CAPTCHA_FEEDBACK_NAME);
         }
         if (hideMatomo) {

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

@@ -7,6 +7,7 @@ import { TOKENITEM } from '../../core/auth/models/auth-token-info.model';
 import {
   CAPTCHA_COOKIE,
   CAPTCHA_FEEDBACK_NAME,
+  CAPTCHA_REGISTRATION_NAME,
 } from '../../core/google-recaptcha/google-recaptcha.service';
 import { LANG_COOKIE } from '../../core/locale/locale.service';
 
@@ -209,7 +210,7 @@ export const klaroConfiguration: any = {
       onlyOnce: true,
     },
     {
-      name: CAPTCHA_FEEDBACK_NAME,
+      name: CAPTCHA_REGISTRATION_NAME,
       purposes: ['registration-password-recovery'],
       required: false,
       cookies: [
@@ -219,6 +220,17 @@ export const klaroConfiguration: any = {
       onDecline: `window.refreshCaptchaScript?.call()`,
       onlyOnce: true,
     },
+    {
+      name: CAPTCHA_FEEDBACK_NAME,
+      purposes: ['feedback-form-submission'],
+      required: false,
+      cookies: [
+        CAPTCHA_COOKIE,
+      ],
+      onAccept: `window.refreshCaptchaScript?.call()`,
+      onDecline: `window.refreshCaptchaScript?.call()`,
+      onlyOnce: true,
+    },
     {
       name: 'accessibility',
       purposes: ['functional'],

src/assets/i18n/en.json5

@@ -2082,7 +2082,9 @@
 
   "cookies.consent.app.title.google-recaptcha-registration": "Google reCaptcha",
 
-  "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during the send feedback form",
+
+  "cookies.consent.app.description.google-recaptcha-registration": "We use google reCAPTCHA service during registration and password recovery",
 
   "cookies.consent.app.title.matomo": "Matomo",
 

src/assets/i18n/it.json5

@@ -3362,7 +3362,11 @@
 
 
   // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
-  "cookies.consent.app.description.google-recaptcha": "Utilizziamo il servizio Google reCAPTCHA nelle fasi di registrazione e recupero password",
+  "cookies.consent.app.description.google-recaptcha": "Utilizziamo il servizio Google reCAPTCHA nella fase di invio feedback",
+
+  // "cookies.consent.app.description.google-recaptcha-registration": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha-registration": "Utilizziamo il servizio Google reCAPTCHA nelle fasi di registrazione e recupero password",
+
 
 
   // "cookies.consent.app.title.matomo": "Matomo",