Merge pull request #241 from CanDIG/develop

remove js-accessible token (#240)
CanDIG · Jan 23, 2020 · 3377e77 · 3377e77
2 parents 3076c35 + a21491c
commit 3377e77
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/candig/server/frontend.py b/candig/server/frontend.py
@@ -312,7 +312,6 @@ def render_candig_template(template_path, **kwargs):
 
     return flask.render_template(
         template_path,
-        session_id=session_id,
         prepend_path=app.config.get('TYK_LISTEN_PATH', ''),
         username=session_user,
         **kwargs

diff --git a/candig/server/static/dist/global.js b/candig/server/static/dist/global.js
diff --git a/candig/server/static/src/global.js b/candig/server/static/src/global.js
@@ -40,7 +40,6 @@ function makeRequest(path, body) {
             xhr.open('POST', prepend_path + path, true);
             xhr.setRequestHeader('Content-Type', 'application/json');
             xhr.setRequestHeader('Accept', 'application/json');
-            xhr.setRequestHeader('Authorization', 'Bearer ' + session_id);
             xhr.onload = function() {
                 if (xhr.status == 200) {
 

diff --git a/candig/server/templates/base.html b/candig/server/templates/base.html
@@ -75,9 +75,7 @@
       let datasetId;
       let finalDatasetName = [];
       let finalDatasetId = [];
-      const session_id = '{{ session_id }}';
       const prepend_path = '{{prepend_path}}';
-      const logout_url = '{{ logout_url }}';
     </script>
     <script src="{{prepend_path}}/static/dist/global.js"></script>
   {% endblock %}

diff --git a/candig/server/templates/swagger.html b/candig/server/templates/swagger.html
@@ -53,12 +53,7 @@
         plugins: [
           SwaggerUIBundle.plugins.DownloadUrl
         ],
-        layout: "StandaloneLayout",
-
-        requestInterceptor: (req) => {
-          req.headers.Authorization = "Bearer " + "{{ session_id }}"
-          return req
-        }
+        layout: "StandaloneLayout"
       })
       window.ui = ui
     }

diff --git a/docs/conf.py b/docs/conf.py
@@ -79,9 +79,9 @@ def __getattr__(cls, name):
 # built documents.
 #
 # The short X.Y version.
-version = "1.1.0"  # candig.server.__version__.split("+")[0]
+version = "1.2.0"  # candig.server.__version__.split("+")[0]
 # The full version, including alpha/beta/rc tags.
-release = "1.1.0"  # candig.server.__version__
+release = "1.2.0"  # candig.server.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/status.rst b/docs/status.rst
@@ -11,6 +11,11 @@ notes.
 Release Notes
 +++++++++++++
 
+*****
+1.2.0
+*****
+https://github.com/CanDIG/candig-server/releases/tag/v1.2.0
+
 *****
 1.1.0
 *****