@faststore/api 2.1.83 → 2.1.98

package/dist/api.esm.js

@@ -18,7 +18,7 @@ import { trace, context, SpanKind } from '@opentelemetry/api';
 import { SeverityNumber } from '@opentelemetry/api-logs';
 
 var name = "@faststore/api";
-var version = "2.1.82";
+var version = "2.1.90";
 var license = "MIT";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
@@ -91,7 +91,7 @@ var packageJson = {
 };
 
 const USER_AGENT = `${packageJson.name}@${packageJson.version}`;
-const fetchAPI = async (info, init) => {
+const fetchAPI = async (info, init, getHeaders) => {
   const response = await fetch(info, {
     ...init,
     headers: {
@@ -100,6 +100,9 @@ const fetchAPI = async (info, init) => {
     }
   });
   if (response.ok) {
+    if (getHeaders) {
+      getHeaders(response.headers);
+    }
     return response.status !== 204 ? response.json() : undefined;
   }
   console.error(info, init, response);
@@ -107,15 +110,10 @@ const fetchAPI = async (info, init) => {
   throw new Error(text);
 };
 
-const getCookie = (name, cookie) => {
-  const value = `; ${cookie}`;
-  const parts = value.split(`; ${name}=`);
-  if (parts.length === 2) {
-    var _parts$pop$split$shif, _parts$pop;
-    return (_parts$pop$split$shif = parts == null ? void 0 : (_parts$pop = parts.pop()) == null ? void 0 : _parts$pop.split(';').shift()) != null ? _parts$pop$split$shif : '';
-  }
-  return '';
-};
+function getCookieByName(cookiename, source) {
+  var cookiestring = RegExp(cookiename + '=[^;]+').exec(source);
+  return decodeURIComponent(!!cookiestring ? cookiestring.toString().replace(/^[^=]+./, '') : '');
+}
 
 const BASE_INIT = {
   method: 'POST',
@@ -123,6 +121,12 @@ const BASE_INIT = {
     'content-type': 'application/json'
   }
 };
+const setCheckoutOrderFormOwnershipCookie = (headers, ctx) => {
+  if (headers) {
+    var _headers$get;
+    ctx.storage.cookies = `CheckoutOrderFormOwnership=${getCookieByName('CheckoutOrderFormOwnership', (_headers$get = headers.get('set-cookie')) != null ? _headers$get : '')}`;
+  }
+};
 const VtexCommerce = ({
   account,
   environment,
@@ -197,7 +201,7 @@ const VtexCommerce = ({
             'content-type': 'application/json',
             cookie: ctx.headers.cookie
           }
-        });
+        }, headers => setCheckoutOrderFormOwnershipCookie(headers, ctx));
       },
       orderForm: ({
         id,
@@ -211,7 +215,7 @@ const VtexCommerce = ({
           refreshOutdatedData: refreshOutdatedData.toString(),
           sc: salesChannel
         });
-        return fetchAPI(`${base}/api/checkout/pub/orderForm/${id}?${params.toString()}`, BASE_INIT);
+        return fetchAPI(`${base}/api/checkout/pub/orderForm/${id}?${params.toString()}`, BASE_INIT, headers => setCheckoutOrderFormOwnershipCookie(headers, ctx));
       },
       updateOrderFormItems: ({
         id,
@@ -231,7 +235,7 @@ const VtexCommerce = ({
             noSplitItem: !shouldSplitItem
           }),
           method: 'PATCH'
-        });
+        }, headers => setCheckoutOrderFormOwnershipCookie(headers, ctx));
       },
       setCustomData: ({
         id,
@@ -245,7 +249,7 @@ const VtexCommerce = ({
             value
           }),
           method: 'PUT'
-        });
+        }, headers => setCheckoutOrderFormOwnershipCookie(headers, ctx));
       },
       region: async ({
         postalCode,
@@ -271,35 +275,14 @@ const VtexCommerce = ({
     session: search => {
       const params = new URLSearchParams(search);
       params.set('items', 'profile.id,profile.email,profile.firstName,profile.lastName,store.channel,store.countryCode,store.cultureInfo,store.currencyCode,store.currencySymbol');
-      if (getCookie('vtex_session', ctx.headers.cookie)) {
-        // cookie set
-        return fetchAPI(`${base}/api/sessions?${params.toString()}`, {
-          method: 'GET',
-          headers: {
-            'content-type': 'application/json',
-            cookie: ctx.headers.cookie
-          }
-        });
-      } else {
-        // cookie unset -> create session
-        return fetchAPI(`${base}/api/sessions?${params.toString()}`, {
-          method: 'POST',
-          headers: {
-            'content-type': 'application/json',
-            cookie: ctx.headers.cookie
-          },
-          body: '{}'
-        });
-      }
-    },
-    getSessionOrder: () => {
-      return fetchAPI(`${base}/api/sessions?items=public.orderFormId`, {
-        method: 'GET',
+      return fetchAPI(`${base}/api/sessions?${params.toString()}`, {
+        method: 'POST',
         headers: {
           'content-type': 'application/json',
           cookie: ctx.headers.cookie
-        }
-      });
+        },
+        body: '{}'
+      }, headers => setCheckoutOrderFormOwnershipCookie(headers, ctx));
     },
     subscribeToNewsletter: data => {
       return fetchAPI(`${base}/api/dataentities/NL/documents/`, {
@@ -1363,17 +1346,6 @@ const isOrderFormStale = form => {
   const newEtag = getOrderFormEtag(form);
   return newEtag !== oldEtag;
 };
-async function getOrderNumberFromSession(headers = {}, commerce) {
-  const cookieSession = getCookie('vtex_session', headers.cookie);
-  if (cookieSession) {
-    var _namespaces$public$or, _namespaces$public, _namespaces$public$or2;
-    const {
-      namespaces
-    } = await commerce.getSessionOrder();
-    return (_namespaces$public$or = (_namespaces$public = namespaces.public) == null ? void 0 : (_namespaces$public$or2 = _namespaces$public.orderFormId) == null ? void 0 : _namespaces$public$or2.value) != null ? _namespaces$public$or : undefined;
-  }
-  return;
-}
 // Returns the regionalized orderForm
 const getOrderForm = async (id, {
   clients: {
@@ -1445,9 +1417,8 @@ const validateCart = async (_, {
   },
   session
 }, ctx) => {
-  var _ref;
   const {
-    orderNumber: orderNumberFromCart,
+    orderNumber,
     acceptedOffer,
     shouldSplitItem
   } = order;
@@ -1457,8 +1428,7 @@ const validateCart = async (_, {
     },
     loaders: {
       skuLoader
-    },
-    headers
+    }
   } = ctx;
   const channel = session == null ? void 0 : session.channel;
   const locale = session == null ? void 0 : session.locale;
@@ -1468,19 +1438,9 @@ const validateCart = async (_, {
   if (locale) {
     mutateLocaleContext(ctx, locale);
   }
-  const orderNumberFromSession = await getOrderNumberFromSession(headers, commerce);
-  const orderNumber = (_ref = orderNumberFromSession != null ? orderNumberFromSession : orderNumberFromCart) != null ? _ref : '';
   // Step1: Get OrderForm from VTEX Commerce
   const orderForm = await getOrderForm(orderNumber, ctx);
-  // Step1.1: Checks if the orderForm id has changed. There are three cases for this:
-  // Social Selling: the vtex_session cookie contains a new orderForm id with Social Selling data
-  // My Orders: the customer clicks on reordering through generating a new cart and when returning to the faststore, this information needs to be returned by vtex_session cookie.
-  // New session: a new user enters the website and has no orderForm attributed to it (has no relation to the vtex_session cookie).
-  // In all cases, the origin orderForm should replace the copy that's in the browser
-  if (orderForm.orderFormId != orderNumberFromCart) {
-    return orderFormToCart(orderForm, skuLoader);
-  }
-  // Step1.2: Check if another system changed the orderForm with this orderNumber
+  // Step1.5: Check if another system changed the orderForm with this orderNumber
   // If so, this means the user interacted with this cart elsewhere and expects
   // to see this new cart state instead of what's stored on the user's browser.
   const isStale = isOrderFormStale(orderForm);