Merge pull request #14 from 29next/787-theme-kit-oauth-tokens

PRIME #787 theme kit oauth tokens

Author: surasakp

ntk/gateway.py

@@ -11,7 +11,7 @@ def __init__(self, store, apikey):
     def _request(self, request_type, url, apikey=None, payload={}, files={}):
         headers = {}
         if apikey:
-            headers = {'Authorization': f'Token {apikey}'}
+            headers = {'Authorization': f'Bearer {apikey}'}
 
         return requests.request(request_type, url, headers=headers, data=payload, files=files)
 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 tests_require = [
     "flake8==3.9.2",

tests/test_gateway.py

@@ -29,7 +29,7 @@ def test_request(self, mock_request):
 
         expected_calls = [call(
             'POST', 'http://simple.com/api/admin/themes/5/templates/',
-            headers={'Authorization': 'Token apikey'},
+            headers={'Authorization': 'Bearer apikey'},
             data={'name': 'assets/base.html', 'content': '{% load i18n %}\n\n<div class="mt-2">My home page</div>'},
             files=files)
         ]
@@ -57,7 +57,7 @@ def test_get_themes(self, mock_request):
         self.gateway.get_themes()
 
         expected_call = call('GET', 'http://simple.com/api/admin/themes/',
-                             headers={'Authorization': 'Token apikey'}, data={}, files={})
+                             headers={'Authorization': 'Bearer apikey'}, data={}, files={})
         self.assertIn(expected_call, mock_request.mock_calls)
 
     ####
@@ -84,7 +84,7 @@ def test_create_theme(self, mock_request):
         self.gateway.create_theme(name="Test Init Theme")
 
         expected_call = call('POST', 'http://simple.com/api/admin/themes/',
-                             headers={'Authorization': 'Token apikey'}, data=payload, files={})
+                             headers={'Authorization': 'Bearer apikey'}, data=payload, files={})
         self.assertIn(expected_call, mock_request.mock_calls)
 
     #####
@@ -111,7 +111,7 @@ def test_get_templates(self, mock_request):
         self.gateway.get_templates(theme_id=6)
 
         expected_call = call('GET', 'http://simple.com/api/admin/themes/6/templates/',
-                             headers={'Authorization': 'Token apikey'}, data={}, files={})
+                             headers={'Authorization': 'Bearer apikey'}, data={}, files={})
         self.assertIn(expected_call, mock_request.mock_calls)
 
     #####
@@ -137,7 +137,7 @@ def test_get_template(self, mock_request):
         self.gateway.get_template(theme_id=6, template_name=template_name)
 
         expected_call = call('GET', f'http://simple.com/api/admin/themes/6/templates/?name={template_name}',
-                             headers={'Authorization': 'Token apikey'}, data={}, files={})
+                             headers={'Authorization': 'Bearer apikey'}, data={}, files={})
         self.assertIn(expected_call, mock_request.mock_calls)
 
     #####
@@ -168,7 +168,7 @@ def test_create_or_update_template(self, mock_request):
             theme_id=6, template_name=payload['name'], content=payload['content'], files=files)
 
         expected_call = call('POST', 'http://simple.com/api/admin/themes/6/templates/',
-                             headers={'Authorization': 'Token apikey'}, data=payload, files=files)
+                             headers={'Authorization': 'Bearer apikey'}, data=payload, files=files)
         self.assertIn(expected_call, mock_request.mock_calls)
 
     #####
@@ -196,5 +196,5 @@ def test_delete_template(self, mock_request):
         self.gateway.delete_template(theme_id=6, template_name='asset/custom.css')
 
         expected_call = call('DELETE', 'http://simple.com/api/admin/themes/6/templates/?name=asset/custom.css',
-                             headers={'Authorization': 'Token apikey'}, data={}, files={})
+                             headers={'Authorization': 'Bearer apikey'}, data={}, files={})
         self.assertIn(expected_call, mock_request.mock_calls)