Merge branch 'master' into fix/login-error

CHANGELOG.md

@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Force setProfile to use a valid cost center
 - Increase timeout to 45 seconds
 
+## [1.44.11] - 2024-10-10
+
+### Fixed
+
+- Error changing Cost Center after placing order
+
 ## [1.44.10] - 2024-10-07
 
 ### Fixed

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "storefront-permissions",
   "vendor": "vtex",
-  "version": "1.44.10",
+  "version": "1.44.11",
   "title": "Storefront Permissions",
   "description": "Manage User's permissions on apps that relates to this app",
   "mustUpdateAt": "2022-08-28",

node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vtex.checkout-ui-custom",
-  "version": "1.44.10",
+  "version": "1.44.11",
   "dependencies": {
     "@vtex/api": "6.47.0",
     "atob": "^2.1.2",

node/resolvers/Mutations/Users.ts

@@ -11,6 +11,48 @@ import {
 
 const config: any = currentSchema('b2b_users')
 
+const MAX_RETRY = 5
+const RETRY_BACKOFF_FACTOR_MS = 100
+const MAX_BACKOFF_MS = 1000
+
+const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+const setChangeSession = async (
+  sessionParameters: any,
+  countRetry = 0
+): Promise<void> => {
+  const {
+    context: {
+      clients: { session },
+      vtex: { logger },
+    },
+    publicKey,
+    value,
+    sessionCookie,
+  } = sessionParameters
+
+  try {
+    await session.updateSession(publicKey, value, [], sessionCookie)
+  } catch (error) {
+    logger.error({
+      error,
+      message: 'setChangeSession.error',
+      attempt: countRetry,
+    })
+
+    if (countRetry < MAX_RETRY) {
+      countRetry++
+      const backoff = Math.min(
+        2 ** (countRetry - 1) * RETRY_BACKOFF_FACTOR_MS,
+        MAX_BACKOFF_MS
+      )
+
+      await delay(backoff)
+
+      return setChangeSession(sessionParameters, countRetry)
+    }
+  }
+}
+
 const addUserToMasterdata = async ({
   masterdata,
   params: { name, email },
@@ -333,14 +375,18 @@ export const deleteUser = async (_: any, params: any, ctx: Context) => {
 
 export const impersonateUser = async (_: any, params: any, ctx: Context) => {
   const {
-    clients: { session },
     vtex: { logger, sessionToken },
   } = ctx
 
   const { userId } = params
 
   try {
-    await session.updateSession('impersonate', userId, [], sessionToken)
+    await setChangeSession({
+      context: ctx,
+      publicKey: 'impersonate',
+      value: userId,
+      sessionCookie: sessionToken,
+    })
 
     return { status: 'success', message: '' }
   } catch (error) {
@@ -564,12 +610,14 @@ export const setCurrentOrganization = async (
   ctx: Context
 ) => {
   const {
+    vtex: { logger },
     cookies,
     request,
-    vtex: { logger },
-    clients: { session },
   } = ctx
 
+  const sessionCookie =
+    cookies.get('vtex_session') ?? request.header?.sessiontoken
+
   const { sessionData } = ctx.vtex as any
 
   const { orgId, costId } = params
@@ -600,11 +648,7 @@ export const setCurrentOrganization = async (
     return { status: 'error', message: error }
   }
 
-  const sessionCookie =
-    cookies.get('vtex_session') ?? request.header?.sessiontoken
-
   try {
-    await session.updateSession('', null, [], sessionCookie)
     await setActiveUserByOrganization(
       _,
       {
@@ -626,6 +670,13 @@ export const setCurrentOrganization = async (
 
     sendChangeTeamMetric(metricParams)
 
+    await setChangeSession({
+      context: ctx,
+      publicKey: 'b2bCurrentCostCenter',
+      value: costId,
+      sessionCookie,
+    })
+
     return { status: 'success', message: '' }
   } catch (error) {
     logger.error({
@@ -646,14 +697,18 @@ export const ignoreB2BSessionData = async (
     cookies,
     request,
     vtex: { logger },
-    clients: { session },
   } = ctx
 
   const sessionCookie =
     cookies.get('vtex_session') ?? request.header?.sessiontoken
 
   try {
-    await session.updateSession('removeB2B', enabled, [], sessionCookie)
+    await setChangeSession({
+      context: ctx,
+      publicKey: 'removeB2B',
+      value: enabled,
+      sessionCookie,
+    })
 
     return { status: 'success', message: '' }
   } catch (error) {

vtex.session/configuration.json

@@ -4,7 +4,7 @@
       "authentication": ["storeUserEmail"],
       "checkout": ["orderFormId"],
       "impersonate": ["storeUserEmail", "storeUserId"],
-      "public": ["impersonate", "removeB2B"]
+      "public": ["impersonate", "removeB2B", "b2bCurrentCostCenter"]
     },
     "output": {
       "public": ["facets", "sc", "regionId"],