Merge pull request #20 from yunojuno/django2

Drop support for Python2 and Django < 1.10

Author: hugorodgerbrown

.travis.yml

@@ -1,7 +1,6 @@
 language:
   python
 python:
-  - "2.7"
   - "3.6"
 addons:
   postgresql: "9.4"

README.rst

@@ -11,6 +11,11 @@ Django app that uses JWT to manage one-time and expiring tokens to protect URLs.
 
 This app currently requires the use of PostgreSQL.
 
+Compatibility
+=============
+
+This library is now Python3 and Django1.11 and above only. If you are on Python2 then you will have to refer to the python2 branch.
+
 Background
 ==========
 

request_token/__init__.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 default_app_config = 'request_token.apps.RequestTokenAppConfig'

request_token/admin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import json
 
 from django.contrib import admin

request_token/apps.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.apps import AppConfig
 from django.core.exceptions import ImproperlyConfigured
 from django.template import loader, TemplateDoesNotExist

request_token/compat.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import functools
 import logging
 

request_token/decorators.py

@@ -1,4 +1,3 @@
-# -*- coding: utf8 -*-
 """
 Local exceptions related to tokens inherit from the PyJWT base
 InvalidTokenError.

request_token/exceptions.py

@@ -1,20 +1,18 @@
-# -*- coding: utf-8 -*-
 import logging
 
 from django.http import HttpResponseForbidden, HttpResponseNotAllowed
 from django.template import loader
 
 from jwt.exceptions import InvalidTokenError
 
-from .compat import MiddlewareMixin
 from .models import RequestToken
 from .settings import JWT_QUERYSTRING_ARG, FOUR03_TEMPLATE
 from .utils import decode
 
 logger = logging.getLogger(__name__)
 
 
-class RequestTokenMiddleware(MiddlewareMixin):
+class RequestTokenMiddleware:
 
     """
     Extract and verify request tokens from incoming GET requests.
@@ -24,7 +22,10 @@ class RequestTokenMiddleware(MiddlewareMixin):
 
     """
 
-    def process_request(self, request):
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
         """Verify JWT request querystring arg.
 
         If a token is found (using JWT_QUERYSTRING_ARG), then it is decoded,
@@ -54,7 +55,7 @@ def process_request(self, request):
         token = request.GET.get(JWT_QUERYSTRING_ARG)
 
         if token is None:
-            return
+            return self.get_response(request)
 
         if request.method != 'GET':
             return HttpResponseNotAllowed(['GET'])
@@ -72,6 +73,8 @@ def process_request(self, request):
             request.token = None
             logger.exception("RequestToken cannot be decoded: %s", token)
 
+        return self.get_response(request)
+
     def process_exception(self, request, exception):
         """Handle all InvalidTokenErrors."""
         if isinstance(exception, InvalidTokenError):

request_token/middleware.py

@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
                 ('issued_at', models.DateTimeField(help_text='Time the token was created, set in the initial save.', null=True, blank=True)),
                 ('max_uses', models.IntegerField(default=1, help_text='Cap on the number of times the token can be used, defaults to 1 (single use).')),
                 ('used_to_date', models.IntegerField(default=0, help_text='Denormalised count of the number times the token has been used.')),
-                ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text='Intended recipient of the JWT.', null=True)),
+                ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text='Intended recipient of the JWT.', null=True, on_delete=models.deletion.CASCADE)),
             ],
         ),
         migrations.CreateModel(
@@ -33,8 +33,8 @@ class Migration(migrations.Migration):
                 ('user_agent', models.TextField(help_text='User-agent of client used to make the request.', blank=True)),
                 ('client_ip', models.CharField(help_text='Client IP of device used to make the request.', max_length=15)),
                 ('timestamp', models.DateTimeField(help_text='Time the request was logged.')),
-                ('token', models.ForeignKey(help_text='The RequestToken that was used.', to='request_token.RequestToken')),
-                ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text='The user who made the request (None if anonymous).', null=True)),
+                ('token', models.ForeignKey(help_text='The RequestToken that was used.', to='request_token.RequestToken', on_delete=models.deletion.CASCADE)),
+                ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text='The user who made the request (None if anonymous).', null=True, on_delete=models.deletion.CASCADE)),
             ],
         ),
     ]