From 4748dee38cf104097b40ddaaf94acfb44c0756ad Mon Sep 17 00:00:00 2001
From: folt <foltfrend@list.ru>
Date: Fri, 11 Dec 2020 17:22:03 +0300
Subject: [PATCH 1/8] #898 Added the ability to customize classes for django
 admin

---
 AUTHORS                     |  1 +
 CHANGELOG.md                |  4 +++-
 docs/settings.rst           | 24 ++++++++++++++++++++
 oauth2_provider/admin.py    | 43 +++++++++++++++++++++++------------
 oauth2_provider/models.py   | 24 ++++++++++++++++++++
 oauth2_provider/settings.py | 28 ++++++++++++++---------
 tests/test_settings.py      | 45 +++++++++++++++++++++++++++++++++++++
 7 files changed, 143 insertions(+), 26 deletions(-)
 create mode 100644 tests/test_settings.py

diff --git a/AUTHORS b/AUTHORS
index 4f9cd850b..7e03b37ed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@ Contributors
 
 Abhishek Patel
 Alessandro De Angelis
+Aleksander Vaskevich
 Alan Crosswell
 Anvesh Agarwal
 Asif Saif Uddin
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b10ebfe30..1cb02280a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<!-- 
+<!--
 ## [unreleased]
 ### Added
 ### Changed
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+* #898 Added the ability to customize classes for django admin
+
 ### Added
 * #884 Added support for Python 3.9
 
diff --git a/docs/settings.rst b/docs/settings.rst
index eb7324672..911edb255 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -97,6 +97,30 @@ The import string of the class (model) representing your grants. Overwrite
 this value if you wrote your own implementation (subclass of
 ``oauth2_provider.models.Grant``).
 
+APPLICATION_ADMIN_CLASS
+~~~~~~~~~~~~~~~~~
+The import string of the class (model) representing your application admin class.
+Overwrite this value if you wrote your own implementation (subclass of
+``oauth2_provider.admin.ApplicationAdmin``).
+
+ACCESS_TOKEN_ADMIN_CLASS
+~~~~~~~~~~~~~~~~~
+The import string of the class (model) representing your access token admin class.
+Overwrite this value if you wrote your own implementation (subclass of
+``oauth2_provider.admin.AccessTokenAdmin``).
+
+GRANT_ADMIN_CLASS
+~~~~~~~~~~~~~~~~~
+The import string of the class (model) representing your grant admin class.
+Overwrite this value if you wrote your own implementation (subclass of
+``oauth2_provider.admin.GrantAdmin``).
+
+REFRESH_TOKEN_ADMIN_CLASS
+~~~~~~~~~~~~~~~~~
+The import string of the class (model) representing your refresh token admin class.
+Overwrite this value if you wrote your own implementation (subclass of
+``oauth2_provider.admin.RefreshTokenAdmin``).
+
 OAUTH2_SERVER_CLASS
 ~~~~~~~~~~~~~~~~~~~
 The import string for the ``server_class`` (or ``oauthlib.oauth2.Server`` subclass)
diff --git a/oauth2_provider/admin.py b/oauth2_provider/admin.py
index a2ec8501a..979a4c1f1 100644
--- a/oauth2_provider/admin.py
+++ b/oauth2_provider/admin.py
@@ -1,6 +1,16 @@
 from django.contrib import admin
 
-from .models import get_access_token_model, get_application_model, get_grant_model, get_refresh_token_model
+from .models import (
+    get_access_token_model,
+    get_application_model,
+    get_grant_model,
+    get_refresh_token_model,
+
+    get_application_admin_class,
+    get_access_token_admin_class,
+    get_grant_admin_class,
+    get_refresh_token_admin_class,
+)
 
 
 class ApplicationAdmin(admin.ModelAdmin):
@@ -13,27 +23,32 @@ class ApplicationAdmin(admin.ModelAdmin):
     raw_id_fields = ("user",)
 
 
-class GrantAdmin(admin.ModelAdmin):
-    list_display = ("code", "application", "user", "expires")
-    raw_id_fields = ("user",)
-
-
 class AccessTokenAdmin(admin.ModelAdmin):
     list_display = ("token", "user", "application", "expires")
     raw_id_fields = ("user", "source_refresh_token")
 
 
+class GrantAdmin(admin.ModelAdmin):
+    list_display = ("code", "application", "user", "expires")
+    raw_id_fields = ("user",)
+
+
 class RefreshTokenAdmin(admin.ModelAdmin):
     list_display = ("token", "user", "application")
     raw_id_fields = ("user", "access_token")
 
 
-Application = get_application_model()
-Grant = get_grant_model()
-AccessToken = get_access_token_model()
-RefreshToken = get_refresh_token_model()
+application_model = get_application_model()
+access_token_model = get_access_token_model()
+grant_model = get_grant_model()
+refresh_token_model = get_refresh_token_model()
+
+application_admin_class = get_application_admin_class()
+access_token_admin_class = get_access_token_admin_class()
+grant_admin_class = get_grant_admin_class()
+refresh_token_admin_class = get_refresh_token_admin_class()
 
-admin.site.register(Application, ApplicationAdmin)
-admin.site.register(Grant, GrantAdmin)
-admin.site.register(AccessToken, AccessTokenAdmin)
-admin.site.register(RefreshToken, RefreshTokenAdmin)
+admin.site.register(application_model, application_admin_class)
+admin.site.register(access_token_model, access_token_admin_class)
+admin.site.register(grant_model, grant_admin_class)
+admin.site.register(refresh_token_model, refresh_token_admin_class)
diff --git a/oauth2_provider/models.py b/oauth2_provider/models.py
index 77542d35f..23c16bdf6 100644
--- a/oauth2_provider/models.py
+++ b/oauth2_provider/models.py
@@ -453,6 +453,30 @@ def get_refresh_token_model():
     return apps.get_model(oauth2_settings.REFRESH_TOKEN_MODEL)
 
 
+def get_application_admin_class():
+    """ Return the Application admin class that is active in this project. """
+    application_admin_class = oauth2_settings.APPLICATION_ADMIN_CLASS
+    return application_admin_class
+
+
+def get_access_token_admin_class():
+    """ Return the AccessToken admin class that is active in this project. """
+    access_token_admin_class = oauth2_settings.ACCESS_TOKEN_ADMIN_CLASS
+    return access_token_admin_class
+
+
+def get_grant_admin_class():
+    """ Return the Grant admin class that is active in this project. """
+    grant_admin_class = oauth2_settings.GRANT_ADMIN_CLASS
+    return grant_admin_class
+
+
+def get_refresh_token_admin_class():
+    """ Return the RefreshToken admin class that is active in this project. """
+    refresh_token_admin_class = oauth2_settings.REFRESH_TOKEN_ADMIN_CLASS
+    return refresh_token_admin_class
+
+
 def clear_expired():
     now = timezone.now()
     refresh_expire_at = None
diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index 42c08b676..88e9dffe4 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -15,10 +15,10 @@
 OAuth2 Provider settings, checking for user settings first, then falling
 back to the defaults.
 """
-import importlib
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
+from django.utils.module_loading import import_string
 
 
 USER_SETTINGS = getattr(settings, "OAUTH2_PROVIDER", None)
@@ -53,6 +53,10 @@
     "ACCESS_TOKEN_MODEL": ACCESS_TOKEN_MODEL,
     "GRANT_MODEL": GRANT_MODEL,
     "REFRESH_TOKEN_MODEL": REFRESH_TOKEN_MODEL,
+    "APPLICATION_ADMIN_CLASS": "oauth2_provider.admin.ApplicationAdmin",
+    "ACCESS_TOKEN_ADMIN_CLASS": "oauth2_provider.admin.AccessTokenAdmin",
+    "GRANT_ADMIN_CLASS": "oauth2_provider.admin.GrantAdmin",
+    "REFRESH_TOKEN_ADMIN_CLASS": "oauth2_provider.admin.RefreshTokenAdmin",
     "REQUEST_APPROVAL_PROMPT": "force",
     "ALLOWED_REDIRECT_URI_SCHEMES": ["http", "https"],
     # Special settings that will be evaluated at runtime
@@ -88,6 +92,10 @@
     "OAUTH2_VALIDATOR_CLASS",
     "OAUTH2_BACKEND_CLASS",
     "SCOPES_BACKEND_CLASS",
+    "APPLICATION_ADMIN_CLASS",
+    "ACCESS_TOKEN_ADMIN_CLASS",
+    "GRANT_ADMIN_CLASS",
+    "REFRESH_TOKEN_ADMIN_CLASS"
 )
 
 
@@ -96,12 +104,13 @@ def perform_import(val, setting_name):
     If the given setting is a string import notation,
     then perform the necessary import or imports.
     """
-    if isinstance(val, (list, tuple)):
-        return [import_from_string(item, setting_name) for item in val]
-    elif "." in val:
+    if val is None:
+        return None
+    elif isinstance(val, str):
         return import_from_string(val, setting_name)
-    else:
-        raise ImproperlyConfigured("Bad value for %r: %r" % (setting_name, val))
+    elif isinstance(val, (list, tuple)):
+        return [import_from_string(item, setting_name) for item in val]
+    return val
 
 
 def import_from_string(val, setting_name):
@@ -109,12 +118,9 @@ def import_from_string(val, setting_name):
     Attempt to import a class from a string representation.
     """
     try:
-        parts = val.split(".")
-        module_path, class_name = ".".join(parts[:-1]), parts[-1]
-        module = importlib.import_module(module_path)
-        return getattr(module, class_name)
+        return import_string(val)
     except ImportError as e:
-        msg = "Could not import %r for setting %r. %s: %s." % (val, setting_name, e.__class__.__name__, e)
+        msg = "Could not import '%s' for API setting '%s'. %s: %s." % (val, setting_name, e.__class__.__name__, e)
         raise ImportError(msg)
 
 
diff --git a/tests/test_settings.py b/tests/test_settings.py
new file mode 100644
index 000000000..d98a3a564
--- /dev/null
+++ b/tests/test_settings.py
@@ -0,0 +1,45 @@
+from django.test import TestCase
+
+
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.admin import (
+    get_application_admin_class,
+    get_access_token_admin_class,
+    get_grant_admin_class,
+    get_refresh_token_admin_class,
+)
+
+
+class TestAdminClass(TestCase):
+
+    def test_get_application_admin_class(self):
+        """
+        Test for getting class for application admin.
+        """
+        application_admin_class = get_application_admin_class()
+        default_application_admin_class = oauth2_settings.APPLICATION_ADMIN_CLASS
+        assert application_admin_class == default_application_admin_class
+
+    def test_get_access_token_admin_class(self):
+        """
+        Test for getting class for access token admin.
+        """
+        access_token_admin_class = get_access_token_admin_class()
+        default_access_token_admin_class = oauth2_settings.ACCESS_TOKEN_ADMIN_CLASS
+        assert access_token_admin_class == default_access_token_admin_class
+
+    def test_get_grant_admin_class(self):
+        """
+        Test for getting class for grant admin.
+        """
+        grant_admin_class = get_grant_admin_class()
+        default_grant_admin_class = oauth2_settings.GRANT_ADMIN_CLASS
+        assert grant_admin_class, default_grant_admin_class
+
+    def test_get_refresh_token_admin_class(self):
+        """
+        Test for getting class for refresh token admin.
+        """
+        refresh_token_admin_class = get_refresh_token_admin_class()
+        default_refresh_token_admin_class = oauth2_settings.REFRESH_TOKEN_ADMIN_CLASS
+        assert refresh_token_admin_class == default_refresh_token_admin_class

From 521d053433bd8b9e9b1a09e1aa31650c9b84ace9 Mon Sep 17 00:00:00 2001
From: folt <foltfrend@list.ru>
Date: Fri, 11 Dec 2020 17:41:04 +0300
Subject: [PATCH 2/8] #898 fix line too long

---
 oauth2_provider/settings.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index 88e9dffe4..1a337a46b 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -120,7 +120,8 @@ def import_from_string(val, setting_name):
     try:
         return import_string(val)
     except ImportError as e:
-        msg = "Could not import '%s' for API setting '%s'. %s: %s." % (val, setting_name, e.__class__.__name__, e)
+        msg = "Could not import '%s' for API setting '%s'. %s: %s." % (
+            val, setting_name, e.__class__.__name__, e)
         raise ImportError(msg)
 
 

From 74782f7269a158cfd97c807e10ac175d73c9e4ca Mon Sep 17 00:00:00 2001
From: folt <foltfrend@list.ru>
Date: Fri, 11 Dec 2020 23:22:20 +0300
Subject: [PATCH 3/8] #898 fix flake8 style

---
 oauth2_provider/admin.py    | 7 +++----
 oauth2_provider/settings.py | 2 +-
 tests/test_settings.py      | 4 +---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/oauth2_provider/admin.py b/oauth2_provider/admin.py
index 979a4c1f1..6f011afd1 100644
--- a/oauth2_provider/admin.py
+++ b/oauth2_provider/admin.py
@@ -2,13 +2,12 @@
 
 from .models import (
     get_access_token_model,
+    get_access_token_admin_class,
     get_application_model,
-    get_grant_model,
-    get_refresh_token_model,
-
     get_application_admin_class,
-    get_access_token_admin_class,
+    get_grant_model,
     get_grant_admin_class,
+    get_refresh_token_model,
     get_refresh_token_admin_class,
 )
 
diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index 1a337a46b..f0d939340 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -95,7 +95,7 @@
     "APPLICATION_ADMIN_CLASS",
     "ACCESS_TOKEN_ADMIN_CLASS",
     "GRANT_ADMIN_CLASS",
-    "REFRESH_TOKEN_ADMIN_CLASS"
+    "REFRESH_TOKEN_ADMIN_CLASS",
 )
 
 
diff --git a/tests/test_settings.py b/tests/test_settings.py
index d98a3a564..b13a090a1 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,17 +1,15 @@
 from django.test import TestCase
 
-
 from oauth2_provider.settings import oauth2_settings
 from oauth2_provider.admin import (
-    get_application_admin_class,
     get_access_token_admin_class,
+    get_application_admin_class,
     get_grant_admin_class,
     get_refresh_token_admin_class,
 )
 
 
 class TestAdminClass(TestCase):
-
     def test_get_application_admin_class(self):
         """
         Test for getting class for application admin.

From b5d5250300b3941efcff584014fbc6b8529cfef4 Mon Sep 17 00:00:00 2001
From: folt <foltfrend@list.ru>
Date: Sat, 12 Dec 2020 00:08:49 +0300
Subject: [PATCH 4/8] #898 fix flake8 style

---
 oauth2_provider/admin.py    | 10 +++++-----
 oauth2_provider/settings.py |  3 +--
 tests/test_settings.py      |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/oauth2_provider/admin.py b/oauth2_provider/admin.py
index 6f011afd1..ed835cd16 100644
--- a/oauth2_provider/admin.py
+++ b/oauth2_provider/admin.py
@@ -1,14 +1,14 @@
 from django.contrib import admin
 
-from .models import (
-    get_access_token_model,
+from oauth2_provider.models import (
     get_access_token_admin_class,
-    get_application_model,
+    get_access_token_model,
     get_application_admin_class,
-    get_grant_model,
+    get_application_model,
     get_grant_admin_class,
-    get_refresh_token_model,
+    get_grant_model,
     get_refresh_token_admin_class,
+    get_refresh_token_model,
 )
 
 
diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index f0d939340..1a4b2755f 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -120,8 +120,7 @@ def import_from_string(val, setting_name):
     try:
         return import_string(val)
     except ImportError as e:
-        msg = "Could not import '%s' for API setting '%s'. %s: %s." % (
-            val, setting_name, e.__class__.__name__, e)
+        msg = f"Could not import {val} for API setting {setting_name}. {e.__class__.__name__}: {e}."
         raise ImportError(msg)
 
 
diff --git a/tests/test_settings.py b/tests/test_settings.py
index b13a090a1..e81292a4e 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,12 +1,12 @@
 from django.test import TestCase
 
-from oauth2_provider.settings import oauth2_settings
 from oauth2_provider.admin import (
     get_access_token_admin_class,
     get_application_admin_class,
     get_grant_admin_class,
     get_refresh_token_admin_class,
 )
+from oauth2_provider.settings import oauth2_settings
 
 
 class TestAdminClass(TestCase):

From d59b0c284e1760fff23db0209ce37be826c93499 Mon Sep 17 00:00:00 2001
From: folt <foltfrend@list.ru>
Date: Sat, 12 Dec 2020 00:28:53 +0300
Subject: [PATCH 5/8] #898 fix flake8 style

---
 oauth2_provider/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index 1a4b2755f..21733140d 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -120,7 +120,7 @@ def import_from_string(val, setting_name):
     try:
         return import_string(val)
     except ImportError as e:
-        msg = f"Could not import {val} for API setting {setting_name}. {e.__class__.__name__}: {e}."
+        msg = "Could not import %r for setting %r. %s: %s." % (val, setting_name, e.__class__.__name__, e)
         raise ImportError(msg)
 
 

From d9d43417fa9d807d6e17fdd53501cf836b84f951 Mon Sep 17 00:00:00 2001
From: folt <foltfrend@list.ru>
Date: Mon, 14 Dec 2020 14:09:15 +0300
Subject: [PATCH 6/8] #898 add test for import error

---
 oauth2_provider/settings.py | 10 +++++-----
 tests/test_settings.py      | 12 +++++++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index 21733140d..55d4b5856 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -134,13 +134,13 @@ class OAuth2ProviderSettings:
 
     def __init__(self, user_settings=None, defaults=None, import_strings=None, mandatory=None):
         self.user_settings = user_settings or {}
-        self.defaults = defaults or {}
-        self.import_strings = import_strings or ()
+        self.defaults = defaults or DEFAULTS
+        self.import_strings = import_strings or IMPORT_STRINGS
         self.mandatory = mandatory or ()
 
     def __getattr__(self, attr):
-        if attr not in self.defaults.keys():
-            raise AttributeError("Invalid OAuth2Provider setting: %r" % (attr))
+        if attr not in self.defaults:
+            raise AttributeError("Invalid OAuth2Provider setting: %s" % attr)
 
         try:
             # Check if present in user settings
@@ -177,7 +177,7 @@ def __getattr__(self, attr):
 
     def validate_setting(self, attr, val):
         if not val and attr in self.mandatory:
-            raise AttributeError("OAuth2Provider setting: %r is mandatory" % (attr))
+            raise AttributeError("OAuth2Provider setting: %s is mandatory" % attr)
 
     @property
     def server_kwargs(self):
diff --git a/tests/test_settings.py b/tests/test_settings.py
index e81292a4e..4f81ffafb 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -6,10 +6,20 @@
     get_grant_admin_class,
     get_refresh_token_admin_class,
 )
-from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.settings import oauth2_settings, OAuth2ProviderSettings
 
 
 class TestAdminClass(TestCase):
+    def test_import_error_message_maintained(self):
+        """
+        Make sure import errors are captured and raised sensibly.
+        """
+        settings = OAuth2ProviderSettings({
+            'CLIENT_ID_GENERATOR_CLASS': 'tests.invalid_module.InvalidClassName'
+        })
+        with self.assertRaises(ImportError):
+            settings.CLIENT_ID_GENERATOR_CLASS
+
     def test_get_application_admin_class(self):
         """
         Test for getting class for application admin.

From 494798953910dca26d5b5f05ad3958933a4b8d0a Mon Sep 17 00:00:00 2001
From: folt <foltfrend@list.ru>
Date: Mon, 14 Dec 2020 18:41:04 +0300
Subject: [PATCH 7/8] #898 add test custom admin class

---
 oauth2_provider/settings.py | 27 +++++++++++++++++++-
 tests/admin.py              | 25 +++++++++++++++++++
 tests/test_settings.py      | 49 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 tests/admin.py

diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index 55d4b5856..bad528e82 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -18,6 +18,7 @@
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
+from django.test.signals import setting_changed
 from django.utils.module_loading import import_string
 
 
@@ -133,10 +134,17 @@ class OAuth2ProviderSettings:
     """
 
     def __init__(self, user_settings=None, defaults=None, import_strings=None, mandatory=None):
-        self.user_settings = user_settings or {}
+        self._user_settings = user_settings or {}
         self.defaults = defaults or DEFAULTS
         self.import_strings = import_strings or IMPORT_STRINGS
         self.mandatory = mandatory or ()
+        self._cached_attrs = set()
+
+    @property
+    def user_settings(self):
+        if not hasattr(self, '_user_settings'):
+            self._user_settings = getattr(settings, 'OAUTH2_PROVIDER', {})
+        return self._user_settings
 
     def __getattr__(self, attr):
         if attr not in self.defaults:
@@ -172,6 +180,7 @@ def __getattr__(self, attr):
         self.validate_setting(attr, val)
 
         # Cache the result
+        self._cached_attrs.add(attr)
         setattr(self, attr, val)
         return val
 
@@ -205,5 +214,21 @@ def server_kwargs(self):
         kwargs.update(self.EXTRA_SERVER_KWARGS)
         return kwargs
 
+    def reload(self):
+        for attr in self._cached_attrs:
+            delattr(self, attr)
+        self._cached_attrs.clear()
+        if hasattr(self, "_user_settings"):
+            delattr(self, "_user_settings")
+
 
 oauth2_settings = OAuth2ProviderSettings(USER_SETTINGS, DEFAULTS, IMPORT_STRINGS, MANDATORY)
+
+
+def reload_oauth2_settings(*args, **kwargs):
+    setting = kwargs["setting"]
+    if setting == "OAUTH2_PROVIDER":
+        oauth2_settings.reload()
+
+
+setting_changed.connect(reload_oauth2_settings)
diff --git a/tests/admin.py b/tests/admin.py
new file mode 100644
index 000000000..01ff920d7
--- /dev/null
+++ b/tests/admin.py
@@ -0,0 +1,25 @@
+from django.contrib import admin
+
+
+class CustomApplicationAdmin(admin.ModelAdmin):
+    list_display = ("id",)
+
+
+class CustomAccessTokenAdmin(admin.ModelAdmin):
+    list_display = ("id",)
+
+
+class CustomGrantAdmin(admin.ModelAdmin):
+    list_display = ("id",)
+
+
+class CustomRefreshTokenAdmin(admin.ModelAdmin):
+    list_display = ("id",)
+
+
+__all__ = [
+    'CustomApplicationAdmin',
+    'CustomAccessTokenAdmin',
+    'CustomGrantAdmin',
+    'CustomRefreshTokenAdmin',
+]
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 4f81ffafb..649eba29a 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,4 +1,5 @@
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from oauth2_provider.admin import (
     get_access_token_admin_class,
@@ -7,6 +8,12 @@
     get_refresh_token_admin_class,
 )
 from oauth2_provider.settings import oauth2_settings, OAuth2ProviderSettings
+from tests.admin import (
+    CustomApplicationAdmin,
+    CustomAccessTokenAdmin,
+    CustomGrantAdmin,
+    CustomRefreshTokenAdmin,
+)
 
 
 class TestAdminClass(TestCase):
@@ -15,7 +22,7 @@ def test_import_error_message_maintained(self):
         Make sure import errors are captured and raised sensibly.
         """
         settings = OAuth2ProviderSettings({
-            'CLIENT_ID_GENERATOR_CLASS': 'tests.invalid_module.InvalidClassName'
+            "CLIENT_ID_GENERATOR_CLASS": "tests.invalid_module.InvalidClassName"
         })
         with self.assertRaises(ImportError):
             settings.CLIENT_ID_GENERATOR_CLASS
@@ -51,3 +58,43 @@ def test_get_refresh_token_admin_class(self):
         refresh_token_admin_class = get_refresh_token_admin_class()
         default_refresh_token_admin_class = oauth2_settings.REFRESH_TOKEN_ADMIN_CLASS
         assert refresh_token_admin_class == default_refresh_token_admin_class
+
+    @override_settings(OAUTH2_PROVIDER={
+        "APPLICATION_ADMIN_CLASS": "tests.admin.CustomApplicationAdmin"
+    })
+    def test_get_custom_application_admin_class(self):
+        """
+        Test for getting custom class for application admin.
+        """
+        application_admin_class = get_application_admin_class()
+        assert application_admin_class == CustomApplicationAdmin
+
+    @override_settings(OAUTH2_PROVIDER={
+        "ACCESS_TOKEN_ADMIN_CLASS": "tests.admin.CustomAccessTokenAdmin"
+    })
+    def test_get_custom_access_token_admin_class(self):
+        """
+        Test for getting custom class for access token admin.
+        """
+        access_token_admin_class = get_access_token_admin_class()
+        assert access_token_admin_class == CustomAccessTokenAdmin
+
+    @override_settings(OAUTH2_PROVIDER={
+        "GRANT_ADMIN_CLASS": "tests.admin.CustomGrantAdmin"
+    })
+    def test_get_custom_grant_admin_class(self):
+        """
+        Test for getting custom class for grant admin.
+        """
+        grant_admin_class = get_grant_admin_class()
+        assert grant_admin_class == CustomGrantAdmin
+
+    @override_settings(OAUTH2_PROVIDER={
+        "REFRESH_TOKEN_ADMIN_CLASS": "tests.admin.CustomRefreshTokenAdmin"
+    })
+    def test_get_custom_refresh_token_admin_class(self):
+        """
+        Test for getting custom class for refresh token admin.
+        """
+        refresh_token_admin_class = get_refresh_token_admin_class()
+        assert refresh_token_admin_class == CustomRefreshTokenAdmin

From abcad5ae2bb1bcec472e263c84a5e3d6cee3e91c Mon Sep 17 00:00:00 2001
From: folt <foltfrend@list.ru>
Date: Mon, 14 Dec 2020 20:50:27 +0300
Subject: [PATCH 8/8] #898 fix flake8 style

---
 oauth2_provider/settings.py |  4 ++--
 tests/admin.py              |  8 --------
 tests/test_settings.py      | 24 +++++++-----------------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index bad528e82..5d81a05ef 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -142,8 +142,8 @@ def __init__(self, user_settings=None, defaults=None, import_strings=None, manda
 
     @property
     def user_settings(self):
-        if not hasattr(self, '_user_settings'):
-            self._user_settings = getattr(settings, 'OAUTH2_PROVIDER', {})
+        if not hasattr(self, "_user_settings"):
+            self._user_settings = getattr(settings, "OAUTH2_PROVIDER", {})
         return self._user_settings
 
     def __getattr__(self, attr):
diff --git a/tests/admin.py b/tests/admin.py
index 01ff920d7..557434250 100644
--- a/tests/admin.py
+++ b/tests/admin.py
@@ -15,11 +15,3 @@ class CustomGrantAdmin(admin.ModelAdmin):
 
 class CustomRefreshTokenAdmin(admin.ModelAdmin):
     list_display = ("id",)
-
-
-__all__ = [
-    'CustomApplicationAdmin',
-    'CustomAccessTokenAdmin',
-    'CustomGrantAdmin',
-    'CustomRefreshTokenAdmin',
-]
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 649eba29a..379d12c2e 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -7,10 +7,10 @@
     get_grant_admin_class,
     get_refresh_token_admin_class,
 )
-from oauth2_provider.settings import oauth2_settings, OAuth2ProviderSettings
+from oauth2_provider.settings import OAuth2ProviderSettings, oauth2_settings
 from tests.admin import (
-    CustomApplicationAdmin,
     CustomAccessTokenAdmin,
+    CustomApplicationAdmin,
     CustomGrantAdmin,
     CustomRefreshTokenAdmin,
 )
@@ -21,9 +21,7 @@ def test_import_error_message_maintained(self):
         """
         Make sure import errors are captured and raised sensibly.
         """
-        settings = OAuth2ProviderSettings({
-            "CLIENT_ID_GENERATOR_CLASS": "tests.invalid_module.InvalidClassName"
-        })
+        settings = OAuth2ProviderSettings({"CLIENT_ID_GENERATOR_CLASS": "invalid_module.InvalidClassName"})
         with self.assertRaises(ImportError):
             settings.CLIENT_ID_GENERATOR_CLASS
 
@@ -59,9 +57,7 @@ def test_get_refresh_token_admin_class(self):
         default_refresh_token_admin_class = oauth2_settings.REFRESH_TOKEN_ADMIN_CLASS
         assert refresh_token_admin_class == default_refresh_token_admin_class
 
-    @override_settings(OAUTH2_PROVIDER={
-        "APPLICATION_ADMIN_CLASS": "tests.admin.CustomApplicationAdmin"
-    })
+    @override_settings(OAUTH2_PROVIDER={"APPLICATION_ADMIN_CLASS": "tests.admin.CustomApplicationAdmin"})
     def test_get_custom_application_admin_class(self):
         """
         Test for getting custom class for application admin.
@@ -69,9 +65,7 @@ def test_get_custom_application_admin_class(self):
         application_admin_class = get_application_admin_class()
         assert application_admin_class == CustomApplicationAdmin
 
-    @override_settings(OAUTH2_PROVIDER={
-        "ACCESS_TOKEN_ADMIN_CLASS": "tests.admin.CustomAccessTokenAdmin"
-    })
+    @override_settings(OAUTH2_PROVIDER={"ACCESS_TOKEN_ADMIN_CLASS": "tests.admin.CustomAccessTokenAdmin"})
     def test_get_custom_access_token_admin_class(self):
         """
         Test for getting custom class for access token admin.
@@ -79,9 +73,7 @@ def test_get_custom_access_token_admin_class(self):
         access_token_admin_class = get_access_token_admin_class()
         assert access_token_admin_class == CustomAccessTokenAdmin
 
-    @override_settings(OAUTH2_PROVIDER={
-        "GRANT_ADMIN_CLASS": "tests.admin.CustomGrantAdmin"
-    })
+    @override_settings(OAUTH2_PROVIDER={"GRANT_ADMIN_CLASS": "tests.admin.CustomGrantAdmin"})
     def test_get_custom_grant_admin_class(self):
         """
         Test for getting custom class for grant admin.
@@ -89,9 +81,7 @@ def test_get_custom_grant_admin_class(self):
         grant_admin_class = get_grant_admin_class()
         assert grant_admin_class == CustomGrantAdmin
 
-    @override_settings(OAUTH2_PROVIDER={
-        "REFRESH_TOKEN_ADMIN_CLASS": "tests.admin.CustomRefreshTokenAdmin"
-    })
+    @override_settings(OAUTH2_PROVIDER={"REFRESH_TOKEN_ADMIN_CLASS": "tests.admin.CustomRefreshTokenAdmin"})
     def test_get_custom_refresh_token_admin_class(self):
         """
         Test for getting custom class for refresh token admin.