fix: account loadding

bigcommerce · Apr 27, 2023 · c48bb18 · c48bb18
1 parent 64b0634
commit c48bb18
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 38 deletions.
diff --git a/apps/storefront/src/App.tsx b/apps/storefront/src/App.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useContext, useEffect } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { HashRouter } from 'react-router-dom'
 import { useB3AppOpen } from '@b3/hooks'
 
@@ -31,7 +31,7 @@ import {
   setStorefrontConfig,
 } from '@/utils'
 
-import { globalStateSelector, setGlabolCommonState } from './store'
+import { setGlabolCommonState } from './store'
 
 const FONT_URL =
   'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap'
@@ -56,12 +56,8 @@ export default function App() {
 
   const storeDispatch = useDispatch()
 
-  // isLoadComplete
-  const isLoadComplete = useSelector(globalStateSelector)
-
   const [{ isOpen, openUrl, params }, setOpenPage] = useB3AppOpen({
     isOpen: false,
-    isLoaddingComplete: isLoadComplete,
   })
 
   const {
@@ -157,9 +153,11 @@ export default function App() {
         isAgenting,
       }
 
-      const info = await getCurrentCustomerInfo(dispatch)
-      if (info) {
-        userInfo.role = info?.role
+      if (!customerId || isRelogin) {
+        const info = await getCurrentCustomerInfo(dispatch)
+        if (info) {
+          userInfo.role = info?.role
+        }
       }
 
       // background login enter judgment and refresh

diff --git a/apps/storefront/src/components/B3StoreContainer.tsx b/apps/storefront/src/components/B3StoreContainer.tsx
@@ -34,14 +34,7 @@ export function B3StoreContainer(props: B3StoreContainerProps) {
 
   useLayoutEffect(() => {
     const getStoreBasicInfo = async () => {
-      // if (
-      //   window.location.pathname.includes('account.php') ||
-      //   window.location.hash
-      // ) {
-      //   showPageMask(dispatch, true)
-      // }
-
-      showPageMask(dispatch, true)
+      if (!B3SStorage.get('bcJwtToken')) showPageMask(dispatch, true)
 
       try {
         const { storeBasicInfo }: CustomFieldItems = await getBCStoreChannelId()

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

diff --git a/apps/storefront/src/shared/service/request/fetch.ts b/apps/storefront/src/shared/service/request/fetch.ts
@@ -37,7 +37,7 @@ function b3Fetch(
           try {
             await getCurrentJwt()
             const config = {
-              Authorization: `Bearer  ${B3SStorage.get('bc_jwt_token') || ''}`,
+              Authorization: `Bearer  ${B3SStorage.get('bcJwtToken') || ''}`,
             }
             const headers = {
               'content-type': 'application/json',

diff --git a/apps/storefront/src/utils/loginInfo.ts b/apps/storefront/src/utils/loginInfo.ts
@@ -96,7 +96,7 @@ export const clearCurrentCustomerInfo = async (dispatch: DispatchProps) => {
   B3SStorage.set('B3EmailAddress', '')
   B3SStorage.set('B3Role', '')
   B3SStorage.set('isB2BUser', false)
-  B3SStorage.set('bc_jwt_token', '')
+  B3SStorage.set('bcJwtToken', '')
   B3SStorage.set('B3B2BToken', false)
   B3SStorage.set('B3UserId', '')
 
@@ -131,7 +131,7 @@ export const getCurrentJwt = async () => {
       app_client_id: 'r2x8j3tn54wduq47b4efct5tqxio5z2',
     })
 
-    B3SStorage.set('bc_jwt_token', res)
+    B3SStorage.set('bcJwtToken', res)
     return res
   } catch (error) {
     console.log(error)

diff --git a/packages/hooks/useB3AppOpen.ts b/packages/hooks/useB3AppOpen.ts
@@ -6,7 +6,6 @@ import useMutationObservable from './useMutationObservable'
 export interface OpenPageState {
   isOpen: boolean
   openUrl?: string
-  isLoaddingComplete?: boolean
   params?: { [key: string]: string }
 }
 
@@ -57,21 +56,14 @@ export const useB3AppOpen = (initOpenState: OpenPageState) => {
           e.preventDefault()
           e.stopPropagation()
 
-          if (
-            !(
-              initOpenState?.isLoaddingComplete &&
-              allOtherArr.includes(e.target)
-            )
-          ) {
-            const href = (e.target as HTMLAnchorElement).href || ''
-            const gotoUrl = registerArr.includes(e.target)
-              ? getCurrentLoginUrl(href)
-              : '/orders'
-            setOpenPage({
-              isOpen: true,
-              openUrl: gotoUrl,
-            })
-          }
+          const href = (e.target as HTMLAnchorElement).href || ''
+          const gotoUrl = registerArr.includes(e.target)
+            ? getCurrentLoginUrl(href)
+            : '/orders'
+          setOpenPage({
+            isOpen: true,
+            openUrl: gotoUrl,
+          })
         }
         return false
       }
@@ -85,7 +77,7 @@ export const useB3AppOpen = (initOpenState: OpenPageState) => {
       }
     }
     return () => {}
-  }, [checkoutRegisterNumber, initOpenState?.isLoaddingComplete])
+  }, [checkoutRegisterNumber])
 
   useMutationObservable(globalB3['dom.checkoutRegisterParentElement'], callback)