From 9f8ccd8113da12b742c090cf3ed5b6db12515991 Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Mon, 15 Aug 2022 16:29:57 -0400 Subject: [PATCH] Fleet Sandbox: Login for sandbox redirects to sandbox's login url (#7220) --- changes/issue-7211-redirect-to-sandbox-login | 1 + .../AuthenticatedRoutes/AuthenticatedRoutes.tsx | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 changes/issue-7211-redirect-to-sandbox-login diff --git a/changes/issue-7211-redirect-to-sandbox-login b/changes/issue-7211-redirect-to-sandbox-login new file mode 100644 index 0000000000..110db54bfc --- /dev/null +++ b/changes/issue-7211-redirect-to-sandbox-login @@ -0,0 +1 @@ +* Sandbox redirects to sandbox login \ No newline at end of file diff --git a/frontend/router/components/AuthenticatedRoutes/AuthenticatedRoutes.tsx b/frontend/router/components/AuthenticatedRoutes/AuthenticatedRoutes.tsx index 260ab50f79..e528e5a55e 100644 --- a/frontend/router/components/AuthenticatedRoutes/AuthenticatedRoutes.tsx +++ b/frontend/router/components/AuthenticatedRoutes/AuthenticatedRoutes.tsx @@ -28,6 +28,10 @@ export const AuthenticatedRoutes = ({ return router.push(LOGIN); }; + const redirectToSandboxLogin = () => { + return router.push("https://www.fleetdm.com/try-fleet/login"); + }; + const redirectToPasswordReset = () => { const { RESET_PASSWORD } = paths; @@ -43,7 +47,12 @@ export const AuthenticatedRoutes = ({ useDeepEffect(() => { // this works with App.tsx. if authToken does // exist, user state is checked and fetched if null + if (!authToken()) { + if (window.location.pathname.includes("sandbox")) { + return redirectToSandboxLogin(); + } + return redirectToLogin(); }