Merge branch 'issue-1305-json-auth-endpoint' of github.com:jhnbyrn/django-oauth-toolkit into issue-1305-json-auth-endpoint

Author: jhnbyrn

oauth2_provider/urls.py

@@ -8,8 +8,7 @@
 
 base_urlpatterns = [
     re_path(r"^authorize/$", views.AuthorizationView.as_view(), name="authorize"),
-    re_path(r"authorize.json/$", views.AuthorizationJSONView.as_view(),
-            name="authorize-json"),
+    re_path(r"authorize.json/$", views.AuthorizationJSONView.as_view(), name="authorize-json"),
     re_path(r"^token/$", views.TokenView.as_view(), name="token"),
     re_path(r"^revoke_token/$", views.RevokeTokenView.as_view(), name="revoke-token"),
     re_path(r"^introspect/$", views.IntrospectTokenView.as_view(), name="introspect"),

oauth2_provider/views/base.py

@@ -4,6 +4,11 @@
 
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.views import redirect_to_login
+from django.core.serializers.json import DjangoJSONEncoder
+from django.db.models import Model
+
+# JB
+from django.forms import model_to_dict
 from django.http import HttpResponse
 from django.shortcuts import resolve_url
 from django.utils import timezone
@@ -12,11 +17,6 @@
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.generic import FormView, View
 
-# JB
-from django.forms import model_to_dict
-from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import Model
-
 from ..exceptions import OAuthToolkitError
 from ..forms import AllowForm
 from ..http import OAuth2ResponseRedirect
@@ -70,6 +70,7 @@ def redirect(self, redirect_to, application):
 
 RFC3339 = "%Y-%m-%dT%H:%M:%SZ"
 
+
 class AuthorizationMixin:
     def get_context(self, request, *args, **kwargs):
         try:
@@ -145,12 +146,11 @@ def get_context(self, request, *args, **kwargs):
             return self.error_response(error, application)
         return kwargs
 
+
 class AuthorizationJSONView(BaseAuthorizationView, AuthorizationMixin):
     def get(self, request, *args, **kwargs):
         context = self.get_context(request, *args, **kwargs)
-        return HttpResponse(
-            content=json.dumps(context, cls=self.ExtendedEncoder),
-            status=200)
+        return HttpResponse(content=json.dumps(context, cls=self.ExtendedEncoder), status=200)
 
     def post(self, request, *args, **kwargs):
         body = request.POST
@@ -183,14 +183,15 @@ def post(self, request, *args, **kwargs):
         self.success_url = uri
         log.debug("Success url for the request: {0}".format(self.success_url))
         return self.redirect(self.success_url, application)
-    
+
     class ExtendedEncoder(DjangoJSONEncoder):
         def default(self, o):
             if isinstance(o, Model):
                 return model_to_dict(o)
             else:
                 return super().default(o)
 
+
 class AuthorizationView(BaseAuthorizationView, FormView, AuthorizationMixin):
     """
     Implements an endpoint to handle *Authorization Requests* as in :rfc:`4.1.1` and prompting the