chore: merge ui changes with new baseUrl function

Author: coopernetes

src/ui/services/auth.ts

@@ -17,7 +17,7 @@ interface AxiosConfig {
 export const getUserInfo = async (): Promise<PublicUser | null> => {
   try {
     const baseUrl = await getBaseUrl();
-    const response = await fetch(`${baseUrl}/api/auth/me`, {
+    const response = await fetch(`${baseUrl}/api/auth/profile`, {
       credentials: 'include', // Sends cookies
     });
     if (!response.ok) throw new Error(`Failed to fetch user info: ${response.statusText}`);

src/ui/services/user.ts

@@ -87,30 +87,4 @@ const updateUser = async (
   }
 };
 
-const getUserLoggedIn = async (
-  setIsLoading: SetStateCallback<boolean>,
-  setIsAdmin: SetStateCallback<boolean>,
-  setIsError: SetStateCallback<boolean>,
-  setAuth: SetStateCallback<boolean>,
-): Promise<void> => {
-  try {
-    const baseUrl = await getBaseUrl();
-    const response: AxiosResponse<UserData> = await axios(
-      `${baseUrl}/api/auth/me`,
-      getAxiosConfig(),
-    );
-    const data = response.data;
-    setIsLoading(false);
-    setIsAdmin(data.admin || false);
-  } catch (error) {
-    setIsLoading(false);
-    const axiosError = error as AxiosError;
-    if (axiosError.response?.status === 401) {
-      setAuth(false);
-    } else {
-      setIsError(true);
-    }
-  }
-};
-
-export { getUser, getUsers, updateUser, getUserLoggedIn };
+export { getUser, getUsers, updateUser };

src/ui/views/Login/Login.tsx

@@ -34,14 +34,9 @@ const Login: React.FC = () => {
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [authMethods, setAuthMethods] = useState<string[]>([]);
   const [usernamePasswordMethod, setUsernamePasswordMethod] = useState<string>('');
-  const [apiBaseUrl, setApiBaseUrl] = useState<string>('');
 
   useEffect(() => {
-    // Initialize API base URL
     getBaseUrl().then((baseUrl) => {
-      setApiBaseUrl(baseUrl);
-
-      // Fetch auth config
       axios.get(`${baseUrl}/api/auth/config`).then((response) => {
         const usernamePasswordMethod = response.data.usernamePasswordMethod;
         const otherMethods = response.data.otherMethods;
@@ -51,7 +46,7 @@ const Login: React.FC = () => {
 
         // Automatically login if only one non-username/password method is enabled
         if (!usernamePasswordMethod && otherMethods.length === 1) {
-          handleAuthMethodLogin(otherMethods[0], baseUrl);
+          handleAuthMethodLogin(otherMethods[0]);
         }
       });
     });
@@ -63,37 +58,40 @@ const Login: React.FC = () => {
     );
   }
 
-  function handleAuthMethodLogin(authMethod: string, baseUrl?: string): void {
-    const url = baseUrl || apiBaseUrl;
-    window.location.href = `${url}/api/auth/${authMethod}`;
+  function handleAuthMethodLogin(authMethod: string): void {
+    getBaseUrl().then((baseUrl) => {
+      window.location.href = `${baseUrl}/api/auth/${authMethod}`;
+    });
   }
 
   function handleSubmit(event: FormEvent): void {
     event.preventDefault();
     setIsLoading(true);
 
-    const loginUrl = `${apiBaseUrl}/api/auth/login`;
-    axios
-      .post<LoginResponse>(loginUrl, { username, password }, getAxiosConfig())
-      .then(() => {
-        window.sessionStorage.setItem('git.proxy.login', 'success');
-        setMessage('Success!');
-        setSuccess(true);
-        authContext.refreshUser().then(() => navigate(0));
-      })
-      .catch((error: AxiosError) => {
-        if (error.response?.status === 307) {
+    getBaseUrl().then((baseUrl) => {
+      const loginUrl = `${baseUrl}/api/auth/login`;
+      axios
+        .post<LoginResponse>(loginUrl, { username, password }, getAxiosConfig())
+        .then(() => {
           window.sessionStorage.setItem('git.proxy.login', 'success');
-          setGitAccountError(true);
-        } else if (error.response?.status === 403) {
-          setMessage(processAuthError(error, false));
-        } else {
-          setMessage('You entered an invalid username or password...');
-        }
-      })
-      .finally(() => {
-        setIsLoading(false);
-      });
+          setMessage('Success!');
+          setSuccess(true);
+          authContext.refreshUser().then(() => navigate(0));
+        })
+        .catch((error: AxiosError) => {
+          if (error.response?.status === 307) {
+            window.sessionStorage.setItem('git.proxy.login', 'success');
+            setGitAccountError(true);
+          } else if (error.response?.status === 403) {
+            setMessage(processAuthError(error, false));
+          } else {
+            setMessage('You entered an invalid username or password...');
+          }
+        })
+        .finally(() => {
+          setIsLoading(false);
+        });
+    });
   }
 
   if (gitAccountError) {

src/ui/views/RepoList/Components/Repositories.tsx

@@ -32,14 +32,7 @@ interface GridContainerLayoutProps {
   key: string;
 }
 
-interface UserContextType {
-  user: {
-    admin: boolean;
-    [key: string]: any;
-  };
-}
-
-export default function Repositories(): JSX.Element {
+export default function Repositories(): React.ReactElement {
   const useStyles = makeStyles(styles as any);
   const classes = useStyles();
   const [repos, setRepos] = useState<RepoView[]>([]);