fix: #2451 land on page not found bug (#2462)

reapit · Aug 25, 2020 · 0d41e8d · 0d41e8d
1 parent aaf9bfe
commit 0d41e8d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/packages/admin-portal/src/core/private-route-wrapper.tsx b/packages/admin-portal/src/core/private-route-wrapper.tsx
@@ -21,18 +21,18 @@ export const PrivateRouteWrapper: React.FunctionComponent<PrivateRouteWrapperPro
   const { connectSession, connectInternalRedirect } = useReapitConnect(reapitConnectBrowserSession)
   const location = useLocation()
   const currentUri = `${location.pathname}${location.search}`
-  const isRoot = connectInternalRedirect === '/'
+  const isRoot = connectInternalRedirect === '/?' || connectInternalRedirect === '/'
 
   if (!connectSession) {
     return null
   }
 
-  if (
-    (connectInternalRedirect && currentUri !== connectInternalRedirect) ||
-    (currentUri === connectInternalRedirect && isRoot)
-  ) {
-    const redirectUri = isRoot ? Routes.APPROVALS : connectInternalRedirect
-    return <Redirect to={redirectUri} />
+  if (isRoot) {
+    return <Redirect to={Routes.APPROVALS} />
+  }
+
+  if (connectInternalRedirect && currentUri !== connectInternalRedirect) {
+    return <Redirect to={connectInternalRedirect} />
   }
 
   return (

diff --git a/packages/developer-portal/src/core/private-route-wrapper.tsx b/packages/developer-portal/src/core/private-route-wrapper.tsx
@@ -30,18 +30,18 @@ export const PrivateRouteWrapper: React.FunctionComponent<PrivateRouteWrapperPro
   const { connectSession, connectInternalRedirect } = useReapitConnect(reapitConnectBrowserSession)
   const location = useLocation()
   const currentUri = `${location.pathname}${location.search}`
-  const isRoot = connectInternalRedirect === '/'
+  const isRoot = connectInternalRedirect === '/?' || connectInternalRedirect === '/'
 
   if (!connectSession) {
     return null
   }
 
-  if (
-    (connectInternalRedirect && currentUri !== connectInternalRedirect) ||
-    (currentUri === connectInternalRedirect && isRoot)
-  ) {
-    const redirectUri = connectInternalRedirect === '/' ? Routes.APPS : connectInternalRedirect
-    return <Redirect to={redirectUri} />
+  if (isRoot) {
+    return <Redirect to={Routes.APPS} />
+  }
+
+  if (connectInternalRedirect && currentUri !== connectInternalRedirect) {
+    return <Redirect to={connectInternalRedirect} />
   }
 
   const hasReadWelcome = Boolean(getCookieString(COOKIE_DEVELOPER_FIRST_TIME_LOGIN_COMPLETE))

diff --git a/packages/marketplace/src/core/private-route-wrapper.tsx b/packages/marketplace/src/core/private-route-wrapper.tsx
@@ -22,18 +22,18 @@ export const PrivateRouteWrapper: React.FunctionComponent<PrivateRouteWrapperPro
   const { connectSession, connectInternalRedirect } = useReapitConnect(reapitConnectBrowserSession)
   const location = useLocation()
   const currentUri = `${location.pathname}${location.search}`
-  const isRoot = connectInternalRedirect === '/'
+  const isRoot = connectInternalRedirect === '/?' || connectInternalRedirect === '/'
 
   if (!connectSession) {
     return null
   }
 
-  if (
-    (connectInternalRedirect && currentUri !== connectInternalRedirect) ||
-    (currentUri === connectInternalRedirect && isRoot)
-  ) {
-    const redirectUri = connectInternalRedirect === '/' ? Routes.INSTALLED_APPS : connectInternalRedirect
-    return <Redirect to={redirectUri} />
+  if (isRoot) {
+    return <Redirect to={Routes.APPS} />
+  }
+
+  if (connectInternalRedirect && currentUri !== connectInternalRedirect) {
+    return <Redirect to={connectInternalRedirect} />
   }
 
   return (