read JWT_AUTH_HEADER_PREFIX in all functions

Mirantis · Nov 9, 2017 · 0ca4bdc · 0ca4bdc
1 parent 611cb9c
commit 0ca4bdc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/kqueen/blueprints/api/test_user.py b/kqueen/blueprints/api/test_user.py
@@ -1,9 +1,12 @@
 from .test_crud import BaseTestCRUD
 from flask import url_for
 from kqueen.conftest import user
+from kqueen.config import current_config
 
 import json
 
+config = current_config()
+
 
 class TestUserCRUD(BaseTestCRUD):
     def get_object(self):
@@ -37,7 +40,12 @@ def get_auth_headers(self):
             data=json.dumps(data),
             content_type='application/json')
 
-        return {'Authorization': 'JWT {}'.format(response.json['access_token'])}
+        print(config)
+
+        return {'Authorization': '{header_prefix} {token}'.format(
+            header_prefix=config.get('JWT_AUTH_HEADER_PREFIX'),
+            token=response.json['access_token'],
+        )}
 
     def test_whoami(self):
         url = url_for('api.user_whoami')

diff --git a/kqueen/conftest.py b/kqueen/conftest.py
@@ -5,13 +5,15 @@
 from kqueen.models import Provisioner
 from kqueen.models import User
 from kqueen.server import create_app
+from kqueen.config import current_config
 
 import json
 import pytest
 import uuid
 import yaml
 
 config_file = 'config/test.py'
+config = current_config()
 fake = Faker()
 
 
@@ -78,7 +80,10 @@ def auth_header(client):
         data=json.dumps(data),
         content_type='application/json')
 
-    return {'Authorization': 'Bearer {}'.format(response.json['access_token'])}
+    return {'Authorization': '{token_prefix} {token}'.format(
+        token_prefix=config.get('JWT_AUTH_HEADER_PREFIX'),
+        token=response.json['access_token'],
+    )}
 
 
 @pytest.fixture