fix: show register page by setting

bigcommerce · Jul 28, 2023 · 37899d7 · 37899d7
1 parent db140cd
commit 37899d7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/apps/storefront/src/pages/registered/Registered.tsx b/apps/storefront/src/pages/registered/Registered.tsx
@@ -58,7 +58,7 @@ function Registered(props: RegisteredProps) {
   const IframeDocument = useSelector(themeFrameSelector)
 
   const {
-    state: { isCheckout, isCloseGotoBCHome, logo, storeName },
+    state: { isCheckout, isCloseGotoBCHome, logo, storeName, registerEnabled },
     dispatch: globalDispatch,
   } = useContext(GlobaledContext)
 
@@ -81,6 +81,12 @@ function Registered(props: RegisteredProps) {
     },
   } = useContext(CustomStyleContext)
 
+  useEffect(() => {
+    if (!registerEnabled) {
+      navigate('/login')
+    }
+  }, [registerEnabled])
+
   useEffect(() => {
     const getBCAdditionalFields = async () => {
       try {

diff --git a/apps/storefront/src/pages/registered/RegisteredBCToB2B.tsx b/apps/storefront/src/pages/registered/RegisteredBCToB2B.tsx
@@ -91,6 +91,7 @@ export default function RegisteredBCToB2B(props: RegisteredProps) {
       logo,
       currentChannelId: channelId,
       blockPendingAccountOrderCreation,
+      registerEnabled,
     },
     dispatch: globalDispatch,
   } = useContext(GlobaledContext)
@@ -117,6 +118,13 @@ export default function RegisteredBCToB2B(props: RegisteredProps) {
     })
   }
 
+  useEffect(() => {
+    showLoading(false)
+    if (!registerEnabled) {
+      navigate('/login')
+    }
+  }, [registerEnabled])
+
   useEffect(() => {
     const getBCAdditionalFields = async () => {
       try {

diff --git a/apps/storefront/src/utils/b3AccountItem.ts b/apps/storefront/src/utils/b3AccountItem.ts
@@ -78,10 +78,8 @@ const openPageByClick = ({
   role,
   isRegisterAndLogin,
 }: OpenPageByClickProps) => {
-  if (role === 100) return '/login'
-
   // register and login click
-  if (href.includes('/login') || isRegisterAndLogin) {
+  if (href.includes('/login') || isRegisterAndLogin || role === 100) {
     return getCurrentLoginUrl(href)
   }