Tidy up pass

weaveworks · Sep 7, 2023 · db0a707 · db0a707
1 parent 0cb9826
commit db0a707
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 428 deletions.
diff --git a/Tiltfile b/Tiltfile
@@ -43,7 +43,7 @@ if advanced_go_dev_mode:
             './bin',
         ],
         dockerfile="dev.dockerfile",
-        entrypoint="/app/build/gitops-server --log-level=debug --insecure --route-prefix=foo",
+        entrypoint="/app/build/gitops-server --log-level=debug --insecure",
         live_update=[
             sync('./bin', '/app/build'),
         ],

diff --git a/cmd/gitops-server/cmd/cmd.go b/cmd/gitops-server/cmd/cmd.go
@@ -460,9 +460,9 @@ func createRedirector(fsys fs.FS, log logr.Logger, routePrefix string) http.Hand
 				baseHref = "/" + baseHref
 			}
 			if !strings.HasSuffix(baseHref, "/") {
-				baseHref = baseHref + "/"
+				baseHref += "/"
 			}
-			bt = []byte(strings.Replace(string(bt), "<head>", fmt.Sprintf("<head><base href=\"%s\">", baseHref), 1))
+			bt = []byte(strings.Replace(string(bt), "<head>", fmt.Sprintf("<head><base href=%q>", baseHref), 1))
 		}
 
 		_, err = w.Write(bt)

diff --git a/package.json b/package.json
@@ -24,7 +24,6 @@
     "typedefs": "tsc --declaration --skipLibCheck --emitDeclarationOnly --outDir dist -p .",
     "start": "parcel serve --port 4567 ui/index.html",
     "lint": "eslint ui --max-warnings 0",
-    "preview": "node ui/server.js",
     "prettify:check": "prettier --check ui",
     "prettify:format": "prettier --write ui",
     "test": "jest",
@@ -107,7 +106,6 @@
     "buffer": "^5.7.1",
     "eslint": "^7.28.0",
     "eslint-plugin-import": "^2.25.4",
-    "express": "^4.18.2",
     "jest": "^27.3.1",
     "jest-styled-components": "^7.0.4",
     "parcel": "^2.8.3",

diff --git a/ui/components/SubRouterTabs.tsx b/ui/components/SubRouterTabs.tsx
@@ -60,7 +60,6 @@ export function RouterTab({ children }: TabProps) {
 }
 
 function SubRouterTabs({ className, children, rootPath, clearQuery }: Props) {
-  // const location = useLocation
   const query = qs.parse(window.location.search);
   const childs = findChildren(children);
 

diff --git a/ui/contexts/AuthContext.tsx b/ui/contexts/AuthContext.tsx
@@ -1,7 +1,7 @@
 import qs from "query-string";
 import * as React from "react";
 import { Redirect, useHistory, useLocation } from "react-router-dom";
-import { withBaseURL } from "../lib/utils";
+import { reloadBrowserSignIn } from "../lib/utils";
 import { AppContext } from "./AppContext";
 
 export enum AuthRoutes {
@@ -111,7 +111,7 @@ export default function AuthContextProvider({ children }) {
           setError(response);
           return;
         }
-        window.location.replace(withBaseURL(AuthRoutes.AUTH_PATH_SIGNIN));
+        reloadBrowserSignIn();
       })
       .finally(() => setLoading(false));
   }, []);

diff --git a/ui/contexts/CoreClientContext.tsx b/ui/contexts/CoreClientContext.tsx
@@ -1,11 +1,14 @@
-import qs from "query-string";
 import * as React from "react";
 import { useQuery } from "react-query";
 import { Core, GetFeatureFlagsResponse } from "../lib/api/core/core.pb";
 import { TokenRefreshWrapper } from "../lib/requests";
 import { RequestError } from "../lib/types";
-import { getBaseURL, stripBaseURL, withBaseURL } from "../lib/utils";
-import { AuthRoutes } from "./AuthContext";
+import {
+  getBaseURL,
+  reloadBrowserSignIn,
+  stripBaseURL,
+  withBaseURL,
+} from "../lib/utils";
 
 type Props = {
   api: typeof Core;
@@ -37,13 +40,9 @@ function FeatureFlags(api) {
 export async function refreshToken() {
   const res = await fetch(withBaseURL("/oauth2/refresh"), { method: "POST" });
   if (!res.ok) {
-    window.location.replace(
-      withBaseURL(AuthRoutes.AUTH_PATH_SIGNIN) +
-        "?" +
-        qs.stringify({
-          redirect: stripBaseURL(location.pathname + location.search),
-        })
-    );
+    // The login redirect system is aware of the base URL and will add it,
+    // so we need to strip it off here.
+    reloadBrowserSignIn(stripBaseURL(location.pathname) + location.search);
 
     // Return a promse that does not resolve.
     // This stops any more API requests or refreshToken requests from being
@@ -56,7 +55,7 @@ export function UnAuthorizedInterceptor(api: typeof Core): typeof Core {
   return TokenRefreshWrapper.wrap(api, refreshToken);
 }
 
-export function setBaseURL(api: any) {
+export function setAPIPathPrefix(api: any) {
   const wrapped: any = {};
   for (const method of Object.getOwnPropertyNames(api)) {
     if (typeof api[method] != "function") {
@@ -72,7 +71,7 @@ export function setBaseURL(api: any) {
 
 export default function CoreClientContextProvider({ api, children }: Props) {
   let wrapped = UnAuthorizedInterceptor(api);
-  wrapped = setBaseURL(api);
+  wrapped = setAPIPathPrefix(api);
 
   return (
     <CoreClientContext.Provider

diff --git a/ui/lib/utils.ts b/ui/lib/utils.ts
@@ -1,10 +1,12 @@
 import _ from "lodash";
 import { DateTime } from "luxon";
+import qs from "query-string";
 import { toast } from "react-toastify";
 import styled from "styled-components";
 import Flex from "../components/Flex";
 import { computeReady, ReadyType } from "../components/KubeStatusIndicator";
 import { AppVersion, repoUrl } from "../components/Version";
+import { AuthRoutes } from "../contexts/AuthContext";
 import { GetVersionResponse } from "../lib/api/core/core.pb";
 import { Condition, Kind, ObjectRef } from "./api/core/types.pb";
 import { Automation, HelmRelease, Kustomization } from "./objects";
@@ -261,30 +263,37 @@ export const Fade = styled<any>(Flex)<{
   ${({ fade }) => fade && "pointer-events: none"};
 `;
 
+export const reloadBrowserSignIn = (redirect?: string) => {
+  let path = withBaseURL(AuthRoutes.AUTH_PATH_SIGNIN);
+
+  if (redirect) {
+    const queryString = qs.stringify({ redirect });
+    path = `${path}?${queryString}`;
+  }
+
+  // hard reload the browser to wipe anything that might be memory
+  window.location.replace(path);
+};
+
 export const getBaseURL = () => {
   const baseElement = document.querySelector("base");
   if (baseElement) {
-    return new URL(document.baseURI).pathname;
+    const { pathname } = new URL(document.baseURI);
+    return pathname.replace(/\/$/, "");
   }
   return "";
 };
 
 export function withBaseURL(pathname: string) {
-  const baseURL = getBaseURL();
-  const normalizedPath = baseURL.endsWith("/") ? baseURL.slice(0, -1) : baseURL;
-  return `${normalizedPath}${pathname}`;
+  return getBaseURL() + pathname;
 }
 
 export function stripBaseURL(pathname: string) {
   const basePath = getBaseURL();
 
-  // Ensure basePath has a leading slash
-  const normalizedBasePath = basePath.startsWith("/")
-    ? basePath
-    : "/" + basePath;
-
-  if (pathname.startsWith(normalizedBasePath)) {
-    return pathname.slice(normalizedBasePath.length) || "/";
+  if (pathname.startsWith(basePath)) {
+    return pathname.slice(basePath.length);
   }
+
   return pathname;
 }
diff --git a/ui/server.js b/ui/server.js