all paths outside locked tenant are Not Found (including valid tenants)

Recidiviz · Apr 14, 2021 · 75c4a0f · 75c4a0f
1 parent 980159b
commit 75c4a0f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/spotlight-client/src/PageHome/PageHome.tsx b/spotlight-client/src/PageHome/PageHome.tsx
@@ -39,6 +39,7 @@ const PageHome = (): React.ReactElement => {
   if (locked && currentTenantId) {
     return (
       <Redirect
+        noThrow
         to={getUrlForResource({
           page: "tenant",
           params: { tenantId: currentTenantId },

diff --git a/spotlight-client/src/withRouteSync/withRouteSync.tsx b/spotlight-client/src/withRouteSync/withRouteSync.tsx
@@ -17,6 +17,7 @@
 
 import { RouteComponentProps } from "@reach/router";
 import { action } from "mobx";
+import { observer } from "mobx-react-lite";
 import React, { ComponentType, useEffect } from "react";
 import NotFound from "../NotFound";
 import normalizeRouteParams from "../routerUtils/normalizeRouteParams";
@@ -40,9 +41,17 @@ const withRouteSync = <Props extends RouteComponentProps & RouteParams>(
 
     const { path } = props;
 
+    const isTenantForbidden =
+      tenantStore.locked &&
+      // we're checking for wrong Tenants, not no Tenant
+      normalizedProps.tenantId &&
+      tenantStore.currentTenantId !== normalizedProps.tenantId;
+
     const isRouteInvalid =
+      isTenantForbidden ||
+      Object.values(normalizedProps).includes(null) ||
       // catchall path for partially valid URLs; e.g. :tenantId/something-invalid
-      Object.values(normalizedProps).includes(null) || path === "/*";
+      path === "/*";
 
     // this is fine, we actually want this to run on every render
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -69,7 +78,7 @@ const withRouteSync = <Props extends RouteComponentProps & RouteParams>(
     );
   };
 
-  return WrappedRouteComponent;
+  return observer(WrappedRouteComponent);
 };
 
 export default withRouteSync;