From 0f8d7a55de1ee81f7ec60be664f957a2bd42b980 Mon Sep 17 00:00:00 2001
From: Isaac Virshup <ivirshup@gmail.com>
Date: Tue, 12 Feb 2019 04:01:37 +1100
Subject: [PATCH] Set API path based on access address (#568)

* Make api paths relative

* Remove request import

* Set publicPath to be relative
---
 client/configuration/webpack/webpack.config.prod.js | 2 +-
 client/index_template.html                          | 2 +-
 server/app/web/templates/swagger.html               | 2 +-
 server/app/web/webapp.py                            | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/configuration/webpack/webpack.config.prod.js b/client/configuration/webpack/webpack.config.prod.js
index 6cffc8b4..6620962c 100644
--- a/client/configuration/webpack/webpack.config.prod.js
+++ b/client/configuration/webpack/webpack.config.prod.js
@@ -10,7 +10,7 @@ const nodeModules = path.resolve("node_modules");
 
 const babelOptions = require("../babel/babel.prod");
 
-const publicPath = "/";
+const publicPath = "";
 
 module.exports = {
   mode: "production",
diff --git a/client/index_template.html b/client/index_template.html
index eec21352..fb28018f 100644
--- a/client/index_template.html
+++ b/client/index_template.html
@@ -24,7 +24,7 @@
 <script type="text/javascript">
 window.CELLXGENE = {};
 window.CELLXGENE.API = {
-  prefix: "{{ prefix | safe }}",
+  prefix: window.location.href + "api/",
   version: "v0.2/"
 };
 </script>
diff --git a/server/app/web/templates/swagger.html b/server/app/web/templates/swagger.html
index 3df0df1b..115c7eb8 100644
--- a/server/app/web/templates/swagger.html
+++ b/server/app/web/templates/swagger.html
@@ -73,7 +73,7 @@
 <script>
 	window.onload = function () {
 		const ui = SwaggerUIBundle({
-			url: window.location.origin + "/api/swagger.json",
+			url: window.location.href.replace(/\/swagger$/, "") + "/api/swagger.json",
 			dom_id: '#swagger-ui',
 			deepLinking: true,
 			presets: [
diff --git a/server/app/web/webapp.py b/server/app/web/webapp.py
index 4d0249ca..04e1d19b 100644
--- a/server/app/web/webapp.py
+++ b/server/app/web/webapp.py
@@ -1,5 +1,5 @@
 import os
-from flask import Blueprint, render_template, send_from_directory, current_app, request
+from flask import Blueprint, render_template, send_from_directory, current_app
 
 
 bp = Blueprint("webapp", __name__, template_folder="templates")
@@ -7,9 +7,8 @@ bp = Blueprint("webapp", __name__, template_folder="templates")
 
 @bp.route("/")
 def index():
-    url_base = request.url_root + "api/"
     dataset_title = current_app.config["DATASET_TITLE"]
-    return render_template("index.html", prefix=url_base, datasetTitle=dataset_title)
+    return render_template("index.html", datasetTitle=dataset_title)
 
 
 # renders swagger documentation