Merge pull request #84 from AddSearch/sc-11776/js-client-error-handling-when-cookies-contain-uri-incompatible-characters

Sc 11776/js client error handling when cookies contain uri incompatible characters

Author: haoAddsearch

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "addsearch-js-client",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "AddSearch API JavaScript client",
   "repository": {
     "type": "git",
@@ -48,6 +48,7 @@
   "dependencies": {
     "axios": "^1.7.2",
     "buffer": "^6.0.3",
+    "cookie": "^1.0.2",
     "es6-promise": "^4.2.8",
     "js-base64": "^3.6.0",
     "uuid": "^11.0.3"

package.json

@@ -1,37 +1,42 @@
+import cookie from 'cookie';
+
 const setCookie = (cookieName: string, cookieValue: string, expireDays: number): void => {
   if (typeof document === 'undefined') {
     return;
   }
+
   const date = new Date();
   date.setTime(date.getTime() + expireDays * 24 * 60 * 60 * 1000);
-  const expires = 'expires=' + date.toUTCString();
-  document.cookie = `${cookieName}=${cookieValue};${expires};path=/`;
+
+  document.cookie = cookie.serialize(cookieName, cookieValue, {
+    expires: date,
+    path: '/'
+  });
 };
 
 const getCookie = (cookieName: string): string | undefined => {
   if (typeof document === 'undefined') {
     return;
   }
-  const name = `${cookieName}=`;
-  const decodedCookie = decodeURIComponent(document.cookie);
-  const cookieArray = decodedCookie.split(';');
-  for (let i = 0; i < cookieArray.length; i++) {
-    let cookie = cookieArray[i];
-    while (cookie.charAt(0) === ' ') {
-      cookie = cookie.substring(1);
-    }
-    if (cookie.indexOf(name) === 0) {
-      return cookie.substring(name.length, cookie.length);
-    }
+
+  try {
+    const cookies = cookie.parse(document.cookie);
+    return cookies[cookieName];
+  } catch (error) {
+    console.debug('Error parsing cookies:', error);
+    return undefined;
   }
-  return undefined;
 };
 
 const deleteCookie = (name: string): void => {
   if (typeof document === 'undefined') {
     return;
   }
-  document.cookie = `${name}=; Path=/; Expires=Thu, 01 Jan 2000 00:00:01 GMT;`;
+
+  document.cookie = cookie.serialize(name, '', {
+    expires: new Date(0),
+    path: '/'
+  });
 };
 
 export { setCookie, getCookie, deleteCookie };