django-esi 5.3.0b1__py3-none-any.whl → 6.0.0__py3-none-any.whl

{django_esi-5.3.0b1.dist-info → django_esi-6.0.0.dist-info}/METADATA

@@ -1,22 +1,20 @@
 Metadata-Version: 2.1
 Name: django-esi
-Version: 5.3.0b1
+Version: 6.0.0
 Summary: Django app for accessing the EVE Swagger Interface (ESI).
 Author-email: Alliance Auth <adarnof@gmail.com>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
-Classifier: Framework :: Django :: 4.0
-Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.1
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -24,21 +22,30 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Dist: bravado>=10.6.0,<11.0
+Requires-Dist: bravado>=10.6,<11
+Requires-Dist: brotli
 Requires-Dist: celery>=4.0.2
-Requires-Dist: django>=2.2,<5.1
-Requires-Dist: jsonschema<4.0.0
-Requires-Dist: python-jose>=3.3.0
-Requires-Dist: requests>=2.26.0
-Requires-Dist: requests_oauthlib>=0.8.0
+Requires-Dist: django>=4.2,<5.2
+Requires-Dist: jsonschema<4
+Requires-Dist: python-jose>=3.3
+Requires-Dist: requests>=2.26
+Requires-Dist: requests-oauthlib>=0.8
 Requires-Dist: tqdm>=4.62.3
-Requires-Dist: brotli
-Requires-Dist: sphinx ; extra == "docs"
 Requires-Dist: myst-parser ; extra == "docs"
-Requires-Dist: sphinx_rtd_theme ; extra == "docs"
-Requires-Dist: sphinxcontrib-django2 ; extra == "docs"
+Requires-Dist: sphinx ; extra == "docs"
+Requires-Dist: sphinx-copybutton ; extra == "docs"
+Requires-Dist: sphinx-rtd-theme<3,>=2 ; extra == "docs"
+Requires-Dist: sphinx-tabs ; extra == "docs"
+Requires-Dist: sphinxcontrib-django ; extra == "docs"
+Requires-Dist: coverage ; extra == "test"
+Requires-Dist: factory-boy ; extra == "test"
+Requires-Dist: requests-mock ; extra == "test"
+Project-URL: Documentation, https://django-esi.readthedocs.io/en/latest/
 Project-URL: Homepage, https://gitlab.com/allianceauth/django-esi
+Project-URL: Source, https://gitlab.com/allianceauth/django-esi
+Project-URL: Tracker, https://gitlab.com/allianceauth/django-esi/-/issues
 Provides-Extra: docs
+Provides-Extra: test
 
 # django-esi
 

{django_esi-5.3.0b1.dist-info → django_esi-6.0.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-esi/__init__.py,sha256=e2a8pk9JZ2i5PGZ9dauTYBgJCKnI8w7ldFspjYDhS30,157
-esi/admin.py,sha256=vfpTW1WOLmAxQKAAW8d_Nrkn1MvVRO9raQrHGXpW2l4,1100
+esi/__init__.py,sha256=NtkIRztRvZcWgRF9JOeRXIdygDh6Yy5at20njzh1b5g,113
+esi/admin.py,sha256=Cr9cMMS9WA64-OqVcw-jpes1hTnMnqrhK9eyfz6QwC4,1111
 esi/app_settings.py,sha256=O8TkKonK2zdF7RjMem1vMhEMulAtjvksxKgchrI8jME,3783
 esi/apps.py,sha256=RXDeRh62DO8NcKEzpiQovOay9wmb7MoVyC1W-cc-Aqc,272
 esi/checks.py,sha256=o3ka-Ux3QqTaf0u-oFGCPxwuG7DNJ3XYXiC7_2rQ1Ic,1154
 esi/clients.py,sha256=gkkJVZ9xqcd0TOI-5VduqYLaave1LjI16ucckr3UX9o,21303
 esi/decorators.py,sha256=USqGaIrVoyMpKlUB_ddZPe7QK0fBrFqAnoZDj8MMlSI,8081
 esi/errors.py,sha256=KfFtgX8Mys4uMoQtco0n_pQeaM83yVrRSyW6StXuUjo,308
-esi/managers.py,sha256=VEob7SGDq1AMn8i8Rw5zLQrHSmi_rHN9KNHq2nA-mgo,11455
+esi/managers.py,sha256=0g3J2jgoX-BviisjDEEAypkTayVBY-G2I_ZuskTDUqg,11350
 esi/models.py,sha256=fJJu8rLDMGW3ChxwFAZtFBWKB7PgMuDBatTuT06gWiA,11412
 esi/tasks.py,sha256=6wOqlANbQ83uvOt0L4_QHaLz0YZe1jtrQyr7zmxKY6g,1516
-esi/urls.py,sha256=RV_ZirfB3oEElPGXfj33m6FqwVdFRADDW9bN1WwJU2E,161
+esi/urls.py,sha256=23dY6ciekJ5wfwzo5LzLp0LFvWudrEAGICpDrscTeD8,152
 esi/views.py,sha256=ytfCILjz1rzITGgAGPyCY9bkFpE3KUfnii2UpHu6Bmc,3916
 esi/locale/de/LC_MESSAGES/django.mo,sha256=9_Fc_R8oZpT_CojH8gBxdSqj2K84EMEMn4wkvmOr7Dg,820
 esi/locale/de/LC_MESSAGES/django.po,sha256=2NQVGYzLroHPPrWgmACSnb2d3nwlkMBLxA1uWU3K0FA,1503
@@ -61,7 +61,7 @@ esi/tests/test_checks.py,sha256=ntq2ijuJ-6pxGruNh21rM4GlXDLVm-o3sy8DrFbjwEM,1846
 esi/tests/test_clients.py,sha256=eaB0DniNrpaQiAQGokLMmcwWYq0H1iswz3fdKvuf3E4,36037
 esi/tests/test_decorators.py,sha256=I5MhcLKhN5xD4PxgEQqOWQ2kiXquDqQIEve9dbTOsho,15069
 esi/tests/test_management_command.py,sha256=mtxfBtG6CHP1bTy1tJEO-djX4SQwMT3T_mqGnUIM6qs,9863
-esi/tests/test_managers.py,sha256=V9KAnVnyXk2oHyy26aVm5FN5UTSG6Y63fU3FSGt7IHE,24548
+esi/tests/test_managers.py,sha256=CEpjXSXyVY6xxgrs0f9FnEh-KY9JPaKjKYiutXLLShE,24309
 esi/tests/test_models.py,sha256=lDj5IcYgXHeOFTHXTsWGg13CSooFaxD0c51kJn_ytAc,13748
 esi/tests/test_swagger.json,sha256=HOrPgbvwm5N521QNcE3baWcZJkSjmuN_VWrR06wEQoo,17241
 esi/tests/test_swagger_full.json,sha256=JCEAZNMFhkdZhquTx4lDhrqGgCrzzzlYU64HdbEv8E4,2548369
@@ -69,7 +69,7 @@ esi/tests/test_tasks.py,sha256=P3vtqSno92DywNYu38nIo-_UiSicRAbun1AAsav0EBo,2104
 esi/tests/test_templatetags.py,sha256=b68JWE3HvOlr2aUisJHsTsDS4e7IMjDeqTuzMqC7Re4,517
 esi/tests/test_views.py,sha256=Kj_f2yIpmPG0kx-lAX_sfkaHlIpgbkm02ieA1V3o-k4,13073
 esi/tests/threading_pilot.py,sha256=ax_dEdnTNibA-UQHqbZle_2dh_3jcHKRyrYSOKuE_6U,1931
-django_esi-5.3.0b1.dist-info/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-django_esi-5.3.0b1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-django_esi-5.3.0b1.dist-info/METADATA,sha256=jgQw9_H0egqTGExUm43ipgEKgVcv4w_tHt7e5zWvVY4,4275
-django_esi-5.3.0b1.dist-info/RECORD,,
+django_esi-6.0.0.dist-info/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+django_esi-6.0.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+django_esi-6.0.0.dist-info/METADATA,sha256=0WMNumAVhCwNIO4tWXLmV3RU6ovU1VHRKmbhTlfOGhk,4656
+django_esi-6.0.0.dist-info/RECORD,,

esi/__init__.py

@@ -1,6 +1,5 @@
 """Django app for accessing the EVE Swagger Interface (ESI)."""
 
-default_app_config = 'esi.apps.EsiConfig'
 
-__version__ = '5.3.0b1'
+__version__ = '6.0.0'
 __title__ = 'django-esi'

esi/admin.py

@@ -17,10 +17,12 @@ class TokenAdmin(admin.ModelAdmin):
         qs = super().get_queryset(request)
         return qs.select_related('user').prefetch_related('scopes')
 
+    @admin.display(
+        description='Scopes'
+    )
     def get_scopes(self, obj):
         return ", ".join([x.name for x in obj.scopes.all()])
 
-    get_scopes.short_description = 'Scopes'
 
     User = get_user_model()
     list_display = ('user', 'character_name', 'get_scopes')

esi/managers.py

@@ -1,18 +1,16 @@
-from datetime import timedelta
 import logging
-from typing import Union, Any
+from datetime import timedelta
+from typing import Any, Union
 
 import requests
-from requests_oauthlib import OAuth2Session
-
 from django.db import models
 from django.utils import timezone
-
-from .errors import TokenError, IncompleteResponseError
-from . import app_settings
-
 from jose import jwt
 from jose.exceptions import ExpiredSignatureError, JWTError
+from requests_oauthlib import OAuth2Session
+
+from . import app_settings
+from .errors import IncompleteResponseError, TokenError
 
 logger = logging.getLogger(__name__)
 
@@ -75,26 +73,12 @@ class TokenQueryset(models.QuerySet):
         Returns:
             All tokens which are still valid.
         """
-        expired = self.get_expired()
-        valid = list(
-            self.exclude(
-                pk__in=expired
-            ).values_list(
-                "pk",
-                flat=True
-            )
-        )
-        valid_expired = list(
-            expired.bulk_refresh(
-            ).values_list(
-                "pk",
-                flat=True
-            )
-        )
-        _qs = self.filter(
-            pk__in=(valid + valid_expired)
-        )
-        return _qs
+        expired_pks = set(self.get_expired().values_list("pk", flat=True))
+        fresh_pks = set(self.exclude(pk__in=expired_pks).values_list("pk", flat=True))
+        refreshed = self.filter(pk__in=expired_pks).bulk_refresh()
+        refreshed_pks = set(refreshed.values_list("pk", flat=True))
+        qs = self.filter(pk__in=fresh_pks | refreshed_pks)
+        return qs
 
     def require_scopes(self, scope_string: Union[str, list]) -> models.QuerySet:
         """Filter tokens which have at least a subset of given scopes.

esi/tests/test_managers.py

@@ -16,74 +16,49 @@ from .jwt_factory import generate_jwk, generate_token
 
 
 class TestProcessScopes(TestCase):
-
     def test_none(self):
-        self.assertSetEqual(
-            _process_scopes(None), set()
-        )
+        self.assertSetEqual(_process_scopes(None), set())
 
     def test_empty_list(self):
-        self.assertSetEqual(
-            _process_scopes([]), set()
-        )
+        self.assertSetEqual(_process_scopes([]), set())
 
     def test_single_string_1(self):
-        self.assertSetEqual(
-            _process_scopes(['one']),
-            {'one'}
-        )
+        self.assertSetEqual(_process_scopes(["one"]), {"one"})
 
     def test_single_string_2(self):
-        self.assertSetEqual(
-            _process_scopes(['one two three']),
-            {'one', 'two', 'three'}
-        )
+        self.assertSetEqual(_process_scopes(["one two three"]), {"one", "two", "three"})
 
     def test_list(self):
         self.assertSetEqual(
-            _process_scopes(['one', 'two', 'three']),
-            {'one', 'two', 'three'}
+            _process_scopes(["one", "two", "three"]), {"one", "two", "three"}
         )
 
     def test_tuple(self):
         self.assertSetEqual(
-            _process_scopes(('one', 'two', 'three')),
-            {'one', 'two', 'three'}
+            _process_scopes(("one", "two", "three")), {"one", "two", "three"}
         )
 
 
-class TestTokenQuerySet(TestCase):
-
-    def setUp(self):
+class TestTokenGetExpired(TestCase):
+    @patch("esi.models.app_settings.ESI_TOKEN_VALID_DURATION", 120)
+    def test_get_expired(self):
         self.user1 = User.objects.create_user(
-            'Bruce Wayne',
-            'abc@example.com',
-            'password'
+            "Bruce Wayne", "abc@example.com", "password"
         )
         self.user2 = User.objects.create_user(
-            'Peter Parker',
-            'abc@example.com',
-            'password'
+            "Peter Parker", "abc@example.com", "password"
         )
-        Token.objects.all().delete()
-
-    @patch('esi.models.app_settings.ESI_TOKEN_VALID_DURATION', 120)
-    def test_get_expired(self):
         _store_as_Token(
             _generate_token(
-                character_id=101,
-                character_name=self.user1.username,
-                scopes=['abc']
+                character_id=101, character_name=self.user1.username, scopes=["abc"]
             ),
-            self.user1
+            self.user1,
         )
         t2 = _store_as_Token(
             _generate_token(
-                character_id=102,
-                character_name=self.user2.username,
-                scopes=['xyz']
+                character_id=102, character_name=self.user2.username, scopes=["xyz"]
             ),
-            self.user2
+            self.user2,
         )
         self.assertEqual(list(Token.objects.get_queryset().get_expired()), [])
 
@@ -91,44 +66,46 @@ class TestTokenQuerySet(TestCase):
         t2.save()
         self.assertEqual(list(Token.objects.get_queryset().get_expired()), [t2])
 
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_ID', 'abc')
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_SECRET', 'xyz')
-    @patch('esi.models.Token.delete', autospec=True)
-    @patch('esi.models.Token.refresh', autospec=True)
-    @patch('esi.managers.requests.auth.HTTPBasicAuth', autospec=True)
-    @patch('esi.managers.OAuth2Session', autospec=True)
+
+@patch("esi.managers.app_settings.ESI_SSO_CLIENT_ID", "abc")
+@patch("esi.managers.app_settings.ESI_SSO_CLIENT_SECRET", "xyz")
+@patch("esi.models.Token.delete", autospec=True)
+@patch("esi.models.Token.refresh", autospec=True)
+@patch("esi.managers.requests.auth.HTTPBasicAuth", autospec=True)
+@patch("esi.managers.OAuth2Session", autospec=True)
+class TestTokenBulkRefresh(TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        super().setUpClass()
+        cls.user = User.objects.create_user(
+            "Bruce Wayne", "abc@example.com", "password"
+        )
+
     def test_bulk_refresh_normal(
         self,
         mock_OAuth2Session,
         mock_HTTPBasicAuth,
         mock_Token_refresh,
-        mock_Token_delete
+        mock_Token_delete,
     ):
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         t1 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['abc']
+                character_id=character_id, character_name=character_name, scopes=["abc"]
             ),
-            self.user1
+            self.user,
         )
         t2 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['xyz']
+                character_id=character_id, character_name=character_name, scopes=["xyz"]
             ),
-            self.user1
+            self.user,
         )
         incomplete_qs = Token.objects.get_queryset().bulk_refresh()
         self.assertEqual(mock_Token_refresh.call_count, 2)
         self.assertEqual(mock_Token_delete.call_count, 0)
-        self.assertSetEqual(
-            set(incomplete_qs),
-            {t1, t2}
-        )
+        self.assertSetEqual(set(incomplete_qs), {t1, t2})
 
         # Note
         # looks like a bug in bulk_refresh():
@@ -136,340 +113,337 @@ class TestTokenQuerySet(TestCase):
         # can not be null:
         #   self.filter(refresh_token__isnull=True).get_expired().delete()
 
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_ID', 'abc')
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_SECRET', 'xyz')
-    @patch('esi.models.Token.delete', autospec=True)
-    @patch('esi.models.Token.refresh', autospec=True)
-    @patch('esi.managers.requests.auth.HTTPBasicAuth', autospec=True)
-    @patch('esi.managers.OAuth2Session', autospec=True)
     def test_bulk_refresh_token_error(
         self,
         mock_OAuth2Session,
         mock_HTTPBasicAuth,
         mock_Token_refresh,
-        mock_Token_delete
+        mock_Token_delete,
     ):
         mock_Token_refresh.side_effect = TokenError
 
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         t1 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['abc']
+                character_id=character_id, character_name=character_name, scopes=["abc"]
             ),
-            self.user1
+            self.user,
         )
         t2 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['xyz']
+                character_id=character_id, character_name=character_name, scopes=["xyz"]
             ),
-            self.user1
+            self.user,
         )
         incomplete_qs = Token.objects.get_queryset().bulk_refresh()
         self.assertEqual(mock_Token_refresh.call_count, 2)
         self.assertEqual(mock_Token_delete.call_count, 2)
-        self.assertSetEqual(
-            set(incomplete_qs),
-            {t1, t2}
-        )
+        self.assertSetEqual(set(incomplete_qs), {t1, t2})
 
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_ID', 'abc')
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_SECRET', 'xyz')
-    @patch('esi.models.Token.delete', autospec=True)
-    @patch('esi.models.Token.refresh', autospec=True)
-    @patch('esi.managers.requests.auth.HTTPBasicAuth', autospec=True)
-    @patch('esi.managers.OAuth2Session', autospec=True)
     def test_bulk_refresh_incomplete_response_error(
         self,
         mock_OAuth2Session,
         mock_HTTPBasicAuth,
         mock_Token_refresh,
-        mock_Token_delete
+        mock_Token_delete,
     ):
         mock_Token_refresh.side_effect = IncompleteResponseError
 
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['abc']
+                character_id=character_id, character_name=character_name, scopes=["abc"]
             ),
-            self.user1
+            self.user,
         )
         _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['xyz']
+                character_id=character_id, character_name=character_name, scopes=["xyz"]
             ),
-            self.user1
+            self.user,
         )
         incomplete_qs = Token.objects.get_queryset().bulk_refresh()
         self.assertEqual(mock_Token_refresh.call_count, 2)
         self.assertEqual(mock_Token_delete.call_count, 0)
-        self.assertSetEqual(
-            set(incomplete_qs),
-            set()
+        self.assertSetEqual(set(incomplete_qs), set())
+
+
+@patch("esi.models.app_settings.ESI_TOKEN_VALID_DURATION", 120)
+@patch("esi.managers.TokenQueryset.bulk_refresh", autospec=True)
+class TestTokenRequireValid(TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        super().setUpClass()
+        cls.user = User.objects.create_user(
+            "Bruce Wayne", "abc@example.com", "password"
         )
 
-    @patch('esi.models.app_settings.ESI_TOKEN_VALID_DURATION', 120)
-    @patch('esi.managers.TokenQueryset.bulk_refresh', autospec=True)
-    def test_require_valid_none_expired(
-        self,
-        mock_bulk_refresh
-    ):
+    def test_require_valid_none_expired(self, mock_bulk_refresh):
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         t1 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['abc']
+                character_id=character_id, character_name=character_name, scopes=["abc"]
             ),
-            self.user1
+            self.user,
         )
         t2 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['xyz']
+                character_id=character_id, character_name=character_name, scopes=["xyz"]
             ),
-            self.user1
+            self.user,
         )
         mock_bulk_refresh.return_value = Token.objects.none()
 
-        self.assertSetEqual(
-            set(Token.objects.get_queryset().require_valid()),
-            {t1, t2}
-        )
+        self.assertSetEqual(set(Token.objects.get_queryset().require_valid()), {t1, t2})
 
-    @patch('esi.models.app_settings.ESI_TOKEN_VALID_DURATION', 120)
-    @patch('esi.managers.TokenQueryset.bulk_refresh', autospec=True)
-    def test_require_valid_some_expired(
-        self,
-        mock_bulk_refresh
-    ):
+    def test_require_valid_some_expired(self, mock_bulk_refresh):
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         t1 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['abc']
+                character_id=character_id, character_name=character_name, scopes=["abc"]
             ),
-            self.user1
+            self.user,
         )
         t2 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['xyz']
+                character_id=character_id, character_name=character_name, scopes=["xyz"]
             ),
-            self.user1
+            self.user,
         )
         t2.created -= timedelta(121)
         t2.save()
         mock_bulk_refresh.return_value = Token.objects.filter(pk__in=[t2.pk])
 
-        self.assertSetEqual(
-            set(Token.objects.get_queryset().require_valid()),
-            {t1, t2}
-        )
+        self.assertSetEqual(set(Token.objects.get_queryset().require_valid()), {t1, t2})
 
-    @patch('esi.models.app_settings.ESI_TOKEN_VALID_DURATION', 120)
-    @patch('esi.managers.TokenQueryset.bulk_refresh', autospec=True)
-    def test_require_valid_one_refresh_error(
-        self,
-        mock_bulk_refresh
-    ):
+    def test_require_valid_one_refresh_error(self, mock_bulk_refresh):
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         t1 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['abc']
+                character_id=character_id, character_name=character_name, scopes=["abc"]
             ),
-            self.user1
+            self.user,
         )
         t2 = _store_as_Token(
             _generate_token(
-                character_id=character_id,
-                character_name=character_name,
-                scopes=['xyz']
+                character_id=character_id, character_name=character_name, scopes=["xyz"]
             ),
-            self.user1
+            self.user,
         )
         t2.created -= timedelta(121)
         t2.save()
         mock_bulk_refresh.return_value = Token.objects.none()
 
-        self.assertSetEqual(
-            set(Token.objects.get_queryset().require_valid()),
-            {t1}
+        self.assertSetEqual(set(Token.objects.get_queryset().require_valid()), {t1})
+
+
+@patch("esi.models.app_settings.ESI_TOKEN_VALID_DURATION", 120)
+@patch("esi.models.Token.refresh", spec=True)
+class TestTokenBulkRefreshXRequireValid(TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        super().setUpClass()
+        cls.user = User.objects.create_user(
+            "Bruce Wayne", "abc@example.com", "password"
+        )
+
+    def test_require_valid_all_expired(self, mock_token_refresh):
+        """Test demonstrates the bug introduced with 5.3.0b1.
+
+        bulk_refresh() does not return the token after it has been refreshed.
+        Then also require_valid() does not return the refreshed token.
+        Apps calling require_valid() will then assume there is no valid token.
+        The previous tests did not catch this bug, because it they were testing
+        the methods one by one and mocking out responses from other methods.
+        """
+        def my_refresh(*args, **kwargs):
+            t.created = now()
+            t.save()
+
+        # given
+        mock_token_refresh.side_effect = my_refresh
+        character_id = 99
+        character_name = "Bruce Wayne"
+        t: Token = _store_as_Token(
+            _generate_token(
+                character_id=character_id, character_name=character_name, scopes=["abc"]
+            ),
+            self.user,
+        )
+        t.created -= timedelta(121)
+        t.save()
+
+        # when
+        qs = Token.objects.get_queryset().require_valid()
+
+        # then
+        expected = set(qs.values_list("pk", flat=True))
+        self.assertSetEqual(expected, {t.pk})
+
+
+class TestTokenRequireScopes(TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        super().setUpClass()
+        cls.user = User.objects.create_user(
+            "Bruce Wayne", "abc@example.com", "password"
         )
 
     def test_require_scopes_normal(self):
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         t1 = _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', 'xyz', '123']
+                scopes=["abc", "xyz", "123"],
             ),
-            self.user1
+            self.user,
         )
         t2 = _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', 'xyz']
+                scopes=["abc", "xyz"],
             ),
-            self.user1
+            self.user,
         )
         t3 = _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', '123']
+                scopes=["abc", "123"],
             ),
-            self.user1
+            self.user,
         )
         self.assertSetEqual(
-            set(Token.objects.get_queryset().require_scopes('abc')), {t1, t2, t3}
+            set(Token.objects.get_queryset().require_scopes("abc")), {t1, t2, t3}
         )
         self.assertSetEqual(
-            set(Token.objects.get_queryset().require_scopes('xyz')), {t1, t2}
+            set(Token.objects.get_queryset().require_scopes("xyz")), {t1, t2}
         )
         self.assertSetEqual(
-            set(Token.objects.get_queryset().require_scopes('123')), {t1, t3}
+            set(Token.objects.get_queryset().require_scopes("123")), {t1, t3}
         )
         self.assertSetEqual(
-            set(Token.objects.get_queryset().require_scopes('555')), set()
+            set(Token.objects.get_queryset().require_scopes("555")), set()
         )
         self.assertSetEqual(
-            set(Token.objects.get_queryset().require_scopes('abc xyz 123')), {t1}
+            set(Token.objects.get_queryset().require_scopes("abc xyz 123")), {t1}
         )
 
     def test_require_scopes_empty(self):
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', 'xyz', '123']
+                scopes=["abc", "xyz", "123"],
             ),
-            self.user1
+            self.user,
         )
         t2 = _store_as_Token(
-            _generate_token(
-                character_id=character_id,
-                character_name=character_name
-            ),
-            self.user1
+            _generate_token(character_id=character_id, character_name=character_name),
+            self.user,
         )
         t2.scopes.all().delete()
         _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', '123']
+                scopes=["abc", "123"],
             ),
-            self.user1
+            self.user,
         )
-        self.assertSetEqual(set(Token.objects.get_queryset().require_scopes('')), {t2})
+        self.assertSetEqual(set(Token.objects.get_queryset().require_scopes("")), {t2})
 
     def test_require_scopes_exact(self):
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', 'xyz', '123']
+                scopes=["abc", "xyz", "123"],
             ),
-            self.user1
+            self.user,
         )
         t2 = _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', 'xyz']
+                scopes=["abc", "xyz"],
             ),
-            self.user1
+            self.user,
         )
         t3 = _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', '123']
+                scopes=["abc", "123"],
             ),
-            self.user1
+            self.user,
         )
         t4 = _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', '123']
+                scopes=["abc", "123"],
             ),
-            self.user1
+            self.user,
         )
         self.assertSetEqual(
-            set(Token.objects.get_queryset().require_scopes_exact('abc')), set()
+            set(Token.objects.get_queryset().require_scopes_exact("abc")), set()
         )
         self.assertSetEqual(
-            set(Token.objects.get_queryset().require_scopes_exact('abc xyz')), {t2}
+            set(Token.objects.get_queryset().require_scopes_exact("abc xyz")), {t2}
         )
         self.assertSetEqual(
-            set(Token.objects.get_queryset().require_scopes_exact('abc 123')), {t3, t4}
+            set(Token.objects.get_queryset().require_scopes_exact("abc 123")), {t3, t4}
         )
 
     def test_require_scopes_exact_2(self):
         character_id = 99
-        character_name = 'Bruce Wayne'
+        character_name = "Bruce Wayne"
         _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', 'xyz', '123']
+                scopes=["abc", "xyz", "123"],
             ),
-            self.user1
+            self.user,
         )
         _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['abc', 'xyz']
+                scopes=["abc", "xyz"],
             ),
-            self.user1
+            self.user,
         )
         t3 = _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['xyz', '123']
+                scopes=["xyz", "123"],
             ),
-            self.user1
+            self.user,
         )
         t4 = _store_as_Token(
             _generate_token(
                 character_id=character_id,
                 character_name=character_name,
-                scopes=['xyz', '123']
+                scopes=["xyz", "123"],
             ),
-            self.user1
-        )
-        self.assertSetEqual(
-            set(Token.objects.get_queryset().equivalent_to(t3)), {t4}
+            self.user,
         )
+        self.assertSetEqual(set(Token.objects.get_queryset().equivalent_to(t3)), {t4})
 
 
 class TestTokenManager(TestCase):
@@ -478,173 +452,146 @@ class TestTokenManager(TestCase):
         self.factory = RequestFactory()
 
         self.user1 = User.objects.create_user(
-            'Bruce Wayne',
-            'abc@example.com',
-            'password'
-        )
-
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_ID', 'abc')
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_SECRET', 'xyz')
-    @patch('esi.managers.app_settings.ESI_SSO_CALLBACK_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_TOKEN_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_TOKEN_VERIFY_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_ALWAYS_CREATE_TOKEN', False)
-    @patch('esi.managers.TokenManager._decode_jwt')
-    @patch('esi.managers.OAuth2Session', autospec=True)
+            "Bruce Wayne", "abc@example.com", "password"
+        )
+
+    @patch("esi.managers.app_settings.ESI_SSO_CLIENT_ID", "abc")
+    @patch("esi.managers.app_settings.ESI_SSO_CLIENT_SECRET", "xyz")
+    @patch("esi.managers.app_settings.ESI_SSO_CALLBACK_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_TOKEN_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_TOKEN_VERIFY_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_ALWAYS_CREATE_TOKEN", False)
+    @patch("esi.managers.TokenManager._decode_jwt")
+    @patch("esi.managers.OAuth2Session", autospec=True)
     def test_create_from_code_single_scope(self, mock_OAuth2Session, mock_decode_jwt):
         """Normal case with refresh token"""
         mock_oauth = Mock()
-        mock_oauth.request.return_value.json.return_value = \
-            _generate_token(
-                99, 'Bruce Wayne', scopes='publicData'
-            )
+        mock_oauth.request.return_value.json.return_value = _generate_token(
+            99, "Bruce Wayne", scopes="publicData"
+        )
         mock_oauth.fetch_token.return_value = {
-            'access_token': 'access_token',
-            'refresh_token': 'refresh_token',
-            'token_type': 'Bearer',
-            'expires_in': 1200,
+            "access_token": "access_token",
+            "refresh_token": "refresh_token",
+            "token_type": "Bearer",
+            "expires_in": 1200,
         }
         mock_OAuth2Session.return_value = mock_oauth
-        mock_decode_jwt.return_value = \
-            _generate_token(
-                99, 'Bruce Wayne', scopes='publicData'
-            )
-        # create new token from code
-        token1 = Token.objects.create_from_code('abc123xyz')
-        self.assertEqual(
-            token1.character_id,
-            99
-        )
-        self.assertEqual(
-            token1.character_name,
-            'Bruce Wayne'
-        )
-        self.assertEqual(
-            token1.scopes.all().count(),
-            1
+        mock_decode_jwt.return_value = _generate_token(
+            99, "Bruce Wayne", scopes="publicData"
         )
+        # create new token from code
+        token1 = Token.objects.create_from_code("abc123xyz")
+        self.assertEqual(token1.character_id, 99)
+        self.assertEqual(token1.character_name, "Bruce Wayne")
+        self.assertEqual(token1.scopes.all().count(), 1)
         # should return existing token instead of creating a new one
         # since ESI_ALWAYS_CREATE_TOKEN is False
-        token2 = Token.objects.create_from_code('11abc123xyz')
+        token2 = Token.objects.create_from_code("11abc123xyz")
         self.assertEqual(token1, token2)
 
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_ID', 'abc')
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_SECRET', 'xyz')
-    @patch('esi.managers.app_settings.ESI_SSO_CALLBACK_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_TOKEN_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_TOKEN_VERIFY_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_ALWAYS_CREATE_TOKEN', False)
-    @patch('esi.managers.TokenManager._decode_jwt')
-    @patch('esi.managers.OAuth2Session', autospec=True)
+    @patch("esi.managers.app_settings.ESI_SSO_CLIENT_ID", "abc")
+    @patch("esi.managers.app_settings.ESI_SSO_CLIENT_SECRET", "xyz")
+    @patch("esi.managers.app_settings.ESI_SSO_CALLBACK_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_TOKEN_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_TOKEN_VERIFY_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_ALWAYS_CREATE_TOKEN", False)
+    @patch("esi.managers.TokenManager._decode_jwt")
+    @patch("esi.managers.OAuth2Session", autospec=True)
     def test_create_from_code_1(self, mock_OAuth2Session, mock_decode_jwt):
         """Normal case with refresh token"""
         mock_oauth = Mock()
-        mock_oauth.request.return_value.json.return_value = \
-            _generate_token(
-                99, 'Bruce Wayne', scopes=[
-                    'esi-calendar.read_calendar_events.v1',
-                    'esi-location.read_location.v1',
-                    'esi-location.read_ship_type.v1',
-                    'esi-unknown-scope'
-                ]
-            )
+        mock_oauth.request.return_value.json.return_value = _generate_token(
+            99,
+            "Bruce Wayne",
+            scopes=[
+                "esi-calendar.read_calendar_events.v1",
+                "esi-location.read_location.v1",
+                "esi-location.read_ship_type.v1",
+                "esi-unknown-scope",
+            ],
+        )
         mock_oauth.fetch_token.return_value = {
-            'access_token': 'access_token',
-            'refresh_token': 'refresh_token',
-            'token_type': 'Bearer',
-            'expires_in': 1200,
+            "access_token": "access_token",
+            "refresh_token": "refresh_token",
+            "token_type": "Bearer",
+            "expires_in": 1200,
         }
         mock_OAuth2Session.return_value = mock_oauth
-        mock_decode_jwt.return_value = \
-            _generate_token(
-                99, 'Bruce Wayne', scopes=[
-                    'esi-calendar.read_calendar_events.v1',
-                    'esi-location.read_location.v1',
-                    'esi-location.read_ship_type.v1',
-                    'esi-unknown-scope'
-                ]
-            )
-        # create new token from code
-        token1 = Token.objects.create_from_code('abc123xyz')
-        self.assertEqual(
-            token1.character_id,
-            99
-        )
-        self.assertEqual(
-            token1.character_name,
-            'Bruce Wayne'
-        )
-        self.assertEqual(
-            token1.scopes.all().count(),
-            4
+        mock_decode_jwt.return_value = _generate_token(
+            99,
+            "Bruce Wayne",
+            scopes=[
+                "esi-calendar.read_calendar_events.v1",
+                "esi-location.read_location.v1",
+                "esi-location.read_ship_type.v1",
+                "esi-unknown-scope",
+            ],
         )
+        # create new token from code
+        token1 = Token.objects.create_from_code("abc123xyz")
+        self.assertEqual(token1.character_id, 99)
+        self.assertEqual(token1.character_name, "Bruce Wayne")
+        self.assertEqual(token1.scopes.all().count(), 4)
 
         # should return existing token instead of creating a new one
         # since ESI_ALWAYS_CREATE_TOKEN is False
-        token2 = Token.objects.create_from_code('11abc123xyz')
+        token2 = Token.objects.create_from_code("11abc123xyz")
         self.assertEqual(token1, token2)
 
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_ID', 'abc')
-    @patch('esi.managers.app_settings.ESI_SSO_CLIENT_SECRET', 'xyz')
-    @patch('esi.managers.app_settings.ESI_SSO_CALLBACK_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_TOKEN_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_TOKEN_VERIFY_URL', 'localhost')
-    @patch('esi.managers.app_settings.ESI_ALWAYS_CREATE_TOKEN', False)
-    @patch('esi.managers.TokenManager._decode_jwt')
-    @patch('esi.managers.OAuth2Session', autospec=True)
+    @patch("esi.managers.app_settings.ESI_SSO_CLIENT_ID", "abc")
+    @patch("esi.managers.app_settings.ESI_SSO_CLIENT_SECRET", "xyz")
+    @patch("esi.managers.app_settings.ESI_SSO_CALLBACK_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_TOKEN_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_TOKEN_VERIFY_URL", "localhost")
+    @patch("esi.managers.app_settings.ESI_ALWAYS_CREATE_TOKEN", False)
+    @patch("esi.managers.TokenManager._decode_jwt")
+    @patch("esi.managers.OAuth2Session", autospec=True)
     def test_create_from_code_2(self, mock_OAuth2Session, mock_decode_jwt):
         """Special case w/o refresh token"""
         mock_oauth = Mock()
-        mock_oauth.request.return_value.json.return_value = \
-            _generate_token(
-                99, 'Bruce Wayne', scopes=[
-                    'esi-calendar.read_calendar_events.v1',
-                    'esi-location.read_location.v1',
-                    'esi-location.read_ship_type.v1',
-                    'esi-unknown-scope'
-                ]
-            )
+        mock_oauth.request.return_value.json.return_value = _generate_token(
+            99,
+            "Bruce Wayne",
+            scopes=[
+                "esi-calendar.read_calendar_events.v1",
+                "esi-location.read_location.v1",
+                "esi-location.read_ship_type.v1",
+                "esi-unknown-scope",
+            ],
+        )
         mock_oauth.fetch_token.return_value = {
-            'access_token': 'access_token',
-            'refresh_token': None,
-            'token_type': 'Bearer',
-            'expires_in': 1200,
+            "access_token": "access_token",
+            "refresh_token": None,
+            "token_type": "Bearer",
+            "expires_in": 1200,
         }
         mock_OAuth2Session.return_value = mock_oauth
-        mock_decode_jwt.return_value = \
-            _generate_token(
-                99, 'Bruce Wayne', scopes=[
-                    'esi-calendar.read_calendar_events.v1',
-                    'esi-location.read_location.v1',
-                    'esi-location.read_ship_type.v1',
-                    'esi-unknown-scope'
-                ]
-            )
-        # create new token from code
-        token1 = Token.objects.create_from_code('abc123xyz')
-        self.assertEqual(
-            token1.character_id,
-            99
-        )
-        self.assertEqual(
-            token1.character_name,
-            'Bruce Wayne'
-        )
-        self.assertEqual(
-            token1.scopes.all().count(),
-            4
+        mock_decode_jwt.return_value = _generate_token(
+            99,
+            "Bruce Wayne",
+            scopes=[
+                "esi-calendar.read_calendar_events.v1",
+                "esi-location.read_location.v1",
+                "esi-location.read_ship_type.v1",
+                "esi-unknown-scope",
+            ],
         )
+        # create new token from code
+        token1 = Token.objects.create_from_code("abc123xyz")
+        self.assertEqual(token1.character_id, 99)
+        self.assertEqual(token1.character_name, "Bruce Wayne")
+        self.assertEqual(token1.scopes.all().count(), 4)
 
         # should return existing token instead of creating a new one
         # since ESI_ALWAYS_CREATE_TOKEN is False
-        token2 = Token.objects.create_from_code('11abc123xyz')
+        token2 = Token.objects.create_from_code("11abc123xyz")
         self.assertEqual(token1, token2)
 
-    @patch('esi.managers.TokenManager.create_from_code', autospec=True)
+    @patch("esi.managers.TokenManager.create_from_code", autospec=True)
     def test_create_from_request(self, mock_create_from_code):
-        mock_create_from_code.return_value = 'we got you'
+        mock_create_from_code.return_value = "we got you"
 
-        request = self.factory.get('https://www.example.com?code=abc123')
+        request = self.factory.get("https://www.example.com?code=abc123")
         request.user = self.user1
 
         middleware = SessionMiddleware(HttpResponse)
@@ -652,8 +599,8 @@ class TestTokenManager(TestCase):
         request.session.save()
 
         x = Token.objects.create_from_request(request)
-        self.assertEqual(x, 'we got you')
-        self.assertEqual(mock_create_from_code.call_args[0][1], 'abc123')
+        self.assertEqual(x, "we got you")
+        self.assertEqual(mock_create_from_code.call_args[0][1], "abc123")
 
 
 @requests_mock.Mocker()

esi/urls.py

@@ -1,4 +1,4 @@
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -6,5 +6,5 @@ from . import views
 app_name = 'esi'
 
 urlpatterns = [
-    re_path(r'^callback/$', views.receive_callback, name='callback'),
+    path('callback/', views.receive_callback, name='callback'),
 ]