wip: fix cookies magento

deco-cx · Dec 17, 2024 · b968ddb · b968ddb
1 parent 0d52e33
commit b968ddb
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 24 deletions.
diff --git a/magento/actions/cart/addItem.ts b/magento/actions/cart/addItem.ts
@@ -6,6 +6,7 @@ import { handleCartActions } from "../../utils/cart.ts";
 import { FORM_KEY_COOKIE } from "../../utils/constants.ts";
 import { HttpError } from "../../../utils/http.ts";
 import { OverrideFeatures } from "../../utils/client/types.ts";
+import { proxySetCookie } from "../../utils/utils.ts";
 
 export interface Props extends OverrideFeatures {
   qty: number;
@@ -69,26 +70,30 @@ const action = async (
 
     let cartId;
     const cookies = fetchHeaders.getSetCookie();
-    cookies.forEach((cookie) => {
-      const parsed = parseCookieString(cookie, url.includes("localhost"));
-
-      if (parsed.name === "dataservices_cart_id") {
-        cartId = parsed.value.replace(/%22/g, "");
-        setCookie(ctx.response.headers, {
-          ...parsed,
-          httpOnly: true,
-          secure: true,
-          path: "/",
-          unparsed: ["Priority=High"],
-        });
-        return;
-      }
-
-      setCookie(ctx.response.headers, {
-        ...parsed,
-        path: "/",
-      });
-    });
+
+    proxySetCookie(fetchHeaders, ctx.response.headers, new URL(url).origin);
+
+    console.log({ cookies });
+    // cookies.forEach((cookie) => {
+    //   const parsed = parseCookieString(cookie, url.includes("localhost"));
+
+    //   if (parsed.name === "dataservices_cart_id") {
+    //     cartId = parsed.value.replace(/%22/g, "");
+    //     setCookie(ctx.response.headers, {
+    //       ...parsed,
+    //       httpOnly: true,
+    //       secure: true,
+    //       path: "/",
+    //       unparsed: ["Priority=High"],
+    //     });
+    //     return;
+    //   }
+
+    //   setCookie(ctx.response.headers, {
+    //     ...parsed,
+    //     path: "/",
+    //   });
+    // });
 
     return handleCartActions(dontReturnCart, {
       req,

diff --git a/magento/utils/utils.ts b/magento/utils/utils.ts
@@ -6,12 +6,17 @@ export const proxySetCookie = (
   to: Headers,
   toDomain?: URL | string,
 ) => {
-  const newDomain = toDomain && new URL(toDomain);
+  const domain = toDomain && new URL(toDomain);
+  const newDomain = domain && !domain.hostname.includes("localhost")
+    ? new URL(getTopDomain(domain.hostname))
+    : domain;
+
+  console.log({ newDomain });
 
   for (const cookie of getSetCookies(from)) {
-    if (cookie.name === SESSION_COOKIE) {
-      continue;
-    }
+    // if (cookie.name === SESSION_COOKIE) {
+    //   continue;
+    // }
     const newCookie = newDomain
       ? {
         ...cookie,
@@ -44,3 +49,17 @@ export const sortSearchParams = (url: URL) => {
 };
 
 export const sanitizePath = (path: string) => path.replace(/^\/?(rest\/)?/, "");
+
+export const getTopDomain = (domain: string): string => {
+  // Remove protocol and any trailing slash
+  const cleanDomain = domain.replace(/^(https?:)?\/\//, "").replace(/\/$/, "");
+
+  // Split by dots and get the last two parts
+  const parts = cleanDomain.split(".");
+  if (parts.length <= 2) return cleanDomain;
+  if (parts.length > 3) {
+    return parts.slice(-3).join(".");
+  }
+
+  return parts.slice(-2).join(".");
+};