feat: dynamic api_base_url

Author: Alw3ys

cli/src/cluster/command/dashboard.rs

@@ -5,13 +5,12 @@ use std::path::PathBuf;
 
 pub fn command(name: Option<String>) -> anyhow::Result<()> {
   let cluster = Cli::get_default_cluster_or_ask(name)?;
-  let base_url = if cluster.0 == "localhost" {
+  let api_base_url = if cluster.0 == "localhost" {
     format!("http://{}", cluster.0)
   } else {
     format!("https://{}", cluster.0)
   };
-  println!("{}", base_url);
-  let login_url = format!("{}/auth/login/ssh", base_url);
+  let login_url = format!("{}/auth/login/ssh", api_base_url);
   let response = ApiClient::default()?
     .post(login_url)
     .bearer_auth(ApiClient::bearer_ssh_token(
@@ -22,14 +21,10 @@ pub fn command(name: Option<String>) -> anyhow::Result<()> {
   let status_code = response.status();
   if status_code.is_success() {
     let session = response.json::<SessionCredentials>()?;
-    let base_dashboard_url = if cluster.0 == "localhost" {
-      format!("http://{}:8844", cluster.0)
-    } else {
-      format!("https://{}", cluster.0.replace("api", "dashboard"))
-    };
     let dashboard_login_url = format!(
-      "{}/login?session={}",
-      base_dashboard_url,
+      "{}/login?api_base_url={}&session={}",
+      "http://localhost:8844",
+      api_base_url,
       session.to_base64()?
     );
     if webbrowser::open(&dashboard_login_url).is_ok() {

dashboard/.env

@@ -1,3 +1,2 @@
-NEXT_PUBLIC_API_BASE_URL=http://127.0.0.1
 NEXT_PUBLIC_DISCORD_INVITE=https://discord.gg/BP5aUkhcAh
 NEXT_PUBLIC_DOCS_BASE_URL=https://dosei.io/docs

dashboard/src/app/ConsoleLayout.js

@@ -155,7 +155,7 @@ export default function ConsoleLayout({ children }) {
                 <div className="flex items-center gap-5">
                   <div className="hidden min-[416px]:contents">
                     <div className="text-sm">
-                      Connected to: {infoQuery.data.name.replace("api.", "")}; Version: {infoQuery.data.version}
+                      Connected to: {infoQuery.data.name}; Version: {infoQuery.data.version}
                     </div>
                     <Link target="_blank" href={process.env.NEXT_PUBLIC_DISCORD_INVITE} className={clsx(
                       "rounded-md px-2.5 py-1.5 text-sm",

dashboard/src/app/login/page.js

@@ -5,32 +5,33 @@ import {HeroPattern} from "@/components/HeroPattern";
 import {Footer} from "@/components/Footer";
 import {useRouter, useSearchParams} from "next/navigation";
 import {useEffect, Suspense} from "react";
-import {storeSessionFromString, getSession } from "@/utils/sessionUtils";
+import {storeSessionFromString, getSession, storeApiBaseURL} from "@/utils/sessionUtils";
 
 // Separate the component that uses useSearchParams
 function AuthHandler() {
   const router = useRouter();
   const searchParams = useSearchParams();
+  const apiBaseUrl = searchParams.get('api_base_url');
   const session = searchParams.get('session');
 
   useEffect(() => {
+    if (apiBaseUrl) {
+      storeApiBaseURL(apiBaseUrl);
+    }
     const handleAsync = async () => {
       if (session) {
         try {
-          // Decode base64 session parameter
           const decodedSession = atob(session);
           storeSessionFromString(decodedSession);
           await router.push("/");
         } catch (error) {
           console.error('Failed to decode session:', error);
         }
       } else {
-        // Check if user is already authenticated via getSession
         try {
           const existingSession = getSession();
 
           if (existingSession) {
-            // User is already authenticated, redirect to /
             await router.push("/");
           }
         } catch (error) {
@@ -40,7 +41,7 @@ function AuthHandler() {
       }
     };
     handleAsync();
-  }, [session, router]);
+  }, [apiBaseUrl, session, router]);
 
   return null; // This component only handles the auth logic
 }

dashboard/src/utils/sessionUtils.js

@@ -29,12 +29,16 @@ export const getContinuePathAndDelete = () => {
   return continueURI;
 };
 
+export const storeApiBaseURL = (apiBaseURL) => {
+  localStorage.setItem("api_base_url", apiBaseURL);
+};
+
 export const getApiBaseURL = () => {
   if (typeof window !== 'undefined') {
     const apiBaseURL = localStorage.getItem("api_base_url");
     if (apiBaseURL) {
       return apiBaseURL;
     }
   }
-  return process.env.NEXT_PUBLIC_API_BASE_URL;
+  return "http://127.0.0.1";
 };