feat: jump to the page when the token expires

bigcommerce · Jan 18, 2023 · 8df0a62 · 8df0a62
1 parent 799abaa
commit 8df0a62
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/apps/storefront/src/pages/login/Login.tsx b/apps/storefront/src/pages/login/Login.tsx
@@ -96,6 +96,7 @@ export default function Login(props:RegisteredProps) {
   } = props
 
   const [logo, setLogo] = useState('')
+  const [showTipInfo, setShowTipInfo] = useState<boolean>(true)
   const [flag, setLoginFlag] = useState<string>('')
   const [loginAccount, setLoginAccount] = useState<LoginConfig>({
     emailAddress: '',
@@ -159,6 +160,9 @@ export default function Login(props:RegisteredProps) {
         } = location
 
         const loginFlag = getLoginFlag(search, 'loginFlag')
+        const showTipInfo = getLoginFlag(search, 'showTip') !== 'false'
+
+        setShowTipInfo(showTipInfo)
 
         if (loginFlag) setLoginFlag(loginFlag)
 
@@ -337,7 +341,7 @@ export default function Login(props:RegisteredProps) {
         }
 
             {
-          flag && (
+          flag && showTipInfo && (
             <Box
               sx={{
                 padding: '0 5%',

diff --git a/apps/storefront/src/pages/registered/Registered.tsx b/apps/storefront/src/pages/registered/Registered.tsx
@@ -141,19 +141,19 @@ export default function Registered(props: RegisteredProps) {
         } = await storeB2BBasicInfo()
         const registerLogo = getRegisterLogo(quoteConfig)
 
-        const newAddressInformationFields = b2bAccountFormFields.address.map((addressFields: Partial<RegisterFieldsItems>):Partial<RegisterFieldsItems> => {
+        const newAddressInformationFields = b2bAccountFormFields.address?.map((addressFields: Partial<RegisterFieldsItems>):Partial<RegisterFieldsItems> => {
           if (addressFields.name === 'country') {
             addressFields.options = countries
           }
           return addressFields
-        })
+        }) || []
 
-        const newBCAddressInformationFields = bcAccountFormFields.address.map((addressFields: Partial<RegisterFieldsItems>):Partial<RegisterFieldsItems> => {
+        const newBCAddressInformationFields = bcAccountFormFields.address?.map((addressFields: Partial<RegisterFieldsItems>):Partial<RegisterFieldsItems> => {
           if (addressFields.name === 'country') {
             addressFields.options = countries
           }
           return addressFields
-        })
+        }) || []
 
         if (dispatch) {
           dispatch({
@@ -163,20 +163,20 @@ export default function Registered(props: RegisteredProps) {
               isLoading: false,
               storeName,
               // account
-              contactInformation: [...b2bAccountFormFields.contactInformation],
-              bcContactInformation: [...bcAccountFormFields.contactInformation],
-              additionalInformation: [...b2bAccountFormFields.additionalInformation],
-              bcAdditionalInformation: [...bcAccountFormFields.additionalInformation],
+              contactInformation: [...(b2bAccountFormFields.contactInformation || [])],
+              bcContactInformation: [...(bcAccountFormFields.contactInformation || [])],
+              additionalInformation: [...(b2bAccountFormFields.additionalInformation || [])],
+              bcAdditionalInformation: [...(bcAccountFormFields.additionalInformation || [])],
               // detail
               companyExtraFields: [],
-              companyInformation: [...b2bAccountFormFields?.businessDetails || []],
+              companyInformation: [...(b2bAccountFormFields?.businessDetails || [])],
               companyAttachment: [...companyAttachmentsFields(b3Lang)],
               addressBasicFields: [...newAddressInformationFields],
               bcAddressBasicFields: [...newBCAddressInformationFields],
               countryList: [...countries],
               // password
-              passwordInformation: [...b2bAccountFormFields.password],
-              bcPasswordInformation: [...bcAccountFormFields.password],
+              passwordInformation: [...(b2bAccountFormFields.password || [])],
+              bcPasswordInformation: [...(bcAccountFormFields.password || [])],
 
             },
           })

diff --git a/apps/storefront/src/shared/service/request/fetch.ts b/apps/storefront/src/shared/service/request/fetch.ts
@@ -40,10 +40,19 @@ function b3Fetch(path: string, init: any, type?: string, customMessage = false)
         }
       }
       if (type === RequestType.B2BGraphql) {
-        if (res?.errors?.length && res.errors[0].message) {
-          reject(res.errors[0].message)
+        const errors = res?.errors?.length ? res.errors[0] : {}
+        const {
+          message = '',
+          extensions = {},
+        } = errors
+
+        if (extensions.code === 40101) {
+          window.location.href = '#/login?loginFlag=3&showTip=false'
+          snackbar.error(message)
+        } else if (message) {
+          reject(message)
           if (!customMessage) {
-            snackbar.error(res.errors[0].message)
+            snackbar.error(message)
           }
         } else {
           resolve(res.data)