Merge pull request #28 from phovea/release-2.2.0

Release 2.2.0
phovea · Aug 27, 2019 · 28884cf · 28884cf
2 parents 230998c + ad08160
commit 28884cf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -26,6 +26,13 @@ Building
 npm run build
 ```
 
+Default users
+-------
+| Username | Password |
+|----------|----------|
+| admin    | `admin`  |
+| sam      | `sam`    |
+
 Add new users
 -------
 

diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
   "name": "phovea_security_flask",
   "description": "",
   "homepage": "https://phovea.caleydo.org",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "[email protected]",

diff --git a/phovea_security_flask/flask_login_impl.py b/phovea_security_flask/flask_login_impl.py
@@ -144,7 +144,7 @@ def _load_user_from_key(self, api_key):
 
   def _load_user_from_request(self, request):
     # first, try to login using the api_key url arg
-    api_key = request.args.get('api_key')
+    api_key = request.headers.get('api_key')
     if api_key:
       user = self._load_user_from_key(api_key)
       if user:

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 flask-login==0.4.0
-phovea-server>=2.1.0,<2.2.0
+phovea_server>=2.3.0,<2.4.0
diff --git a/setup.py b/setup.py
@@ -45,6 +45,7 @@ def to_version(v):
   url=pkg['homepage'],
   description=pkg['description'],
   long_description=read_it('README.md'),
+  long_description_content_type='text/markdown',
   keywords=pkg.get('keywords', ''),
   author=pkg['author']['name'],
   author_email=pkg['author']['email'],