Use gateway (#92)

use gateway

Signed-off-by: ChamseddineBhd <[email protected]>

Author: ChamseddineBhd

.env

@@ -1,4 +1,5 @@
 REACT_APP_API_STUDY_SERVER=api/study-server
 REACT_APP_API_CASE_SERVER=api/case-server
+REACT_APP_API_GATEWAY=api/gateway
 
 REACT_APP_USE_AUTHENTICATION=true

app-httpd.conf

@@ -21,5 +21,5 @@
     SetEnvIf BASE ^$ BASE=.
 
     ProxyRequests off
-    ProxyPassMatch "^/api/(case-server|study-server)/(.*)$" http://$1/$2
+    ProxyPassMatch "^/api/(case-server|study-server|gateway)/(.*)$" http://$1/$2
 </VirtualHost>

src/setupProxy.js

@@ -5,9 +5,16 @@ module.exports = function(app) {
         pathRewrite: { '^/api/study-server/': '/' }
     })
   );
+
   app.use(
     createProxyMiddleware('http://localhost:5000/api/case-server', {
         pathRewrite: { '^/api/case-server/': '/' }
     })
   );
+
+  app.use(
+    createProxyMiddleware('http://localhost:9000/api/gateway', {
+        pathRewrite: { '^/api/gateway/': '/' }
+    })
+  );
 };

src/utils/rest-api.js

@@ -4,82 +4,104 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+import {store} from '../redux/store'
+
+let PREFIX_CASE_QUERIES;
+let PREFIX_STUDY_QUERIES;
+if (process.env.REACT_APP_USE_AUTHENTICATION === "true") {
+    PREFIX_CASE_QUERIES = process.env.REACT_APP_API_GATEWAY + "/case";
+    PREFIX_STUDY_QUERIES = process.env.REACT_APP_API_GATEWAY + "/study";
+} else {
+    PREFIX_CASE_QUERIES = process.env.REACT_APP_API_CASE_SERVER;
+    PREFIX_STUDY_QUERIES = process.env.REACT_APP_API_STUDY_SERVER;
+}
+
+function getToken() {
+    const state = store.getState();
+    return state.user.id_token;
+}
+
+function backendFetch(url, init) {
+    if (! (typeof(init) == "undefined" || typeof(init) == "object")) {
+        throw new TypeError("Argument 2 of backendFetch is not an object" + typeof(init));
+    }
+    const initCopy = Object.assign({}, init);
+    if (process.env.REACT_APP_USE_AUTHENTICATION === "true") {
+        initCopy.headers = new Headers(initCopy.headers);
+        initCopy.headers.append("Authorization", "Bearer: " + getToken())
+    }
+    return fetch(url, initCopy);
+}
 
 export function fetchStudies() {
     console.info("Fetching studies...");
-    const fetchStudiesUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies";
+    const fetchStudiesUrl = PREFIX_STUDY_QUERIES + "/v1/studies";
     console.debug(fetchStudiesUrl);
-    return fetch(fetchStudiesUrl)
-        .then(response => response.json());
+    return backendFetch(fetchStudiesUrl).then(response => response.json());
 }
 
 export function fetchCases() {
     console.info("Fetching cases...");
-    const fetchCasesUrl = process.env.REACT_APP_API_CASE_SERVER + "/v1/cases";
+    const fetchCasesUrl = PREFIX_CASE_QUERIES + "/v1/cases";
     console.debug(fetchCasesUrl);
-    return fetch(fetchCasesUrl)
-        .then(response => response.json());
+    return backendFetch(fetchCasesUrl).then(response => response.json());
 }
 
 export function getVoltageLevelSingleLineDiagram(studyName, voltageLevelId, useName, centerLabel, diagonalLabel, topologicalColoring) {
     console.info(`Getting url of voltage level diagram '${voltageLevelId}' of study '${studyName}'...`);
-    return process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName + "/network/voltage-levels/" + voltageLevelId + "/svg-and-metadata?useName=" + useName
+    return PREFIX_STUDY_QUERIES + "/v1/studies/" + studyName + "/network/voltage-levels/" + voltageLevelId + "/svg-and-metadata?useName=" + useName
         + "&centerLabel=" + centerLabel + "&diagonalLabel=" + diagonalLabel + "&topologicalColoring=" + topologicalColoring;
 }
 
 export function fetchSvg(svgUrl) {
     console.debug(svgUrl);
-    return fetch(svgUrl)
-        .then(response => response.ok ?
-                            response.json() :
-                            response.json().then( error =>
-                                Promise.reject(new Error(error.error))));
+    return backendFetch(svgUrl).then(response => response.ok ?
+        response.json() :
+        response.json().then( error => Promise.reject(new Error(error.error))));
 }
 
 export function fetchSubstations(studyName) {
     console.info(`Fetching substations of study '${studyName}'...`);
-    const fetchSubstationsUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName + "/network-map/substations";
+    const fetchSubstationsUrl = PREFIX_STUDY_QUERIES + "/v1/studies/" + studyName + "/network-map/substations";
     console.debug(fetchSubstationsUrl);
-    return fetch(fetchSubstationsUrl)
-        .then(response => response.json());
+    return backendFetch(fetchSubstationsUrl).then(response => response.json());
 }
 
 export function fetchSubstationPositions(studyName) {
     console.info(`Fetching substation positions of study '${studyName}'...`);
-    const fetchSubstationPositionsUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName + "/geo-data/substations";
+    const fetchSubstationPositionsUrl = PREFIX_STUDY_QUERIES + "/v1/studies/" + studyName + "/geo-data/substations";
     console.debug(fetchSubstationPositionsUrl);
-    return fetch(fetchSubstationPositionsUrl)
-        .then(response => response.json());
+    return backendFetch(fetchSubstationPositionsUrl).then(response => response.json());
 }
 
 export function fetchLines(studyName) {
     console.info(`Fetching lines of study '${studyName}'...`);
-    const fetchLinesUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName + "/network-map/lines";
+    const fetchLinesUrl = PREFIX_STUDY_QUERIES + "/v1/studies/" + studyName + "/network-map/lines";
     console.debug(fetchLinesUrl);
-    return fetch(fetchLinesUrl)
-        .then(response => response.json());
+    return backendFetch(fetchLinesUrl).then(response => response.json());
 }
 
 export function fetchLinePositions(studyName) {
     console.info(`Fetching line positions of study '${studyName}'...`);
-    const fetchLinePositionsUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName + "/geo-data/lines";
+    const fetchLinePositionsUrl = PREFIX_STUDY_QUERIES + "/v1/studies/" + studyName + "/geo-data/lines";
     console.debug(fetchLinePositionsUrl);
-    return fetch(fetchLinePositionsUrl)
-        .then(response => response.json());
+    return backendFetch(fetchLinePositionsUrl).then(response => response.json());
 }
 
 export function createStudy(caseExist, studyName, studyDescription, caseName, selectedFile) {
     console.info("Creating a new study...");
     if (caseExist) {
-        const createStudyWithExistingCaseUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName +"/cases/" + caseName +"?description=" + studyDescription;
+        const createStudyWithExistingCaseUrl = PREFIX_STUDY_QUERIES + "/v1/studies/" + studyName +"/cases/" + caseName +"?description=" + studyDescription;
         console.debug(createStudyWithExistingCaseUrl);
-        return fetch(createStudyWithExistingCaseUrl, {method : 'post'});
+        return backendFetch(createStudyWithExistingCaseUrl, {
+            method : 'post',
+        });
     } else {
-        const createStudyWithNewCaseUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName + "?description=" + studyDescription;
+        const createStudyWithNewCaseUrl = PREFIX_STUDY_QUERIES + "/v1/studies/" + studyName + "?description=" + studyDescription;
         const formData = new FormData();
         formData.append('caseFile', selectedFile);
         console.debug(createStudyWithNewCaseUrl);
-        return fetch(createStudyWithNewCaseUrl, {
+        return backendFetch(createStudyWithNewCaseUrl, {
             method : 'post',
             body : formData
         })
@@ -88,16 +110,18 @@ export function createStudy(caseExist, studyName, studyDescription, caseName, se
 
 export function deleteStudy(studyName) {
     console.info("Deleting study" + studyName + " ...");
-    const deleteStudyUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName;
+    const deleteStudyUrl = PREFIX_STUDY_QUERIES + "/v1/studies/" + studyName;
     console.debug(deleteStudyUrl);
-    return fetch(deleteStudyUrl, {method:'delete'});
+    return backendFetch(deleteStudyUrl,{
+        method:'delete'
+    });
 }
 
 export function renameStudy(studyName, newStudyName) {
     console.info("Renaming study " + studyName);
     const renameStudiesUrl = process.env.REACT_APP_API_STUDY_SERVER + "/v1/studies/" + studyName + "/rename";
     console.debug(renameStudiesUrl);
-    return fetch(renameStudiesUrl, {
+    return backendFetch(renameStudiesUrl, {
         method : 'POST',
         headers : {
             'Accept' : 'application/json',