fix: provide correct tokens to clients

vtex-apps · Jun 10, 2024 · 7359649 · 7359649
1 parent ad697a4
commit 7359649
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 
 ### Fixed
-
+- Provide correct tokens to clients
 - Add catalog-info.yaml
 
 ## [1.11.1] - 2023-12-15

diff --git a/node/clients/Organizations.ts b/node/clients/Organizations.ts
@@ -25,8 +25,8 @@ export class OrganizationsGraphQLClient extends AppGraphQLClient {
         },
       },
       {
+        headers: getTokenToHeader(this.context),
         params: {
-          headers: getTokenToHeader(this.context),
           locale: this.context.locale,
         },
       }
@@ -48,8 +48,8 @@ export class OrganizationsGraphQLClient extends AppGraphQLClient {
         },
       },
       {
+        headers: getTokenToHeader(this.context),
         params: {
-          headers: getTokenToHeader(this.context),
           locale: this.context.locale,
         },
       }

diff --git a/node/clients/StorefrontPermissions.ts b/node/clients/StorefrontPermissions.ts
@@ -23,8 +23,8 @@ export default class StorefrontPermissions extends AppGraphQLClient {
         variables: {},
       },
       {
+        headers: getTokenToHeader(this.context),
         params: {
-          headers: getTokenToHeader(this.context),
           locale: this.context.locale,
         },
       }

diff --git a/node/clients/index.ts b/node/clients/index.ts
@@ -26,15 +26,22 @@ export class Clients extends IOClients {
 }
 
 export const getTokenToHeader = (ctx: IOContext) => {
-  const token =
-    ctx.storeUserAuthToken ?? ctx.adminUserAuthToken ?? ctx.authToken
+  const adminToken = ctx.adminUserAuthToken ?? ctx.authToken
+  const userToken = ctx.storeUserAuthToken
+  const { sessionToken, account } = ctx
 
-  const { sessionToken } = ctx
+  let allCookies = `VtexIdclientAutCookie=${adminToken}`
+
+  if (userToken) {
+    allCookies += `; VtexIdclientAutCookie_${account}=${userToken}`
+  }
 
   return {
     'x-vtex-credential': ctx.authToken,
-    VtexIdclientAutCookie: token,
-    cookie: `VtexIdclientAutCookie=${token}`,
-    'x-vtex-session': sessionToken,
+    VtexIdclientAutCookie: adminToken,
+    cookie: allCookies,
+    ...(sessionToken && {
+      'x-vtex-session': sessionToken,
+    }),
   }
 }