Merge pull request #1228 from andypols/fix-invalid-api-base-url

fix: bug in using API_BASE with URL

Author: kriswest

src/service/routes/users.js

@@ -4,21 +4,8 @@ const db = require('../../db');
 const { toPublicUser } = require('./publicApi');
 
 router.get('/', async (req, res) => {
-  const query = {};
-
-  console.log(`fetching users = query path =${JSON.stringify(req.query)}`);
-  for (const k in req.query) {
-    if (!k) continue;
-
-    if (k === 'limit') continue;
-    if (k === 'skip') continue;
-    let v = req.query[k];
-    if (v === 'false') v = false;
-    if (v === 'true') v = true;
-    query[k] = v;
-  }
-
-  const users = await db.getUsers(query);
+  console.log(`fetching users`);
+  const users = await db.getUsers({});
   res.send(users.map(toPublicUser));
 });
 

src/ui/apiBase.ts

@@ -8,4 +8,4 @@ const stripTrailingSlashes = (s: string) => s.replace(/\/+$/, '');
  */
 export const API_BASE = process.env.VITE_API_URI
   ? stripTrailingSlashes(process.env.VITE_API_URI)
-  : '';
+  : location.origin;

src/ui/services/user.ts

@@ -41,15 +41,14 @@ const getUsers = async (
   setData: SetStateCallback<UserData[]>,
   setAuth: SetStateCallback<boolean>,
   setErrorMessage: SetStateCallback<string>,
-  query: Record<string, string> = {},
 ): Promise<void> => {
-  const url = new URL(`${API_BASE}/api/v1/user`);
-  url.search = new URLSearchParams(query).toString();
-
   setIsLoading(true);
 
   try {
-    const response: AxiosResponse<UserData[]> = await axios(url.toString(), getAxiosConfig());
+    const response: AxiosResponse<UserData[]> = await axios(
+      `${API_BASE}/api/v1/user`,
+      getAxiosConfig(),
+    );
     setData(response.data);
   } catch (error) {
     if (axios.isAxiosError(error)) {
@@ -70,10 +69,8 @@ const getUsers = async (
 
 const updateUser = async (data: UserData): Promise<void> => {
   console.log(data);
-  const url = new URL(`${API_BASE}/api/auth/gitAccount`);
-
   try {
-    await axios.post(url.toString(), data, getAxiosConfig());
+    await axios.post(`${API_BASE}/api/auth/gitAccount`, data, getAxiosConfig());
   } catch (error) {
     const axiosError = error as AxiosError;
     if (axiosError.response) {
@@ -89,10 +86,11 @@ const getUserLoggedIn = async (
   setIsError: SetStateCallback<boolean>,
   setAuth: SetStateCallback<boolean>,
 ): Promise<void> => {
-  const url = new URL(`${API_BASE}/api/auth/me`);
-
   try {
-    const response: AxiosResponse<UserData> = await axios(url.toString(), getAxiosConfig());
+    const response: AxiosResponse<UserData> = await axios(
+      `${API_BASE}/api/auth/me`,
+      getAxiosConfig(),
+    );
     const data = response.data;
     setIsLoading(false);
     setIsAdmin(data.admin || false);

src/ui/views/RepoDetails/Components/AddUser.tsx

@@ -77,7 +77,7 @@ const AddUserDialog: React.FC<AddUserDialogProps> = ({
   };
 
   useEffect(() => {
-    getUsers(setIsLoading, setData, setAuth, setErrorMessage, {});
+    getUsers(setIsLoading, setData, setAuth, setErrorMessage);
   }, []);
 
   if (errorMessage) return <Danger>{errorMessage}</Danger>;

src/ui/views/UserList/Components/UserList.tsx

@@ -19,13 +19,9 @@ import Search from '../../../components/Search/Search';
 import Danger from '../../../components/Typography/Danger';
 import { UserData } from '../../../../types/models';
 
-interface UserListProps {
-  [key: string]: any;
-}
-
 const useStyles = makeStyles(styles as any);
 
-const UserList: React.FC<UserListProps> = (props) => {
+const UserList: React.FC = () => {
   const classes = useStyles();
   const [data, setData] = useState<UserData[]>([]);
   const [, setAuth] = useState<boolean>(true);
@@ -40,14 +36,8 @@ const UserList: React.FC<UserListProps> = (props) => {
     navigate(`/dashboard/admin/user/${username}`, { replace: true });
 
   useEffect(() => {
-    const query: Record<string, any> = {};
-
-    for (const k in props) {
-      if (!k) continue;
-      query[k] = props[k];
-    }
-    getUsers(setIsLoading, setData, setAuth, setErrorMessage, query);
-  }, [props]);
+    getUsers(setIsLoading, setData, setAuth, setErrorMessage);
+  });
 
   if (isLoading) return <div>Loading...</div>;
   if (errorMessage) return <Danger>{errorMessage}</Danger>;

test/ui/apiBase.test.js

@@ -9,6 +9,14 @@ function loadApiBase() {
 describe('apiBase', () => {
   let originalEnv;
 
+  before(() => {
+    global.location = { origin: 'https://lovely-git-proxy.com' };
+  });
+
+  after(() => {
+    delete global.location;
+  });
+
   beforeEach(() => {
     originalEnv = process.env.VITE_API_URI;
     delete process.env.VITE_API_URI;
@@ -24,9 +32,9 @@ describe('apiBase', () => {
     delete require.cache[require.resolve('../../src/ui/apiBase')];
   });
 
-  it('uses empty string when VITE_API_URI is not set', () => {
+  it('uses the location origin when VITE_API_URI is not set', () => {
     const { API_BASE } = loadApiBase();
-    expect(API_BASE).to.equal('');
+    expect(API_BASE).to.equal('https://lovely-git-proxy.com');
   });
 
   it('returns the exact value when no trailing slash', () => {