From d0843bf278508cc48fa72bed06b66f1c26255e91 Mon Sep 17 00:00:00 2001
From: ishaan-jaff <ishaanjaffer0324@gmail.com>
Date: Thu, 1 Feb 2024 12:54:09 -0800
Subject: [PATCH] (ui) remove proxyBaseUrl

---
 .../src/components/create_key_button.tsx      |  4 +---
 .../src/components/networking.tsx             |  9 +++-----
 .../src/components/user_dashboard.tsx         | 22 +++++--------------
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/create_key_button.tsx b/ui/litellm-dashboard/src/components/create_key_button.tsx
index d50aedc01..c06ef8e9e 100644
--- a/ui/litellm-dashboard/src/components/create_key_button.tsx
+++ b/ui/litellm-dashboard/src/components/create_key_button.tsx
@@ -12,7 +12,6 @@ const { Option } = Select;
 interface CreateKeyProps {
   userID: string;
   accessToken: string;
-  proxyBaseUrl: string;
   data: any[] | null;
   setData: React.Dispatch<React.SetStateAction<any[] | null>>;
 }
@@ -20,7 +19,6 @@ interface CreateKeyProps {
 const CreateKey: React.FC<CreateKeyProps> = ({
   userID,
   accessToken,
-  proxyBaseUrl,
   data,
   setData,
 }) => {
@@ -51,7 +49,7 @@ const CreateKey: React.FC<CreateKeyProps> = ({
         formValues.models = [];
       }
       setIsModalVisible(true);
-      const response = await keyCreateCall(proxyBaseUrl, accessToken, userID, formValues);
+      const response = await keyCreateCall(accessToken, userID, formValues);
       setData((prevData) => (prevData ? [...prevData, response] : [response])); // Check if prevData is null
       setApiKey(response["key"]);
       message.success("API Key Created");
diff --git a/ui/litellm-dashboard/src/components/networking.tsx b/ui/litellm-dashboard/src/components/networking.tsx
index 4368b5b60..dcc48de38 100644
--- a/ui/litellm-dashboard/src/components/networking.tsx
+++ b/ui/litellm-dashboard/src/components/networking.tsx
@@ -4,7 +4,6 @@
 import { message } from 'antd';
 
 export const keyCreateCall = async (
-  proxyBaseUrl: string,
   accessToken: string,
   userID: string,
   formValues: Record<string, any> // Assuming formValues is an object
@@ -22,7 +21,7 @@ export const keyCreateCall = async (
       }
     }
     
-    const response = await fetch(`${proxyBaseUrl}/key/generate`, {
+    const response = await fetch(`/key/generate`, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${accessToken}`,
@@ -53,12 +52,11 @@ export const keyCreateCall = async (
 
 
 export const keyDeleteCall = async (
-  proxyBaseUrl: String,
   accessToken: String,
   user_key: String
 ) => {
   try {
-    const response = await fetch(`${proxyBaseUrl}/key/delete`, {
+    const response = await fetch(`/key/delete`, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${accessToken}`,
@@ -84,13 +82,12 @@ export const keyDeleteCall = async (
 };
 
 export const userInfoCall = async (
-  proxyBaseUrl: String,
   accessToken: String,
   userID: String
 ) => {
   try {
     const response = await fetch(
-      `${proxyBaseUrl}/user/info?user_id=${userID}`,
+      `/user/info?user_id=${userID}`,
       {
         method: "GET",
         headers: {
diff --git a/ui/litellm-dashboard/src/components/user_dashboard.tsx b/ui/litellm-dashboard/src/components/user_dashboard.tsx
index 59c6d94fd..dccbd21db 100644
--- a/ui/litellm-dashboard/src/components/user_dashboard.tsx
+++ b/ui/litellm-dashboard/src/components/user_dashboard.tsx
@@ -14,8 +14,6 @@ const UserDashboard = () => {
   const searchParams = useSearchParams();
   const userID = searchParams.get("userID");
 
-  const proxyBaseUrl = searchParams.get("proxyBaseUrl");
-
   const token = searchParams.get("token");
   const [accessToken, setAccessToken] = useState<string | null>(null);
 
@@ -34,11 +32,10 @@ const UserDashboard = () => {
       }
 
     }
-    if (userID && accessToken && proxyBaseUrl && !data) {
+    if (userID && accessToken  && !data) {
       const fetchData = async () => {
         try {
           const response = await userInfoCall(
-            proxyBaseUrl,
             accessToken,
             userID
           );
@@ -50,20 +47,13 @@ const UserDashboard = () => {
       };
       fetchData();
     }
-  }, [userID, token, accessToken, proxyBaseUrl, data]);
+  }, [userID, token, accessToken, data]);
+
+  if (userID == null || token == null) {
 
-  if (proxyBaseUrl == null) {
-    return (
-      <div>
-        <EnterProxyUrl />
-      </div>
-    );
-  }
-  else if (userID == null || token == null) {
-    const baseUrl = proxyBaseUrl.endsWith('/') ? proxyBaseUrl : proxyBaseUrl + '/';
   
     // Now you can construct the full URL
-    const url = `${baseUrl}sso/key/generate`;
+    const url = `/sso/key/generate`;
 
     window.location.href = url;
 
@@ -80,14 +70,12 @@ const UserDashboard = () => {
         <ViewKeyTable
           userID={userID}
           accessToken={accessToken}
-          proxyBaseUrl={proxyBaseUrl}
           data={data}
           setData={setData}
         />
         <CreateKey
           userID={userID}
           accessToken={accessToken}
-          proxyBaseUrl={proxyBaseUrl}
           data={data}
           setData={setData}
         />