API_URL should not contain version suffix

Author: dolfinus

docker/Dockerfile

@@ -23,7 +23,7 @@ COPY --from=build /app/dist /usr/share/nginx/html
 COPY ./docker/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
-ARG API_URL=http://localhost:8000
+ARG API_URL=http://localhost:8000/v1
 ENV SYNCMASTER__UI__API_BROWSER_URL=${API_URL}
 
 ENTRYPOINT ["/entrypoint.sh"]

src/entities/auth/api/authService.ts

@@ -4,9 +4,9 @@ import { AuthUser, LoginRequest, LoginResponse } from './types';
 
 export const authService = {
   login: (data: LoginRequest): Promise<LoginResponse> => {
-    return axiosInstance.postForm('auth/token', data);
+    return axiosInstance.postForm('v1/auth/token', data);
   },
   getCurrentUserInfo: (): Promise<AuthUser> => {
-    return axiosInstance.get('users/me');
+    return axiosInstance.get('v1/users/me');
   },
 };

src/entities/connection/api/connectionService.ts

@@ -12,22 +12,22 @@ import {
 
 export const connectionService = {
   getConnections: (params: GetConnectionsRequest): Promise<PaginationResponse<Connection>> => {
-    return axiosInstance.get('connections', { params });
+    return axiosInstance.get('v1/connections', { params });
   },
 
   getConnection: ({ id }: GetConnectionRequest): Promise<Connection> => {
-    return axiosInstance.get(`connections/${id}`);
+    return axiosInstance.get(`v1/connections/${id}`);
   },
 
   createConnection: (data: CreateConnectionRequest): Promise<Connection> => {
-    return axiosInstance.post(`connections`, data);
+    return axiosInstance.post(`v1/connections`, data);
   },
 
   updateConnection: ({ id, ...data }: UpdateConnectionRequest): Promise<Connection> => {
-    return axiosInstance.put(`connections/${id}`, data);
+    return axiosInstance.put(`v1/connections/${id}`, data);
   },
 
   deleteConnection: ({ id }: DeleteConnectionRequest): Promise<null> => {
-    return axiosInstance.delete(`connections/${id}`);
+    return axiosInstance.delete(`v1/connections/${id}`);
   },
 };

src/entities/group/api/groupService.ts

@@ -17,34 +17,34 @@ import {
 
 export const groupService = {
   getGroups: (params: GetGroupsRequest): Promise<PaginationResponse<Group>> => {
-    return axiosInstance.get('groups', { params });
+    return axiosInstance.get('v1/groups', { params });
   },
 
   getGroup: ({ id }: GetGroupRequest): Promise<Group> => {
-    return axiosInstance.get(`groups/${id}`);
+    return axiosInstance.get(`v1/groups/${id}`);
   },
 
   createGroup: (data: CreateGroupRequest): Promise<GroupData> => {
-    return axiosInstance.post(`groups`, data);
+    return axiosInstance.post(`v1/groups`, data);
   },
 
   updateGroup: ({ id, ...data }: UpdateGroupRequest): Promise<GroupData> => {
-    return axiosInstance.put(`groups/${id}`, data);
+    return axiosInstance.put(`v1/groups/${id}`, data);
   },
 
   getGroupUsers: ({ id }: GetGroupUsersRequest): Promise<PaginationResponse<GroupUser>> => {
-    return axiosInstance.get(`groups/${id}/users`);
+    return axiosInstance.get(`v1/groups/${id}/users`);
   },
 
   addGroupUser: ({ groupId, userId, ...data }: AddGroupUserRequest): Promise<null> => {
-    return axiosInstance.post(`groups/${groupId}/users/${userId}`, data);
+    return axiosInstance.post(`v1/groups/${groupId}/users/${userId}`, data);
   },
 
   updateGroupUser: ({ groupId, userId, ...data }: UpdateGroupUserRequest): Promise<null> => {
-    return axiosInstance.put(`groups/${groupId}/users/${userId}`, data);
+    return axiosInstance.put(`v1/groups/${groupId}/users/${userId}`, data);
   },
 
   deleteGroupUser: ({ groupId, userId }: DeleteGroupUserRequest): Promise<null> => {
-    return axiosInstance.delete(`groups/${groupId}/users/${userId}`);
+    return axiosInstance.delete(`v1/groups/${groupId}/users/${userId}`);
   },
 };

src/entities/queue/api/queueService.ts

@@ -12,22 +12,22 @@ import {
 
 export const queueService = {
   getQueues: (params: GetQueuesRequest): Promise<PaginationResponse<Queue>> => {
-    return axiosInstance.get('queues', { params });
+    return axiosInstance.get('v1/queues', { params });
   },
 
   getQueue: ({ id, ...params }: GetQueueRequest): Promise<Queue> => {
-    return axiosInstance.get(`queues/${id}`, { params });
+    return axiosInstance.get(`v1/queues/${id}`, { params });
   },
 
   createQueue: (data: CreateQueueRequest): Promise<Queue> => {
-    return axiosInstance.post(`queues`, data);
+    return axiosInstance.post(`v1/queues`, data);
   },
 
   updateQueue: ({ id, ...data }: UpdateQueueRequest): Promise<Queue> => {
-    return axiosInstance.put(`queues/${id}`, data);
+    return axiosInstance.put(`v1/queues/${id}`, data);
   },
 
   deleteQueue: ({ id }: DeleteQueueRequest): Promise<null> => {
-    return axiosInstance.delete(`queues/${id}`);
+    return axiosInstance.delete(`v1/queues/${id}`);
   },
 };

src/entities/run/api/runService.ts

@@ -5,14 +5,14 @@ import { GetRunRequest, Run, GetRunsRequest, CreateRunRequest } from './types';
 
 export const runService = {
   getRuns: (params: GetRunsRequest): Promise<PaginationResponse<Run>> => {
-    return axiosInstance.get('runs', { params });
+    return axiosInstance.get('v1/runs', { params });
   },
 
   getRun: ({ id }: GetRunRequest): Promise<Run> => {
-    return axiosInstance.get(`runs/${id}`);
+    return axiosInstance.get(`v1/runs/${id}`);
   },
 
   createRun: (data: CreateRunRequest): Promise<Run> => {
-    return axiosInstance.post('runs', data);
+    return axiosInstance.post('v1/runs', data);
   },
 };

src/entities/transfer/api/transferService.ts

@@ -12,22 +12,22 @@ import {
 
 export const transferService = {
   getTransfers: (params: GetTransfersRequest): Promise<PaginationResponse<Transfer>> => {
-    return axiosInstance.get('transfers', { params });
+    return axiosInstance.get('v1/transfers', { params });
   },
 
   getTransfer: ({ id }: GetTransferRequest): Promise<Transfer> => {
-    return axiosInstance.get(`transfers/${id}`);
+    return axiosInstance.get(`v1/transfers/${id}`);
   },
 
   createTransfer: (data: CreateTransferRequest): Promise<Transfer> => {
-    return axiosInstance.post(`transfers`, data);
+    return axiosInstance.post(`v1/transfers`, data);
   },
 
   updateTransfer: ({ id, ...data }: UpdateTransferRequest): Promise<Transfer> => {
-    return axiosInstance.put(`transfers/${id}`, data);
+    return axiosInstance.put(`v1/transfers/${id}`, data);
   },
 
   deleteTransfer: ({ id }: DeleteTransferRequest): Promise<null> => {
-    return axiosInstance.delete(`transfers/${id}`);
+    return axiosInstance.delete(`v1/transfers/${id}`);
   },
 };

src/entities/user/api/userService.ts

@@ -5,10 +5,10 @@ import { GetUserRequest, User, GetUsersRequest } from './types';
 
 export const userService = {
   getUsers: (params: GetUsersRequest): Promise<PaginationResponse<User>> => {
-    return axiosInstance.get('users', { params });
+    return axiosInstance.get('v1/users', { params });
   },
 
   getUser: ({ id }: GetUserRequest): Promise<User> => {
-    return axiosInstance.get(`users/${id}`);
+    return axiosInstance.get(`v1/users/${id}`);
   },
 };

src/shared/config/axios/instance.ts

@@ -3,7 +3,7 @@ import axios from 'axios';
 import { requestInterceptor, responseSuccessInterceptor } from './interceptors';
 
 export const axiosInstance = axios.create({
-  baseURL: window.env?.API_URL || process.env.API_URL || 'http://localhost:8000/v1/',
+  baseURL: window.env?.API_URL || process.env.API_URL || 'http://localhost:8000',
   headers: {
     Accept: 'application/json',
     'Content-Type': 'application/json',