feat: fetch current customer info on new login method

bigcommerce · Jul 31, 2023 · eb2a5d2 · eb2a5d2
1 parent e947abe
commit eb2a5d2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/apps/storefront/src/components/HeadlessController.tsx b/apps/storefront/src/components/HeadlessController.tsx
@@ -154,8 +154,16 @@ export default function HeadlessController({
           logInWithStorefrontToken: (customerJWTToken: string) =>
             getCurrentCustomerInfo(dispatch, customerJWTToken),
           graphqlBCProxy: B3Request.graphqlBCProxy,
-          loginWithB2BStorefrontToken: (b2bStorefrontJWTToken: string) =>
-            B3SStorage.set('B2BToken', b2bStorefrontJWTToken),
+          loginWithB2BStorefrontToken: async (
+            b2bStorefrontJWTToken: string
+          ) => {
+            B3SStorage.set('B2BToken', b2bStorefrontJWTToken)
+            await getCurrentCustomerInfo(
+              dispatch,
+              undefined,
+              b2bStorefrontJWTToken
+            )
+          },
         },
         shoppingList: {
           addProductFromPage: () => {

diff --git a/apps/storefront/src/index.d.ts b/apps/storefront/src/index.d.ts
@@ -33,7 +33,9 @@ declare interface Window {
           customerJWTToken: string
         ) => Promise<{ role: number; userType: string } | undefined>
         graphqlBCProxy: typeof import('@/shared/service/request/b3Fetch').default.graphqlBCProxy
-        loginWithB2BStorefrontToken: (b2bStorefrontJWTToken: string) => void
+        loginWithB2BStorefrontToken: (
+          b2bStorefrontJWTToken: string
+        ) => Promise<void>
       }
       shoppingList: {
         addProductFromPage: () => void

diff --git a/apps/storefront/src/shared/service/bc/graphql/user.ts b/apps/storefront/src/shared/service/bc/graphql/user.ts
@@ -12,7 +12,7 @@ const getCustomer = () => `query customer {
 }`
 
 const getCustomerInfo = (): CustomFieldItems =>
-  B3Request.graphqlBC({
+  B3Request.graphqlBCProxy({
     query: getCustomer(),
   })
 

diff --git a/apps/storefront/src/shared/service/request/b3Fetch.ts b/apps/storefront/src/shared/service/request/b3Fetch.ts
@@ -132,7 +132,7 @@ const B3Request = {
    */
   graphqlBCProxy: function post<T>(data: T): Promise<any> {
     const config = {
-      Authorization: `Bearer  ${B3SStorage.get('B3B2BToken') || ''}`,
+      Authorization: `Bearer  ${B3SStorage.get('B2BToken') || ''}`,
     }
     return graphqlRequest(RequestType.BCProxyGraphql, data, config)
   },

diff --git a/apps/storefront/src/utils/loginInfo.ts b/apps/storefront/src/utils/loginInfo.ts
@@ -306,7 +306,8 @@ export const getCompanyUserInfo = async (
 
 export const getCurrentCustomerInfo = async (
   dispatch: DispatchProps,
-  jwtToken?: string
+  jwtToken?: string,
+  b2bToken?: string
 ) => {
   try {
     const {
@@ -333,10 +334,12 @@ export const getCurrentCustomerInfo = async (
     if (companyUserInfo && customerId) {
       const { userType, role, id } = companyUserInfo
 
-      await getB2BTokenWithJWTToken(
-        userType,
-        jwtToken || (await getCurrentJwt())
-      )
+      if (!b2bToken) {
+        await getB2BTokenWithJWTToken(
+          userType,
+          jwtToken || (await getCurrentJwt())
+        )
+      }
 
       const [companyInfo] = await Promise.all([
         getCompanyInfo(id, role, userType),