From ae35d24d80957be159590f2e7b5a3a6c0616a4c7 Mon Sep 17 00:00:00 2001
From: Alok Saldanha <aloksaldanha@gmail.com>
Date: Mon, 5 Apr 2021 07:19:55 -0400
Subject: [PATCH] only set wsgi.url_scheme when EXTERNAL_PROTOCOL is set

---
 Changelog.md                 | 10 +++++++++-
 cellxgene_gateway/env.py     |  2 +-
 cellxgene_gateway/gateway.py |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4dcc660..ff37b2a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,14 @@
+# 0.3.0
+
+ * Added support for itemsource interface, allowing s3 hosting
+ * Removed support for http file uploads
+ * Only set wsgi.url_scheme when EXTERNAL_PROTOCOL is set (see issue #43) 
+ * Dropped flake8 due to conflicts with black
+ * Added code coverage metrics
+
 # 0.2.3
 
-* Added support for ProxyFix
+ * Added support for ProxyFix
 
 # 0.2.2
 
diff --git a/cellxgene_gateway/env.py b/cellxgene_gateway/env.py
index 078a295..5f98160 100644
--- a/cellxgene_gateway/env.py
+++ b/cellxgene_gateway/env.py
@@ -20,7 +20,7 @@ external_host = os.environ.get(
     os.environ.get("GATEWAY_HOST", f"localhost:{gateway_port}"),
 )
 external_protocol = os.environ.get(
-    "EXTERNAL_PROTOCOL", os.environ.get("GATEWAY_PROTOCOL", "http")
+    "EXTERNAL_PROTOCOL", os.environ.get("GATEWAY_PROTOCOL", None)
 )
 ip = os.environ.get("GATEWAY_IP")
 extra_scripts = os.environ.get("GATEWAY_EXTRA_SCRIPTS")
diff --git a/cellxgene_gateway/gateway.py b/cellxgene_gateway/gateway.py
index 07e4472..347f35e 100644
--- a/cellxgene_gateway/gateway.py
+++ b/cellxgene_gateway/gateway.py
@@ -46,7 +46,8 @@ default_item_source = None
 
 def _force_https(app):
     def wrapper(environ, start_response):
-        environ["wsgi.url_scheme"] = env.external_protocol
+        if env.external_protocol is not None:
+            environ["wsgi.url_scheme"] = env.external_protocol
         return app(environ, start_response)
 
     return wrapper