add /question-builder/ baseURL env var

RobokopU24 · Jun 21, 2023 · 788176e · 788176e
1 parent f0194d8
commit 788176e
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/src/API/ara.js b/src/API/ara.js
@@ -1,5 +1,5 @@
-import axios from 'axios';
 import utils from './utils';
+import { api } from './baseUrlProxy';
 
 const baseRoutes = {
   /**
@@ -8,7 +8,7 @@ const baseRoutes = {
    */
   async getQuickAnswer(ara, message) {
     try {
-      const response = await axios.post(`/api/quick_answer/?ara=${ara}`, message);
+      const response = await api.post(`/api/quick_answer/?ara=${ara}`, message);
       return response.data;
     } catch (error) {
       return utils.handleAxiosError(error);
@@ -30,7 +30,7 @@ const baseRoutes = {
       config.headers.Authorization = `Bearer ${token}`;
     }
     try {
-      const response = await axios(config);
+      const response = await api(config);
       return response.data;
     } catch (e) {
       return utils.handleAxiosError(e);

diff --git a/src/API/baseUrlProxy.js b/src/API/baseUrlProxy.js
@@ -0,0 +1,6 @@
+import axios from 'axios';
+
+// eslint-disable-next-line import/prefer-default-export
+export const api = axios.create({
+  baseURL: process.env.BASE_URL,
+});
diff --git a/src/API/biolink.js b/src/API/biolink.js
@@ -1,6 +1,5 @@
-import axios from 'axios';
-
 import utils from './utils';
+import { api } from './baseUrlProxy';
 
 const routes = {
   /**
@@ -9,7 +8,7 @@ const routes = {
   async getModelSpecification() {
     let response;
     try {
-      response = await axios.get('/api/biolink');
+      response = await api.get('/api/biolink');
     } catch (error) {
       return utils.handleAxiosError(error);
     }

diff --git a/src/API/nameResolver.js b/src/API/nameResolver.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import utils from './utils';
+import { api } from './baseUrlProxy';
 
 const baseRoutes = {
   /**
@@ -17,7 +18,7 @@ const baseRoutes = {
       cancelToken: cancel,
     };
     try {
-      const response = await axios.post('/api/name_resolver', {}, config);
+      const response = await api.post('/api/name_resolver', {}, config);
       return response.data;
     } catch (error) {
       if (axios.isCancel(error)) {

diff --git a/src/API/nodeNormalization.js b/src/API/nodeNormalization.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import utils from './utils';
+import { api } from './baseUrlProxy';
 
 const baseRoutes = {
   /**
@@ -11,7 +12,7 @@ const baseRoutes = {
       cancelToken: cancel,
     };
     try {
-      const response = await axios.post('/api/node_norm', curies, config);
+      const response = await api.post('/api/node_norm', curies, config);
       return response.data;
     } catch (error) {
       if (axios.isCancel(error)) {

diff --git a/src/API/queryDispatcher.js b/src/API/queryDispatcher.js
@@ -1,5 +1,5 @@
-import axios from 'axios';
 import utils from './utils';
+import { api } from './baseUrlProxy';
 
 const baseRoutes = {
   /**
@@ -20,7 +20,7 @@ const baseRoutes = {
     };
     config.headers.Authorization = token;
     try {
-      const response = await axios(config);
+      const response = await api(config);
       return response.data;
     } catch (error) {
       return utils.handleAxiosError(error);

diff --git a/src/API/robokache.js b/src/API/robokache.js
@@ -1,6 +1,5 @@
-import axios from 'axios';
-
 import utils from './utils';
+import { api } from './baseUrlProxy';
 
 // Base request method for all endpoints
 async function baseRequest(path, method, body, token) {
@@ -19,7 +18,7 @@ async function baseRequest(path, method, body, token) {
   }
 
   try {
-    const response = await axios(config);
+    const response = await api(config);
     return response.data;
   } catch (error) {
     return utils.handleAxiosError(error);
@@ -53,7 +52,7 @@ const routes = {
       config.headers.Authorization = `Bearer ${token}`;
     }
     try {
-      const response = await axios(config);
+      const response = await api(config);
       return response.data;
     } catch (error) {
       return utils.handleAxiosError(error);
@@ -71,7 +70,7 @@ const routes = {
       config.headers.Authorization = `Bearer ${token}`;
     }
     try {
-      const response = await axios(config);
+      const response = await api(config);
       return response.data;
     } catch (error) {
       return utils.handleAxiosError(error);
@@ -88,7 +87,7 @@ const routes = {
     };
     config.headers.Authorization = `Bearer ${token}`;
     try {
-      const response = await axios(config);
+      const response = await api(config);
       return response.data;
     } catch (error) {
       return utils.handleAxiosError(error);
@@ -104,7 +103,7 @@ const routes = {
     };
     config.headers.Authorization = `Bearer ${token}`;
     try {
-      const response = await axios(config);
+      const response = await api(config);
       return response.data;
     } catch (error) {
       return utils.handleAxiosError(error);

diff --git a/tests/common/mocks/handlers.js b/tests/common/mocks/handlers.js
@@ -4,10 +4,10 @@ import biolink from '&/biolink_model.json';
 import test_message from '&/test_message.json';
 
 const handlers = [
-  rest.get('/api/biolink', (req, res, ctx) => res(
+  rest.get(`${process.env.BASE_URL || ''}/api/biolink`, (req, res, ctx) => res(
     ctx.json(biolink),
   )),
-  rest.post('/api/node_norm', (req, res, ctx) => {
+  rest.post(`${process.env.BASE_URL || ''}/api/node_norm`, (req, res, ctx) => {
     const curie = req.body.curies[0];
     return res(
       ctx.json({
@@ -21,15 +21,15 @@ const handlers = [
       }),
     );
   }),
-  rest.post('/api/name_resolver', (req, res, ctx) => {
+  rest.post(`${process.env.BASE_URL || ''}/api/name_resolver`, (req, res, ctx) => {
     const curie = req.url.searchParams.get('string');
     return res(
       ctx.json({
         [curie]: {},
       }),
     );
   }),
-  rest.post('/api/quick_answer', (req, res, ctx) => res(
+  rest.post(`${process.env.BASE_URL || ''}/api/quick_answer`, (req, res, ctx) => res(
     ctx.json(test_message),
   )),
 ];