[Port dspace-9_x] fix: update js-cookie to v3 and refactor cookie services (#4833) (#4850)

Co-authored-by: Roshan Kumar <theroshansingh89@gmail.com>

Author: dspace-bot

package-lock.json

@@ -133,7 +133,7 @@
     "http-proxy-middleware": "^2.0.9",
     "http-terminator": "^3.2.0",
     "isbot": "^5.1.31",
-    "js-cookie": "2.2.1",
+    "js-cookie": "3.0.5",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
     "jsonschema": "1.5.0",
@@ -185,7 +185,7 @@
     "@types/express": "^4.17.17",
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
-    "@types/js-cookie": "2.2.6",
+    "@types/js-cookie": "3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^18.19.124",
     "@typescript-eslint/eslint-plugin": "^7.18.0",

package.json

@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  CookieAttributes,
-  getJSON,
-  remove,
-  set,
-} from 'js-cookie';
+import Cookies, { CookieAttributes } from 'js-cookie';
 
 import {
   CookieService,
@@ -15,20 +10,40 @@ import {
 export class ClientCookieService extends CookieService implements ICookieService {
 
   public set(name: string, value: any, options?: CookieAttributes): void {
-    set(name, value, options);
+    const toStore = typeof value === 'string' ? value : JSON.stringify(value);
+    Cookies.set(name, toStore, options);
     this.updateSource();
   }
 
   public remove(name: string, options?: CookieAttributes): void {
-    remove(name, options);
+    Cookies.remove(name, options);
     this.updateSource();
   }
 
   public get(name: string): any {
-    return getJSON(name);
+    const raw = Cookies.get(name);
+    if (raw === undefined) {
+      return undefined;
+    }
+    try {
+      return JSON.parse(raw);
+    } catch {
+      return raw;
+    }
   }
 
   public getAll(): any {
-    return getJSON();
+    const all = Cookies.get();
+    const parsed: Record<string, any> = {};
+
+    Object.entries(all).forEach(([key, value]) => {
+      try {
+        parsed[key] = JSON.parse(value);
+      } catch {
+        parsed[key] = value;
+      }
+    });
+
+    return parsed;
   }
 }

src/app/core/services/client-cookie.service.ts

@@ -19,12 +19,22 @@ export interface ICookieService {
 
 @Injectable()
 export abstract class CookieService implements ICookieService {
-  protected readonly cookieSource = new Subject<{ readonly [key: string]: any }>();
+  protected readonly cookieSource = new Subject<{
+    readonly [key: string]: any;
+  }>();
+
   public readonly cookies$ = this.cookieSource.asObservable();
 
-  public abstract set(name: string, value: any, options?: CookieAttributes): void;
+  public abstract set(
+    name: string,
+    value: any,
+    options?: CookieAttributes,
+  ): void;
 
-  public abstract remove(name: string, options?: CookieAttributes): void;
+  public abstract remove(
+    name: string,
+    options?: CookieAttributes,
+  ): void;
 
   public abstract get(name: string): any;
 

src/app/core/services/cookie.service.ts

@@ -12,30 +12,58 @@ import {
 
 @Injectable()
 export class ServerCookieService extends CookieService implements ICookieService {
-
   constructor(@Inject(REQUEST) protected req: any) {
     super();
   }
 
-  public set(name: string, value: any, options?: CookieAttributes): void {
+  public set(
+    name: string,
+    value: any,
+    options?: CookieAttributes,
+  ): void {
     return;
   }
 
-  public remove(name: string, options?: CookieAttributes): void {
+  public remove(
+    name: string,
+    options?: CookieAttributes,
+  ): void {
     return;
   }
 
   public get(name: string): any {
+    if (!this.req || !this.req.cookies) {
+      return undefined;
+    }
+
+    const raw = this.req.cookies[name];
+    if (raw === undefined) {
+      return undefined;
+    }
+
     try {
-      return JSON.parse(this.req.cookies[name]);
-    } catch (err) {
-      return this.req ? this.req.cookies[name] : undefined;
+      return JSON.parse(raw);
+    } catch {
+      return raw;
     }
   }
 
   public getAll(): any {
-    if (this.req) {
-      return this.req.cookies;
+    if (!this.req || !this.req.cookies) {
+      return {};
     }
+
+    const all = this.req.cookies;
+    const parsed: Record<string, any> = {};
+
+    for (const [key, value] of Object.entries(all)) {
+      try {
+        parsed[key] = JSON.parse(value as string);
+      } catch {
+        parsed[key] = value;
+      }
+    }
+
+    return parsed;
   }
 }