From 5764a1da39f973dd50f2914761cb41191f04bd66 Mon Sep 17 00:00:00 2001 From: adam-zakrzewski <37142469+adam-zakrzewski@users.noreply.github.com> Date: Thu, 8 Mar 2018 14:34:42 +0000 Subject: [PATCH 1/4] Update requirements.txt --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 79f2764..5ce6576 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,8 @@ # # pip-compile --output-file requirements.txt requirements.in # -django==1.11.5 +django==2.0.2 djangorestframework-jwt==1.11.0 -djangorestframework==3.6.4 +djangorestframework==3.7.7 pyjwt==1.5.3 # via djangorestframework-jwt -pytz==2017.2 # via django +pytz==2018.3             # via django From 3d16c511f79ca9fdd6bd43430482a2a88de65d6e Mon Sep 17 00:00:00 2001 From: adam-zakrzewski <37142469+adam-zakrzewski@users.noreply.github.com> Date: Thu, 8 Mar 2018 14:35:43 +0000 Subject: [PATCH 2/4] Update requirements.in --- requirements.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 0727dcb..5e206e9 100644 --- a/requirements.in +++ b/requirements.in @@ -1,3 +1,3 @@ -django>=1.10,<1.12 -djangorestframework>=3.6,<4.0 +django>=2.0.2,<2.0.3 +djangorestframework>=3.7.7,<4.0 djangorestframework-jwt>=1.11,<2 From 65e6f9f981f4674d45feb6b90ce53709feb24980 Mon Sep 17 00:00:00 2001 From: adam-zakrzewski <37142469+adam-zakrzewski@users.noreply.github.com> Date: Thu, 8 Mar 2018 14:39:03 +0000 Subject: [PATCH 3/4] Update api_endpoint.py --- rest_jwt_permission/providers/api_endpoint.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_jwt_permission/providers/api_endpoint.py b/rest_jwt_permission/providers/api_endpoint.py index 0a0ca9a..4016d49 100644 --- a/rest_jwt_permission/providers/api_endpoint.py +++ b/rest_jwt_permission/providers/api_endpoint.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from django.utils.lru_cache import lru_cache -from rest_framework.schemas import EndpointInspector +from rest_framework.schemas.generators import EndpointEnumerator from rest_jwt_permission.utils import get_role_for, get_view_role @@ -12,7 +12,7 @@ class APIEndpointScopeProvider(ScopeProviderBase): def get_available_scopes(self): from rest_jwt_permission.scopes import APIScope - epi = EndpointInspector() + epi = EndpointEnumerator() scopes = [] for (path, method, callback) in epi.get_api_endpoints(): From 385dda3163fef741c89cf379d85d5a0d548e4b7b Mon Sep 17 00:00:00 2001 From: Christian Hess Date: Thu, 8 Mar 2018 12:54:22 -0300 Subject: [PATCH 4/4] Fix unit tests --- requirements.txt | 2 +- .../providers/test_api_endpoint_provider.py | 1 - rest_jwt_permission_tests/test_handlers.py | 2 +- rest_jwt_permission_tests/test_permissions.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5ce6576..4c6b1a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,4 @@ django==2.0.2 djangorestframework-jwt==1.11.0 djangorestframework==3.7.7 pyjwt==1.5.3 # via djangorestframework-jwt -pytz==2018.3             # via django +pytz==2018.3 # via django diff --git a/rest_jwt_permission_tests/providers/test_api_endpoint_provider.py b/rest_jwt_permission_tests/providers/test_api_endpoint_provider.py index ace4ff1..97f1575 100644 --- a/rest_jwt_permission_tests/providers/test_api_endpoint_provider.py +++ b/rest_jwt_permission_tests/providers/test_api_endpoint_provider.py @@ -34,7 +34,6 @@ def test_api_endpoint_scope_permission_provider(): ): scopes = get_all_permission_providers_scopes() expected_identifiers = [ - 'apirootview:get', 'function_endpoint:get', 'function_endpoint:post', 'simplemodelviewset:list:get', diff --git a/rest_jwt_permission_tests/test_handlers.py b/rest_jwt_permission_tests/test_handlers.py index b28cc82..58857e0 100644 --- a/rest_jwt_permission_tests/test_handlers.py +++ b/rest_jwt_permission_tests/test_handlers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import jwt -from django.utils.text import force_text +from django.utils.encoding import force_text from rest_jwt_permission.handlers import get_jwt_payload_from_request, get_payload_from_scopes, get_scopes_from_payload from rest_jwt_permission.scopes import SimpleScope diff --git a/rest_jwt_permission_tests/test_permissions.py b/rest_jwt_permission_tests/test_permissions.py index d34341b..954302b 100644 --- a/rest_jwt_permission_tests/test_permissions.py +++ b/rest_jwt_permission_tests/test_permissions.py @@ -3,7 +3,7 @@ from django.conf.urls import include, url from django.contrib.auth import get_user_model from django.test.utils import override_settings -from django.utils.text import force_text +from django.utils.encoding import force_text from rest_framework import response, routers, serializers, status, views, viewsets from rest_framework.decorators import api_view, detail_route, list_route, permission_classes from rest_framework.test import APIClient