@faststore/api 2.1.83 → 2.1.98

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

@@ -64,7 +64,6 @@ export declare const VtexCommerce: ({ account, environment, incrementAddress }:
         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

@@ -57,7 +57,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

@@ -29,6 +29,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": "2.1.83",
+  "version": "2.1.98",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -56,5 +56,5 @@
     "@envelop/core": "^1 || ^2",
     "graphql": "^15.6.0"
   },
-  "gitHead": "a55301974a0ab1894b32414d372091d956fbc17b"
+  "gitHead": "5b295774a676946af022c70fb0d04914d3bd3a44"
 }

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 { DeliveryMode, SelectedAddress } 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, incrementAddress }: Options,
   ctx: Context
@@ -131,8 +143,9 @@ export const VtexCommerce = (
             headers: {
               'content-type': 'application/json',
               cookie: ctx.headers.cookie,
-            }
-          }
+            },
+          },
+          (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
         )
       },
 
@@ -153,7 +166,8 @@ export const VtexCommerce = (
 
         return fetchAPI(
           `${base}/api/checkout/pub/orderForm/${id}?${params.toString()}`,
-          BASE_INIT
+          BASE_INIT,
+          (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
         )
       },
       updateOrderFormItems: ({
@@ -183,7 +197,8 @@ export const VtexCommerce = (
               noSplitItem: !shouldSplitItem,
             }),
             method: 'PATCH',
-          }
+          },
+          (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
         )
       },
       setCustomData: ({
@@ -203,7 +218,8 @@ export const VtexCommerce = (
             ...BASE_INIT,
             body: JSON.stringify({ value }),
             method: 'PUT',
-          }
+          },
+          (headers) => setCheckoutOrderFormOwnershipCookie(headers, ctx)
         )
       },
       region: async ({
@@ -243,35 +259,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=public.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

@@ -35,7 +35,7 @@ export interface Options {
   channel: string
   locale: string
   hideUnavailableItems: boolean
-  incrementAddress: boolean,
+  incrementAddress: boolean
   flags?: FeatureFlags
 }
 
@@ -57,6 +57,7 @@ export interface Context {
     locale: string
     flags: FeatureFlags
     searchArgs?: Omit<SearchArgs, 'type'>
+    cookies?: string | null
   }
   headers: Record<string, string>
 }
@@ -92,16 +93,16 @@ const Resolvers = {
 
 export const getContextFactory =
   (options: Options) =>
-    (ctx: any): Context => {
-      ctx.storage = {
-        channel: ChannelMarshal.parse(options.channel),
-        flags: options.flags ?? {},
-        locale: options.locale,
-      }
-      ctx.clients = getClients(options, ctx)
-      ctx.loaders = getLoaders(options, ctx)
-
-      return ctx
+  (ctx: any): Context => {
+    ctx.storage = {
+      channel: ChannelMarshal.parse(options.channel),
+      flags: options.flags ?? {},
+      locale: options.locale,
     }
+    ctx.clients = getClients(options, ctx)
+    ctx.loaders = getLoaders(options, ctx)
+
+    return ctx
+  }
 
 export const getResolvers = (_: Options) => Resolvers

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

@@ -1,7 +1,6 @@
 import deepEquals from 'fast-deep-equal'
 
 import { mutateChannelContext, mutateLocaleContext } from '../utils/contex'
-import { getCookie } from '../utils/getCookies'
 import { md5 } from '../utils/md5'
 import {
   attachmentToPropertyValue,
@@ -130,7 +129,8 @@ const joinItems = (form: OrderForm) => {
       const totalPrice = items.reduce(
         (acc, i) =>
           acc +
-          (i?.priceDefinition?.total ?? (i?.quantity ?? 0) * (i?.sellingPrice ?? 0)),
+          (i?.priceDefinition?.total ??
+            (i?.quantity ?? 0) * (i?.sellingPrice ?? 0)),
         0
       )
 
@@ -207,19 +207,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.public?.orderFormId?.value ?? undefined
-  }
-  return
-}
-
 // Returns the regionalized orderForm
 const getOrderForm = async (id: string, { clients: { commerce } }: Context) => {
   return commerce.checkout.orderForm({
@@ -303,15 +290,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
@@ -325,25 +307,10 @@ 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, 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)
@@ -424,6 +391,7 @@ export const validateCart = async (
   if (equals(order, updatedOrderForm)) {
     return null
   }
+
   // Step6: There were changes, convert orderForm to StoreCart
   return orderFormToCart(updatedOrderForm, skuLoader)
 }

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 ''
-}