Merge pull request #145 from CSCfi/dev

Dev

Author: teemukataja

beacon_api/conf/config.ini

@@ -7,7 +7,7 @@
 title=GA4GHBeacon at CSC
 
 # Version of the Beacon implementation
-version=1.6.0
+version=1.6.1
 
 # Author of this software
 author=CSC developers

beacon_api/utils/validate.py

@@ -3,7 +3,6 @@
 from aiohttp import web
 from authlib.jose import jwt
 from authlib.jose.errors import MissingClaimError, InvalidClaimError, ExpiredTokenError, InvalidTokenError
-import json
 import re
 import aiohttp
 import os
@@ -33,9 +32,8 @@ async def parse_request_object(request):
         items = {k: (int(v) if k in int_params else v) for k, v in request.rel_url.query.items()}
         if 'datasetIds' in items:
             items['datasetIds'] = request.rel_url.query.get('datasetIds').split(',')
-        obj = json.dumps(items)
         LOG.info('Parsed GET request parameters.')
-        return request.method, json.loads(obj)
+        return request.method, items
 
 
 # TO DO if required do not set default

deploy/test/auth_test.ini

@@ -7,7 +7,7 @@
 title=GA4GHBeacon at CSC
 
 # Version of the Beacon implementation
-version=1.6.0
+version=1.6.1
 
 # Author of this software
 author=CSC developers

deploy/test/mock_auth.py

@@ -118,8 +118,11 @@ def generate_token():
 
 async def jwk_response(request):
     """Mock JSON Web Key server."""
-    data = [DATA[0]]
-    data[0]['kid'] = 'rsa1'
+    keys = [DATA[0]]
+    keys[0]['kid'] = 'rsa1'
+    data = {
+        "keys": keys
+    }
     return web.json_response(data)
 
 

docs/conf.py

@@ -134,7 +134,7 @@ def __getattr__(cls, name):
 
 def setup(app):
     """Add custom stylesheet."""
-    app.add_stylesheet('custom.css')
+    app.add_css_file('custom.css')
 
 
 # -- Other stuff ----------------------------------------------------------

docs/example.rst

@@ -126,7 +126,7 @@ Example Response:
     "createdAt": "2019-09-04T12:00:00Z",
     "updatedAt": "2019-09-05T05:55:18Z",
     "environment": "prod",
-    "version": "1.6.0"
+    "version": "1.6.1"
   }
 
 Query Endpoint

docs/permissions.rst

@@ -65,7 +65,7 @@ The permissions are then passed in :meth:`beacon_api.utils.validate` as illustra
 .. literalinclude:: /../beacon_api/utils/validate.py
    :language: python
    :dedent: 16
-   :lines: 183-200
+   :lines: 180-197
 
 If there is no claim for GA4GH permissions as illustrated above, they will not be added to
 ``controlled_datasets``.

tests/test.ini

@@ -7,7 +7,7 @@
 title=GA4GHBeacon at CSC
 
 # Version of the Beacon implementation
-version=1.6.0
+version=1.6.1
 
 # Author of this software
 author=CSC developers