Merge pull request #125 from vtex-apps/feat/remove-b2b-from-session

New mutation to remove/add B2B session data

.github/workflows/qe-dispatch.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   quality-engineering:
     name: QE
-    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2
+    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2.1.14
     with:
       cypress: true
       cyRunnerBranch: ${{ github.event.inputs.cyRunnerBranch }}

.github/workflows/qe-pull-request-target.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   quality-engineering:
     name: QE
-    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2
+    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2.1.14
     with:
       danger: true
       dangerRequireChangelog: false

.github/workflows/qe-pull-request.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   quality-engineering:
     name: QE
-    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2
+    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2.1.14
     with:
       danger: true
       dangerRequireChangelog: false

.github/workflows/qe-push.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   quality-engineering:
     name: QE
-    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2
+    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2.1.14
     with:
       nodeLint: true
       nodeTest: false

.github/workflows/qe-schedule.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   quality-engineering:
     name: QE
-    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2
+    uses: vtex-apps/usqa/.github/workflows/quality-engineering.yml@v2.1.14
     with:
       cypress: true
       cyRunnerTimeOut: 45

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- New `ignoreB2BSessionData` mutation to allow a user to leave/resume the B2B context
+
 ## [1.38.0] - 2023-12-14
 
 ### Added
@@ -52,16 +56,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.35.2] - 2023-07-13
 
 ### Changed
+
 - Edited README.md file
 
 ## [1.35.1] - 2023-06-29
 
-### Fixed 
+### Fixed
 
 - Removing the document on orderform in case of business/corporate profile data
 - Removing all the non digits from the business document to prevent checkout errors
 
-
 ## [1.35.0] - 2023-05-31
 
 ### Added
@@ -89,11 +93,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.33.3] - 2023-05-08
 
 ### Fixed
+
 - Fixed issue where `documentType` is always set to cpf
 
 ## [1.33.2] - 2023-05-03
 
 ### Fixed
+
 - geoCoordinates empty
 
 ## [1.33.1] - 2023-04-21
@@ -106,24 +112,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
-- Fix on impersonation user 
-
+- Fix on impersonation user
 
 ## [1.32.0] - 2023-04-19
 
 ### Added
 
 - Added the x-b2b-senderapp header to fix problems with the new B2B API
 
-
 ## [1.31.5] - 2023-04-11
 
 ### Fixed
 
-- Fixed clear call async calls 
-
+- Fixed clear call async calls
 
 ### Removed
+
 - [ENGINEERS-1247] - Disable cypress tests in PR level
 
 ### Changed
@@ -137,7 +141,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed the `setProfile` to clear the cart properly
 - Improved calls on set profile in order to get faster response
 
-
 ## [1.31.3] - 2023-03-01
 
 ### Fixed
@@ -147,6 +150,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.31.2] - 2023-02-27
 
 ### Fixed
+
 - `setProfile` adding sku 1 to the cart to set sales channel when the cart is empty
 - `setProfile` losing item attachments after login
 
@@ -162,7 +166,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Added a feature when the user logs in or changes the current organization.
 
-
 ## [1.30.0] - 2023-02-09
 
 ### Added
@@ -226,7 +229,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - getOrganizationsByEmail is returning all users instead of only first 50 records
 
-
 ## [1.29.2] - 2022-11-28
 
 ### Fixed
@@ -245,7 +247,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [1.29.0] - 2022-11-08
 
-
 ### Added
 
 - Added the functionality to the storefront permissions to change the sales channel according to the Organization
@@ -262,7 +263,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Force the business document and state registration on setProfile method
 
-
 ## [1.27.0] - 2022-10-19
 
 ### Changed
@@ -299,7 +299,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
- - Changed the validation of the add user
+- Changed the validation of the add user
 
 ### Added
 

graphql/schema.graphql

@@ -161,6 +161,10 @@ type Mutation {
     @withSession
     @cacheControl(scope: PRIVATE)
     @withSender
+
+  ignoreB2BSessionData(enabled: Boolean!): MutationResponse
+    @withSession
+    @cacheControl(scope: PRIVATE)
 }
 
 type UserImpersonation {

node/resolvers/Mutations/Users.ts

@@ -639,3 +639,32 @@ export const setCurrentOrganization = async (
     return { status: 'error', message: error }
   }
 }
+
+export const ignoreB2BSessionData = async (
+  _: void,
+  { enabled }: { enabled: boolean },
+  ctx: Context
+) => {
+  const {
+    cookies,
+    request,
+    vtex: { logger },
+    clients: { session },
+  } = ctx
+
+  const sessionCookie =
+    cookies.get('vtex_session') ?? request.header?.sessiontoken
+
+  try {
+    await session.updateSession('removeB2B', enabled, [], sessionCookie)
+
+    return { status: 'success', message: '' }
+  } catch (error) {
+    logger.error({
+      error,
+      message: 'removeB2BSessionData.error',
+    })
+
+    return { status: 'error', message: error }
+  }
+}

node/resolvers/Routes/index.ts

@@ -162,6 +162,15 @@ export const Routes = {
     let stateRegistration = null
     let user = null
 
+    const ignoreB2B = body?.public?.removeB2B?.value
+
+    if (ignoreB2B) {
+      ctx.response.body = response
+      ctx.response.status = 200
+
+      return
+    }
+
     if (b2bImpersonate) {
       try {
         user = (await getUser({

node/resolvers/index.ts

@@ -8,6 +8,7 @@ import {
   addOrganizationToUser,
   addUser,
   deleteUser,
+  ignoreB2BSessionData,
   impersonateUser,
   saveUser,
   setActiveUserByOrganization,
@@ -40,6 +41,7 @@ export const resolvers = {
     addUser,
     deleteRole,
     deleteUser,
+    ignoreB2BSessionData,
     impersonateUser,
     saveRole,
     saveUser,

node/yarn.lock

@@ -1428,7 +1428,7 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-"stats-lite@github:vtex/node-stats-lite#dist":
+stats-lite@vtex/node-stats-lite#dist:
   version "2.2.0"
   resolved "https://codeload.github.com/vtex/node-stats-lite/tar.gz/1b0d39cc41ef7aaecfd541191f877887a2044797"
   dependencies:

vtex.session/configuration.json

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