Merge branch 'master' into patch-1

Author: alexmclarty

AUTHORS

@@ -12,6 +12,7 @@ Alan Crosswell
 Aleksander Vaskevich
 Alessandro De Angelis
 Allisson Azevedo
+Andrew Chen Wang
 Anvesh Agarwal
 Aristóbulo Meneses
 Aryan Iyappan

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [unreleased]
 * Remove support for Django 3.0
 * Add support for Django 3.2
+*#989 Change any HttpResponse to JsonResponse if possible
 
 ### Added
 *#712, #636, #808. Calls to `django.contrib.auth.authenticate()` now pass a `request`

oauth2_provider/models.py

@@ -563,56 +563,56 @@ class Meta(AbstractIDToken.Meta):
 
 
 defget_application_model():
-"""Return the Application model that is active in this project."""
+"""Return the Application model that is active in this project."""
 returnapps.get_model(oauth2_settings.APPLICATION_MODEL)
 
 
 defget_grant_model():
-"""Return the Grant model that is active in this project."""
+"""Return the Grant model that is active in this project."""
 returnapps.get_model(oauth2_settings.GRANT_MODEL)
 
 
 defget_access_token_model():
-"""Return the AccessToken model that is active in this project."""
+"""Return the AccessToken model that is active in this project."""
 returnapps.get_model(oauth2_settings.ACCESS_TOKEN_MODEL)
 
 
 defget_id_token_model():
-"""Return the AccessToken model that is active in this project."""
+"""Return the AccessToken model that is active in this project."""
 returnapps.get_model(oauth2_settings.ID_TOKEN_MODEL)
 
 
 defget_refresh_token_model():
-"""Return the RefreshToken model that is active in this project."""
+"""Return the RefreshToken model that is active in this project."""
 returnapps.get_model(oauth2_settings.REFRESH_TOKEN_MODEL)
 
 
 defget_application_admin_class():
-"""Return the Application admin class that is active in this project."""
+"""Return the Application admin class that is active in this project."""
 application_admin_class=oauth2_settings.APPLICATION_ADMIN_CLASS
 returnapplication_admin_class
 
 
 defget_access_token_admin_class():
-"""Return the AccessToken admin class that is active in this project."""
+"""Return the AccessToken admin class that is active in this project."""
 access_token_admin_class=oauth2_settings.ACCESS_TOKEN_ADMIN_CLASS
 returnaccess_token_admin_class
 
 
 defget_grant_admin_class():
-"""Return the Grant admin class that is active in this project."""
+"""Return the Grant admin class that is active in this project."""
 grant_admin_class=oauth2_settings.GRANT_ADMIN_CLASS
 returngrant_admin_class
 
 
 defget_id_token_admin_class():
-"""Return the IDToken admin class that is active in this project."""
+"""Return the IDToken admin class that is active in this project."""
 id_token_admin_class=oauth2_settings.ID_TOKEN_ADMIN_CLASS
 returnid_token_admin_class
 
 
 defget_refresh_token_admin_class():
-"""Return the RefreshToken admin class that is active in this project."""
+"""Return the RefreshToken admin class that is active in this project."""
 refresh_token_admin_class=oauth2_settings.REFRESH_TOKEN_ADMIN_CLASS
 returnrefresh_token_admin_class
 

oauth2_provider/views/introspect.py

@@ -1,8 +1,7 @@
 importcalendar
-importjson
 
 fromdjango.core.exceptionsimportObjectDoesNotExist
-fromdjango.httpimportHttpResponse
+fromdjango.httpimportJsonResponse
 fromdjango.utils.decoratorsimportmethod_decorator
 fromdjango.views.decorators.csrfimportcsrf_exempt
 
@@ -29,9 +28,7 @@ def get_token_response(token_value=None):
 get_access_token_model().objects.select_related("user", "application").get(token=token_value)
  )
 exceptObjectDoesNotExist:
-returnHttpResponse(
-content=json.dumps({"active": False}), status=401, content_type="application/json"
- )
+returnJsonResponse({"active": False}, status=401)
 else:
 iftoken.is_valid():
 data={
@@ -43,17 +40,9 @@ def get_token_response(token_value=None):
 data["client_id"] =token.application.client_id
 iftoken.user:
 data["username"] =token.user.get_username()
-returnHttpResponse(content=json.dumps(data), status=200, content_type="application/json")
+returnJsonResponse(data)
 else:
-returnHttpResponse(
-content=json.dumps(
-{
-"active": False,
- }
- ),
-status=200,
-content_type="application/json",
- )
+returnJsonResponse({"active": False})
 
 defget(self, request, *args, **kwargs):
 """