README.md

@@ -41,7 +41,7 @@ services:
     ports:
       - 3900:3900
       - 3901:3901
-      - 3902:3902
+      - 3902:3903
       - 3903:3903
 
   webui:
@@ -62,7 +62,7 @@ services:
 Get the latest binary from the [release page](https://github.com/khairul169/garage-webui/releases/latest) according to your OS architecture. For example:
 
 ```sh
-$ wget -O garage-webui https://github.com/khairul169/garage-webui/releases/download/1.0.9/garage-webui-v1.0.9-linux-amd64
+$ wget -O garage-webui https://github.com/khairul169/garage-webui/releases/download/1.0.7/garage-webui-v1.0.7-linux-amd64
 $ chmod +x garage-webui
 $ sudo cp garage-webui /usr/local/bin
 ```
@@ -136,14 +136,9 @@ admin_token = "YOUR_ADMIN_TOKEN_HERE"
 metrics_token = "YOUR_METRICS_TOKEN_HERE"
 ```
 
-However, if it fails to load, you can set `API_BASE_URL` & `API_ADMIN_KEY` environment variables instead.
+However, if it fails to load, you can set these environment variables instead:
-
-### Environment Variables
-
-Configurable envs:
 
 - `CONFIG_PATH`: Path to the Garage `config.toml` file. Defaults to `/etc/garage.toml`.
-- `BASE_PATH`: Base path or prefix for Web UI.
 - `API_BASE_URL`: Garage admin API endpoint URL.
 - `API_ADMIN_KEY`: Admin API key.
 - `S3_REGION`: S3 Region.
@@ -151,9 +146,7 @@ Configurable envs:
 
 ### Authentication
 
-Enable authentication by setting the `AUTH_USER_PASS` environment variable in the format `username:password_hash`, where `password_hash` is a bcrypt hash of the password.
+Enable authentication by setting `AUTH_USER_PASS` environment variable. Generate the username and password hash using the following command:
-
-Generate the username and password hash using the following command:
 
 ```bash
 htpasswd -nbBC 10 "YOUR_USERNAME" "YOUR_PASSWORD"

backend/.env.example

@@ -1,6 +0,0 @@
-#
-BASE_PATH=""
-AUTH_USER_PASS='username:$2y$10$DSTi9o0uQPEHSNlf66xMEOgm9KgVNBP3vHxA3SK0Xha2EVMb3mTXm'
-API_BASE_URL="http://garage:3903"
-S3_ENDPOINT_URL="http://garage:3900"
-API_ADMIN_KEY=""

backend/main.go

@@ -7,7 +7,6 @@ import (
 	"khairul169/garage-webui/utils"
 	"log"
 	"net/http"
-	"os"
 
 	"github.com/joho/godotenv"
 )
@@ -22,21 +21,10 @@ func main() {
 		log.Println("Cannot load garage config!", err)
 	}
 
-	basePath := os.Getenv("BASE_PATH")
 	mux := http.NewServeMux()
-
+	mux.Handle("/api/", http.StripPrefix("/api", router.HandleApiRouter()))
-	// Serve API
-	apiPrefix := basePath + "/api"
-	mux.Handle(apiPrefix+"/", http.StripPrefix(apiPrefix, router.HandleApiRouter()))
-
-	// Static files
 	ui.ServeUI(mux)
 
-	// Redirect to UI if BASE_PATH is set
-	if basePath != "" {
-		mux.Handle("/", http.RedirectHandler(basePath, http.StatusMovedPermanently))
-	}
-
 	host := utils.GetEnv("HOST", "0.0.0.0")
 	port := utils.GetEnv("PORT", "3909")
 

backend/router/browse.go

@@ -146,20 +146,11 @@ func (b *Browse) GetOneObject(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	w.Header().Set("Content-Type", *object.ContentType)
+	w.Header().Set("Content-Length", strconv.FormatInt(*object.ContentLength, 10))
 	w.Header().Set("Cache-Control", "max-age=86400")
 	w.Header().Set("Last-Modified", object.LastModified.Format(time.RFC1123))
-
+	w.Header().Set("Etag", *object.ETag)
-	if object.ContentType != nil {
-		w.Header().Set("Content-Type", *object.ContentType)
-	} else {
-		w.Header().Set("Content-Type", "application/octet-stream")
-	}
-	if object.ContentLength != nil {
-		w.Header().Set("Content-Length", strconv.FormatInt(*object.ContentLength, 10))
-	}
-	if object.ETag != nil {
-		w.Header().Set("Etag", *object.ETag)
-	}
 
 	_, err = io.Copy(w, object.Body)
 

backend/ui/ui_prod.go

@@ -7,10 +7,7 @@ import (
 	"embed"
 	"io/fs"
 	"net/http"
-	"os"
 	"path"
-	"regexp"
-	"strings"
 )
 
 //go:embed dist
@@ -19,45 +16,19 @@ var embeddedFs embed.FS
 func ServeUI(mux *http.ServeMux) {
 	distFs, _ := fs.Sub(embeddedFs, "dist")
 	fileServer := http.FileServer(http.FS(distFs))
-	basePath := os.Getenv("BASE_PATH")
 
-	mux.Handle(basePath+"/", http.StripPrefix(basePath, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		_path := path.Clean(r.URL.Path)[1:]
 
 		// Rewrite non-existing paths to index.html
 		if _, err := fs.Stat(distFs, _path); err != nil {
 			index, _ := fs.ReadFile(distFs, "index.html")
-			html := string(index)
-
-			// Set base path for the UI
-			html = strings.ReplaceAll(html, "%BASE_PATH%", basePath)
-			html = addBasePath(html, basePath)
-
 			w.Header().Add("Content-Type", "text/html")
 			w.WriteHeader(http.StatusOK)
-			w.Write([]byte(html))
+			w.Write(index)
-			return
-		}
-
-		// Add prefix to each /assets strings in js
-		if len(basePath) > 0 && strings.HasSuffix(_path, ".js") {
-			data, _ := fs.ReadFile(distFs, _path)
-			html := string(data)
-			html = strings.ReplaceAll(html, "assets/", basePath[1:]+"/assets/")
-
-			w.Header().Add("Content-Type", "text/javascript")
-			w.WriteHeader(http.StatusOK)
-			w.Write([]byte(html))
 			return
 		}
 
 		fileServer.ServeHTTP(w, r)
-	})))
+	}))
-}
-
-func addBasePath(html string, basePath string) string {
-	re := regexp.MustCompile(`(href|src)=["'](/[^"'>]+)["']`)
-	return re.ReplaceAllStringFunc(html, func(match string) string {
-		return re.ReplaceAllString(match, `$1="`+basePath+`$2"`)
-	})
 }

index.html

@@ -10,9 +10,6 @@
     <link rel="manifest" href="/site.webmanifest" />
 
     <title>Garage Web UI</title>
-    <script>
-      window.__BASE_PATH = "%BASE_PATH%";
-    </script>
   </head>
   <body>
     <div id="root"></div>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "garage-webui",
   "private": true,
-  "version": "1.0.9",
+  "version": "1.0.7",
   "type": "module",
   "scripts": {
     "dev:client": "vite",

src/app/router.tsx

@@ -2,7 +2,6 @@ import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import { lazy, Suspense } from "react";
 import AuthLayout from "@/components/layouts/auth-layout";
 import MainLayout from "@/components/layouts/main-layout";
-import { BASE_PATH } from "@/lib/consts";
 
 const LoginPage = lazy(() => import("@/pages/auth/login"));
 const ClusterPage = lazy(() => import("@/pages/cluster/page"));
@@ -11,48 +10,43 @@ const BucketsPage = lazy(() => import("@/pages/buckets/page"));
 const ManageBucketPage = lazy(() => import("@/pages/buckets/manage/page"));
 const KeysPage = lazy(() => import("@/pages/keys/page"));
 
-const router = createBrowserRouter(
+const router = createBrowserRouter([
-  [
-    {
-      path: "/auth",
-      Component: AuthLayout,
-      children: [
-        {
-          path: "login",
-          Component: LoginPage,
-        },
-      ],
-    },
-    {
-      path: "/",
-      Component: MainLayout,
-      children: [
-        {
-          index: true,
-          Component: HomePage,
-        },
-        {
-          path: "cluster",
-          Component: ClusterPage,
-        },
-        {
-          path: "buckets",
-          children: [
-            { index: true, Component: BucketsPage },
-            { path: ":id", Component: ManageBucketPage },
-          ],
-        },
-        {
-          path: "keys",
-          Component: KeysPage,
-        },
-      ],
-    },
-  ],
   {
-    basename: BASE_PATH,
+    path: "/auth",
-  }
+    Component: AuthLayout,
-);
+    children: [
+      {
+        path: "login",
+        Component: LoginPage,
+      },
+    ],
+  },
+  {
+    path: "/",
+    Component: MainLayout,
+    children: [
+      {
+        index: true,
+        Component: HomePage,
+      },
+      {
+        path: "cluster",
+        Component: ClusterPage,
+      },
+      {
+        path: "buckets",
+        children: [
+          { index: true, Component: BucketsPage },
+          { path: ":id", Component: ManageBucketPage },
+        ],
+      },
+      {
+        path: "keys",
+        Component: KeysPage,
+      },
+    ],
+  },
+]);
 
 const Router = () => {
   return (

src/components/containers/sidebar.tsx

@@ -13,9 +13,8 @@ import Button from "../ui/button";
 import { themes } from "@/app/themes";
 import appStore from "@/stores/app-store";
 import garageLogo from "@/assets/garage-logo.svg";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import api from "@/lib/api";
-import * as utils from "@/lib/utils";
 import { toast } from "sonner";
 import { useAuth } from "@/hooks/useAuth";
 
@@ -91,10 +90,12 @@ const Sidebar = () => {
 };
 
 const LogoutButton = () => {
+  const queryClient = useQueryClient();
+
   const logout = useMutation({
     mutationFn: () => api.post("/auth/logout"),
     onSuccess: () => {
-      window.location.href = utils.url("/auth/login");
+      queryClient.invalidateQueries({ queryKey: ["auth"] });
     },
     onError: (err) => {
       toast.error(err?.message || "Unknown error");

src/global.d.ts

@@ -1,7 +0,0 @@
-export {};
-
-declare global {
-  interface Window {
-    __BASE_PATH?: string;
-  }
-}

src/lib/api.ts

@@ -1,23 +1,10 @@
-import * as utils from "@/lib/utils";
-import { BASE_PATH } from "./consts";
-
 type FetchOptions = Omit<RequestInit, "headers" | "body"> & {
   params?: Record<string, any>;
   headers?: Record<string, string>;
   body?: any;
 };
 
-export const API_URL = BASE_PATH + "/api";
+export const API_URL = "/api";
-
-export class APIError extends Error {
-  status!: number;
-
-  constructor(message: string, status: number = 400) {
-    super(message);
-    this.name = "APIError";
-    this.status = status;
-  }
-}
 
 const api = {
   async fetch<T = any>(url: string, options?: Partial<FetchOptions>) {
@@ -49,18 +36,13 @@ const api = {
       ?.includes("application/json");
     const data = isJson ? await res.json() : await res.text();
 
-    if (res.status === 401 && !url.startsWith("/auth")) {
-      window.location.href = utils.url("/auth/login");
-      throw new APIError("unauthorized", res.status);
-    }
-
     if (!res.ok) {
       const message = isJson
         ? data?.message
         : typeof data === "string"
         ? data
         : res.statusText;
-      throw new APIError(message, res.status);
+      throw new Error(message);
     }
 
     return data as unknown as T;

src/lib/consts.ts

@@ -1,6 +0,0 @@
-// consts.ts
-
-export const BASE_PATH =
-  (import.meta.env.PROD ? window.__BASE_PATH : null) ||
-  import.meta.env.VITE_BASE_PATH ||
-  "";

src/lib/utils.ts

@@ -3,7 +3,6 @@ import { toast } from "sonner";
 import { twMerge } from "tailwind-merge";
 import dayjsRelativeTime from "dayjs/plugin/relativeTime";
 import dayjs from "dayjs";
-import { BASE_PATH } from "./consts";
 
 dayjs.extend(dayjsRelativeTime);
 export { dayjs };
@@ -54,7 +53,3 @@ export const copyToClipboard = async (text: string) => {
     textArea?.remove();
   }
 };
-
-export const url = (...paths: unknown[]) => {
-  return BASE_PATH + paths.join("/");
-};