(ui) remove proxyBaseUrl

This commit is contained in:
ishaan-jaff 2024-02-01 12:54:09 -08:00
parent 55a8e9f97e
commit d0843bf278
3 changed files with 9 additions and 26 deletions

View file

@ -12,7 +12,6 @@ const { Option } = Select;
interface CreateKeyProps { interface CreateKeyProps {
userID: string; userID: string;
accessToken: string; accessToken: string;
proxyBaseUrl: string;
data: any[] | null; data: any[] | null;
setData: React.Dispatch<React.SetStateAction<any[] | null>>; setData: React.Dispatch<React.SetStateAction<any[] | null>>;
} }
@ -20,7 +19,6 @@ interface CreateKeyProps {
const CreateKey: React.FC<CreateKeyProps> = ({ const CreateKey: React.FC<CreateKeyProps> = ({
userID, userID,
accessToken, accessToken,
proxyBaseUrl,
data, data,
setData, setData,
}) => { }) => {
@ -51,7 +49,7 @@ const CreateKey: React.FC<CreateKeyProps> = ({
formValues.models = []; formValues.models = [];
} }
setIsModalVisible(true); 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 setData((prevData) => (prevData ? [...prevData, response] : [response])); // Check if prevData is null
setApiKey(response["key"]); setApiKey(response["key"]);
message.success("API Key Created"); message.success("API Key Created");

View file

@ -4,7 +4,6 @@
import { message } from 'antd'; import { message } from 'antd';
export const keyCreateCall = async ( export const keyCreateCall = async (
proxyBaseUrl: string,
accessToken: string, accessToken: string,
userID: string, userID: string,
formValues: Record<string, any> // Assuming formValues is an object 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", method: "POST",
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
@ -53,12 +52,11 @@ export const keyCreateCall = async (
export const keyDeleteCall = async ( export const keyDeleteCall = async (
proxyBaseUrl: String,
accessToken: String, accessToken: String,
user_key: String user_key: String
) => { ) => {
try { try {
const response = await fetch(`${proxyBaseUrl}/key/delete`, { const response = await fetch(`/key/delete`, {
method: "POST", method: "POST",
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
@ -84,13 +82,12 @@ export const keyDeleteCall = async (
}; };
export const userInfoCall = async ( export const userInfoCall = async (
proxyBaseUrl: String,
accessToken: String, accessToken: String,
userID: String userID: String
) => { ) => {
try { try {
const response = await fetch( const response = await fetch(
`${proxyBaseUrl}/user/info?user_id=${userID}`, `/user/info?user_id=${userID}`,
{ {
method: "GET", method: "GET",
headers: { headers: {

View file

@ -14,8 +14,6 @@ const UserDashboard = () => {
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const userID = searchParams.get("userID"); const userID = searchParams.get("userID");
const proxyBaseUrl = searchParams.get("proxyBaseUrl");
const token = searchParams.get("token"); const token = searchParams.get("token");
const [accessToken, setAccessToken] = useState<string | null>(null); 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 () => { const fetchData = async () => {
try { try {
const response = await userInfoCall( const response = await userInfoCall(
proxyBaseUrl,
accessToken, accessToken,
userID userID
); );
@ -50,20 +47,13 @@ const UserDashboard = () => {
}; };
fetchData(); 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 // Now you can construct the full URL
const url = `${baseUrl}sso/key/generate`; const url = `/sso/key/generate`;
window.location.href = url; window.location.href = url;
@ -80,14 +70,12 @@ const UserDashboard = () => {
<ViewKeyTable <ViewKeyTable
userID={userID} userID={userID}
accessToken={accessToken} accessToken={accessToken}
proxyBaseUrl={proxyBaseUrl}
data={data} data={data}
setData={setData} setData={setData}
/> />
<CreateKey <CreateKey
userID={userID} userID={userID}
accessToken={accessToken} accessToken={accessToken}
proxyBaseUrl={proxyBaseUrl}
data={data} data={data}
setData={setData} setData={setData}
/> />