[web] Change the api routing and minor fix.

3 files changed, 5 insertions, 26 deletions

diff --git a/web/src/js/backends/static.js b/web/src/js/backends/static.js
index 6657fecf..7e87a5ed 100644
--- a/web/src/js/backends/static.js
+++ b/web/src/js/backends/static.js
@@ -11,10 +11,8 @@ export default class StaticBackend {
    }
 
    onOpen() {
-        this.fetchData("settings")
         this.fetchData("flows")
-        this.fetchData("events")
-        this.fetchData("options")
+        // this.fetchData("events") # TODO: Add events log to static viewer.
    }
 
    fetchData(resource) {
diff --git a/web/src/js/flow/utils.js b/web/src/js/flow/utils.js
index cb37822a..9915a639 100644
--- a/web/src/js/flow/utils.js
+++ b/web/src/js/flow/utils.js
@@ -49,14 +49,7 @@ export var MessageUtils = {
         } else if (message === flow.response) {
             message = "response";
         }
-        if (global.MITMWEB_STATIC) {
-            let url = view ?
-                `/flows/${flow.id}/${message}/content/${view}.json` :
-                `/flows/${flow.id}/${message}/content.json`
-            return url;
-        } else {
-            return `/flows/${flow.id}/${message}/content` + (view ? `/${view}` : '');
-        }
+        return `/flows/${flow.id}/${message}/` + (view ? `content/${view}.json` : '_content');
     }
 };
 
diff --git a/web/src/js/utils.js b/web/src/js/utils.js
index 505f74df..3aeba1b1 100644
--- a/web/src/js/utils.js
+++ b/web/src/js/utils.js
@@ -81,27 +81,15 @@ function getCookie(name) {
 }
 const xsrf = `_xsrf=${getCookie("_xsrf")}`;
 
-
 export function fetchApi(url, options={}) {
-    if (global.MITMWEB_STATIC) {
-        let path = url.split('/'),
-            filename = path.pop()
-        filename += '.json'
-        path.push(filename)
-        let new_url = path.join('/')
-        return _fetchApi(new_url, options)
-    } else {
-        return _fetchApi(url, options)
-    }
-}
-
-function _fetchApi(url, options={}) {
     if (options.method && options.method !== "GET") {
         if (url.indexOf("?") === -1) {
             url += "?" + xsrf;
         } else {
             url += "&" + xsrf;
         }
+    } else {
+        url += '.json'
     }
 
     return fetch(url, {
@@ -110,7 +98,7 @@ function _fetchApi(url, options={}) {
     });
 }
 
-fetchApi.put = (url, json, options) => _fetchApi(
+fetchApi.put = (url, json, options) => fetchApi(
     url,
     {
         method: "PUT",