@faststore/api 1.12.45 → 1.12.47

package/dist/platforms/vtex/clients/commerce/index.d.ts

@@ -62,7 +62,6 @@ export declare const VtexCommerce: ({ account, environment }: Options, ctx: Cont
         address: ({ postalCode, country, }: AddressInput) => Promise<Address>;
     };
     session: (search: string) => Promise<Session>;
-    getSessionOrder: () => Promise<Session>;
     subscribeToNewsletter: (data: {
         name: string;
         email: string;

package/dist/platforms/vtex/clients/fetch.d.ts

@@ -1 +1 @@
-export declare const fetchAPI: (info: RequestInfo, init?: RequestInit | undefined) => Promise<any>;
+export declare const fetchAPI: (info: RequestInfo, init?: RequestInit | undefined, getHeaders?: ((headers: Headers) => void) | undefined) => Promise<any>;

package/dist/platforms/vtex/clients/index.d.ts

@@ -55,7 +55,6 @@ export declare const getClients: (options: Options, ctx: Context) => {
             address: ({ postalCode, country, }: import("./commerce/types/Address").AddressInput) => Promise<import("./commerce/types/Address").Address>;
         };
         session: (search: string) => Promise<import("./commerce/types/Session").Session>;
-        getSessionOrder: () => Promise<import("./commerce/types/Session").Session>;
         subscribeToNewsletter: (data: {
             name: string;
             email: string;

package/dist/platforms/vtex/index.d.ts

@@ -28,6 +28,7 @@ export interface Context {
         locale: string;
         flags: FeatureFlags;
         searchArgs?: Omit<SearchArgs, 'type'>;
+        cookies?: string | null;
     };
     headers: Record<string, string>;
 }

package/dist/utils/get-cookie-by-name.d.ts

@@ -0,0 +1 @@
+export default function getCookieByName(cookiename: string, source: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/api",
-  "version": "1.12.45",
+  "version": "1.12.47",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -53,5 +53,5 @@
     "@envelop/core": "^1 || ^2",
     "graphql": "^15.6.0"
   },
-  "gitHead": "121360b0bdbc8eac7c71d660e3e6b3604bda7703"
+  "gitHead": "fb17d8b4870de83e2d738c99e2f46ff51209407d"
 }

package/src/platforms/vtex/clients/commerce/index.ts

@@ -15,11 +15,11 @@ import type {
 } from './types/Simulation'
 import type { Session } from './types/Session'
 import type { Channel } from '../../utils/channel'
-import { getCookie } from '../../utils/getCookies'
 import type { SalesChannel } from './types/SalesChannel'
 import { MasterDataResponse } from './types/Newsletter'
 import type { Address, AddressInput } from './types/Address'
 import { ShippingDataBody } from './types/ShippingData'
+import getCookieByName from '../../../../utils/get-cookie-by-name'
 
 type ValueOf<T> = T extends Record<string, infer K> ? K : never
 
@@ -30,6 +30,18 @@ const BASE_INIT = {
   },
 }
 
+const setCheckoutOrderFormOwnershipCookie = (
+  headers: Headers,
+  ctx: Context
+) => {
+  if (headers) {
+    ctx.storage.cookies = `CheckoutOrderFormOwnership=${getCookieByName(
+      'CheckoutOrderFormOwnership',
+      headers.get('set-cookie') ?? ''
+    )}`
+  }
+}
+
 export const VtexCommerce = (
   { account, environment }: Options,
   ctx: Context
@@ -100,16 +112,17 @@ export const VtexCommerce = (
         if (body.selectedAddresses) {
           body.selectedAddresses.forEach((address) => {
             if (address.geoCoordinates === null) {
-              address.geoCoordinates = [];
+              address.geoCoordinates = []
             }
-          });
+          })
         }
         return fetchAPI(
           `${base}/api/checkout/pub/orderForm/${id}/attachments/shippingData`,
           {
             ...BASE_INIT,
             body: JSON.stringify(body),
-          }
+          },
+          (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
         )
       },
       orderForm: ({
@@ -129,7 +142,8 @@ export const VtexCommerce = (
 
         return fetchAPI(
           `${base}/api/checkout/pub/orderForm/${id}?${params.toString()}`,
-          BASE_INIT
+          BASE_INIT,
+          (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
         )
       },
       updateOrderFormItems: ({
@@ -159,7 +173,8 @@ export const VtexCommerce = (
               noSplitItem: !shouldSplitItem,
             }),
             method: 'PATCH',
-          }
+          },
+          (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
         )
       },
       setCustomData: ({
@@ -179,7 +194,8 @@ export const VtexCommerce = (
             ...BASE_INIT,
             body: JSON.stringify({ value }),
             method: 'PUT',
-          }
+          },
+          (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
         )
       },
       region: async ({
@@ -188,7 +204,8 @@ export const VtexCommerce = (
         salesChannel,
       }: RegionInput): Promise<Region> => {
         return fetchAPI(
-          `${base}/api/checkout/pub/regions/?postalCode=${postalCode}&country=${country}&sc=${salesChannel ?? ''
+          `${base}/api/checkout/pub/regions/?postalCode=${postalCode}&country=${country}&sc=${
+            salesChannel ?? ''
           }`
         )
       },
@@ -208,35 +225,18 @@ export const VtexCommerce = (
         '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()}`, {
+      return fetchAPI(
+        `${base}/api/sessions?${params.toString()}`,
+        {
           method: 'POST',
           headers: {
             'content-type': 'application/json',
             cookie: ctx.headers.cookie,
           },
           body: '{}',
-        })
-      }
-    },
-    getSessionOrder: (): Promise<Session> => {
-      return fetchAPI(`${base}/api/sessions?items=checkout.orderFormId`, {
-        method: 'GET',
-        headers: {
-          'content-type': 'application/json',
-          cookie: ctx.headers.cookie,
         },
-      })
+        (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
+      )
     },
     subscribeToNewsletter: (data: {
       name: string

package/src/platforms/vtex/clients/fetch.ts

@@ -3,7 +3,11 @@ import packageJson from '../../../../package.json'
 
 const USER_AGENT = `${packageJson.name}@${packageJson.version}`
 
-export const fetchAPI = async (info: RequestInfo, init?: RequestInit) => {
+export const fetchAPI = async (
+  info: RequestInfo,
+  init?: RequestInit,
+  getHeaders?: (headers: Headers) => void
+) => {
   const response = await fetch(info, {
     ...init,
     headers: {
@@ -13,6 +17,10 @@ export const fetchAPI = async (info: RequestInfo, init?: RequestInit) => {
   })
 
   if (response.ok) {
+    if (getHeaders) {
+      getHeaders(response.headers)
+    }
+
     return response.status !== 204 ? response.json() : undefined
   }
 

package/src/platforms/vtex/index.ts

@@ -56,6 +56,7 @@ export interface Context {
     locale: string
     flags: FeatureFlags
     searchArgs?: Omit<SearchArgs, 'type'>
+    cookies?: string | null
   }
   headers: Record<string, string>
 }

package/src/platforms/vtex/resolvers/validateCart.ts

@@ -1,25 +1,26 @@
 import deepEquals from 'fast-deep-equal'
 
 import { mutateChannelContext, mutateLocaleContext } from '../utils/contex'
-import { getCookie } from '../utils/getCookies'
 import { md5 } from '../utils/md5'
 import {
   attachmentToPropertyValue,
   getPropertyId,
-  VALUE_REFERENCES
+  VALUE_REFERENCES,
 } from '../utils/propertyValue'
 
 import type { Context } from '..'
 import type {
   IStoreOffer,
   IStoreOrder,
-  IStorePropertyValue, IStoreSession, Maybe,
-  MutationValidateCartArgs
+  IStorePropertyValue,
+  IStoreSession,
+  Maybe,
+  MutationValidateCartArgs,
 } from '../../../__generated__/schema'
 import type {
   OrderForm,
   OrderFormInputItem,
-  OrderFormItem
+  OrderFormItem,
 } from '../clients/commerce/types/OrderForm'
 
 type Indexed<T> = T & { index?: number }
@@ -199,20 +200,6 @@ const isOrderFormStale = (form: OrderForm) => {
   return newEtag !== oldEtag
 }
 
-async function getOrderNumberFromSession(
-  headers: Record<string, string> = {},
-  commerce: Context['clients']['commerce']
-) {
-
-  const cookieSession = getCookie('vtex_session', headers.cookie)
-
-  if (cookieSession) {
-    const { namespaces } = await commerce.getSessionOrder()
-    return namespaces.checkout?.orderFormId?.value
-  }
-  return ;
-}
-
 // Returns the regionalized orderForm
 const getOrderForm = async (
   id: string,
@@ -266,11 +253,10 @@ export const validateCart = async (
   { cart: { order }, session }: MutationValidateCartArgs,
   ctx: Context
 ) => {
-  const { orderNumber:  orderNumberFromCart, acceptedOffer, shouldSplitItem } = order
+  const { orderNumber, acceptedOffer, shouldSplitItem } = order
   const {
     clients: { commerce },
     loaders: { skuLoader },
-    headers,
   } = ctx
 
   const channel = session?.channel
@@ -284,13 +270,6 @@ export const validateCart = async (
     mutateLocaleContext(ctx, locale)
   }
 
-  const orderNumberFromSession = await getOrderNumberFromSession(
-    headers,
-    commerce
-  )
-
-  const orderNumber = orderNumberFromSession ?? orderNumberFromCart ?? ''
-
   // Step1: Get OrderForm from VTEX Commerce
   const orderForm = await getOrderForm(orderNumber, session, ctx)
 
@@ -298,11 +277,11 @@ export const validateCart = async (
   // 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)
-  
+
   if (isStale && orderNumber) {
     const newOrderForm = await setOrderFormEtag(orderForm, commerce).then(
       joinItems
-      )
+    )
     return orderFormToCart(newOrderForm, skuLoader)
   }
 
@@ -366,9 +345,7 @@ export const validateCart = async (
       shouldSplitItem,
     })
     // update orderForm etag so we know last time we touched this orderForm
-    .then((form) =>
-      setOrderFormEtag(form, commerce)
-    )
+    .then((form) => setOrderFormEtag(form, commerce))
     .then(joinItems)
 
   // Step5: If no changes detected before/after updating orderForm, the order is validated

package/src/utils/get-cookie-by-name.ts

@@ -0,0 +1,6 @@
+export default function getCookieByName(cookiename: string, source: string) {
+  var cookiestring = RegExp(cookiename + '=[^;]+').exec(source)
+  return decodeURIComponent(
+    !!cookiestring ? cookiestring.toString().replace(/^[^=]+./, '') : ''
+  )
+}

package/dist/platforms/vtex/utils/getCookies.d.ts

@@ -1 +0,0 @@
-export declare const getCookie: (name: string, cookie: string) => string;

package/src/platforms/vtex/utils/getCookies.ts

@@ -1,8 +0,0 @@
-export const getCookie = (name: string, cookie: string): string => {
-  const value = `; ${cookie}`
-  const parts = value.split(`; ${name}=`)
-  if (parts.length === 2) {
-    return parts?.pop()?.split(';').shift() ?? ''
-  }
-  return ''
-}