feat: support arbitrary login redirect routes

webui/react/src/pages/Authentication.tsx

@@ -8,7 +8,7 @@ import DeterminedAuth from 'components/DeterminedAuth';
 import Logo, { LogoTypes } from 'components/Logo';
 import Spinner from 'components/Spinner';
 import Auth, { updateAuth } from 'contexts/Auth';
-import { crossoverRoute, isCrossoverRoute } from 'routes';
+import { routeAll } from 'routes';
 import history from 'routes/history';
 import { logout } from 'services/api';
 
@@ -45,15 +45,11 @@ const Authentication: React.FC = () => {
   }, [ setAuth ]);
 
   if (auth.isAuthenticated) {
-    const redirectUrl = queries.redirect || DEFAULT_REDIRECT;
+    const redirect = queries.redirect || DEFAULT_REDIRECT;
     if (queries.cli) {
       return <AuthToken />;
     }
-    if (isCrossoverRoute(redirectUrl)) {
-      crossoverRoute(redirectUrl);
-    } else {
-      history.push(redirectUrl);
-    }
+    routeAll(redirect);
     return <Spinner fullPage />;
   }
 

webui/react/src/routes/index.ts

@@ -3,6 +3,8 @@ import { RouteProps } from 'react-router';
 import Authentication from 'pages/Authentication';
 import Dashboard from 'pages/Dashboard';
 import Determined from 'pages/Determined';
+import history from 'routes/history';
+import { isFullPath, parseUrl } from 'utils/routes';
 
 /*
  * Router Configuration
@@ -20,22 +22,6 @@ export interface RouteConfigItem extends RouteProps {
   needAuth?: boolean;
 }
 
-export const isFullPath = (path: string): boolean => {
-  return path.startsWith('http');
-};
-
-export const isCrossoverRoute = (path: string): boolean => {
-  return path.startsWith('/ui') || path.includes(':8080/ui');
-};
-
-export const crossoverRoute = (path: string): void => {
-  if (!isFullPath(path)) {
-    const pathPrefix = process.env.IS_DEV ? 'http://localhost:8080' : '';
-    path = `${pathPrefix}${path}`;
-  }
-  window.location.assign(path);
-};
-
 export const appRoutes: RouteConfigItem[] = [
   {
     component: Determined,
@@ -115,3 +101,35 @@ export const detRoutes: RouteConfigItem[] = [
   },
 ];
 export const defaultDetRouteId = detRoutes[0].id;
+
+// Is the path going to be served from the same host?
+const isDetRoute = (url: string): boolean => {
+  if (!isFullPath(url)) return true;
+  if (process.env.IS_DEV) {
+    // dev live is served on a different port
+    return parseUrl(url).hostname === window.location.hostname;
+  }
+  return parseUrl(url).host === window.location.host;
+};
+
+const isReactRoute = (url: string): boolean => {
+  if (!isDetRoute(url)) return false;
+  const pathname = parseUrl(url).pathname;
+  return !!appRoutes.find(route => pathname.startsWith(route.path));
+};
+
+export const routeToExternalUrl = (path: string): void => {
+  if (!isFullPath(path)) {
+    const pathPrefix = process.env.IS_DEV ? 'http://localhost:8080' : '';
+    path = `${pathPrefix}${path}`;
+  }
+  window.location.assign(path);
+};
+
+export const routeAll = (path: string): void => {
+  if (!isReactRoute(path)) {
+    routeToExternalUrl(path);
+  } else {
+    history.push(path);
+  }
+};

webui/react/src/utils/routes.ts

@@ -0,0 +1,12 @@
+export const isFullPath = (url: string): boolean => url.startsWith('http');
+
+export const isAbsolutePath = (url: string): boolean => url.startsWith('/');
+
+export const parseUrl = (url: string): URL => {
+  let cleanUrl = url;
+  if (!isFullPath(url)) {
+    if (!isAbsolutePath(url)) cleanUrl = '/' + url;
+    cleanUrl = window.location.origin + url;
+  }
+  return new window.URL(cleanUrl);
+};