[CST-15593] fix orejime cookie name, a11y issues and package-lock

4Science · Oct 31, 2024 · 0ab4d90 · 0ab4d90
1 parent 9eaaab5
commit 0ab4d90
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
@@ -54,9 +54,9 @@ before(() => {
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
-  // Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
+  // Pre-agree to all Orejime cookies by setting the orejime cookie
   // This just ensures it doesn't get in the way of matching other objects in the page.
-  cy.setCookie('orejime-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+  cy.setCookie('orejime', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
 
   // Remove any CSRF cookies saved from prior tests
   cy.clearCookie(DSPACE_XSRF_COOKIE);

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.ts b/src/app/core/google-recaptcha/google-recaptcha.service.ts
@@ -105,7 +105,7 @@ export class GoogleRecaptchaService {
       tap(([recaptchaVersionRD, recaptchaModeRD, recaptchaKeyRD]) => {
 
         if (
-          this.cookieService.get('orejime-anonymous') && this.cookieService.get('orejime-anonymous')[CAPTCHA_NAME] &&
+          this.cookieService.get('orejime') && this.cookieService.get('orejime')[CAPTCHA_NAME] &&
           recaptchaKeyRD.hasSucceeded && recaptchaVersionRD.hasSucceeded &&
           isNotEmpty(recaptchaVersionRD.payload?.values) && isNotEmpty(recaptchaKeyRD.payload?.values)
         ) {

diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
@@ -247,7 +247,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
    * Return true if the user has accepted the required cookies for reCaptcha
    */
   isRecaptchaCookieAccepted(): boolean {
-    const orejimeAnonymousCookie = this.cookieService.get('orejime-anonymous');
+    const orejimeAnonymousCookie = this.cookieService.get('orejime');
     return isNotEmpty(orejimeAnonymousCookie) ? orejimeAnonymousCookie[CAPTCHA_NAME] : false;
   }
 

diff --git a/src/app/shared/cookies/orejime-configuration.ts b/src/app/shared/cookies/orejime-configuration.ts
@@ -15,7 +15,7 @@ import { NativeWindowRef } from '../../core/services/window.service';
  */
 export const HAS_AGREED_END_USER = 'dsHasAgreedEndUser';
 
-export const ANONYMOUS_STORAGE_NAME_OREJIME = 'orejime-anonymous';
+export const ANONYMOUS_STORAGE_NAME_OREJIME = 'orejime';
 
 export const GOOGLE_ANALYTICS_OREJIME_KEY = 'google-analytics';
 

diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
@@ -148,6 +148,6 @@
   --ds-process-overview-table-info-column-width: 250px;
   --ds-process-overview-table-actions-column-width: 80px;
 
-  --green1: #1FB300;  // This variable represents the success color for the Orejime cookie banner
+  --green1: #1c710a;  // This variable represents the success color for the Orejime cookie banner
   --button-text-color-cookie: #fff; // This variable represents the text color for buttons in the Orejime cookie banner
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
@@ -56,7 +56,7 @@ body {
   }
 
   a {
-    color: var(--green1);
+    color: var(--bs-white);
   }
 }