Merge branch 'jazzband:master' into patch-1

lazToum · web-flow · commit 4f5f0ce02f07 · 2024-02-21T20:01:12.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/psf/black
- rev: 23.12.1
+ rev: 24.2.0
 hooks:
 - id: black
 exclude: ^(oauth2_provider/migrations/|tests/migrations/)
@@ -21,7 +21,7 @@ repos:
 - id: isort
 exclude: ^(oauth2_provider/migrations/|tests/migrations/)
 - repo: https://github.com/PyCQA/flake8
- rev: 6.1.0
+ rev: 7.0.0
 hooks:
 - id: flake8
 exclude: ^(oauth2_provider/migrations/|tests/migrations/)
diff --git a/docs/oidc.rst b/docs/oidc.rst
@@ -239,7 +239,7 @@ just return the same claims as the ID token.
 
 To configure all of these things we need to customize the
 ``OAUTH2_VALIDATOR_CLASS`` in ``django-oauth-toolkit``. Create a new file in
-our project, eg ``my_project/oauth_validator.py``::
+our project, eg ``my_project/oauth_validators.py``::
 
 from oauth2_provider.oauth2_validators import OAuth2Validator
 
diff --git a/docs/rfc.py b/docs/rfc.py
@@ -1,6 +1,7 @@
 """
 Custom Sphinx documentation module to link to parts of the OAuth2 RFC.
 """
+
 from docutils import nodes
 
 
diff --git a/oauth2_provider/views/generic.py b/oauth2_provider/views/generic.py
@@ -36,7 +36,6 @@ class ReadWriteScopedResourceView(ReadWriteScopedResourceMixin, ProtectedResourc
 
 
 class ClientProtectedResourceView(ClientProtectedResourceMixin, OAuthLibMixin, View):
-
 """View for protecting a resource with client-credentials method.
 This involves allowing access tokens, Basic Auth and plain credentials in request body.
 """
@@ -45,7 +44,6 @@ class ClientProtectedResourceView(ClientProtectedResourceMixin, OAuthLibMixin, V
 
 
 class ClientProtectedScopedResourceView(ScopedResourceMixin, ClientProtectedResourceView):
-
 """Impose scope restrictions if client protection fallsback to access token."""
 
 pass
diff --git a/oauth2_provider/views/mixins.py b/oauth2_provider/views/mixins.py
@@ -279,7 +279,6 @@ def get_scopes(self, *args, **kwargs):
 
 
 class ClientProtectedResourceMixin(OAuthLibMixin):
-
 """Mixin for protecting resources with client authentication as mentioned in rfc:`3.2.1`
 This involves authenticating with any of: HTTP Basic Auth, Client Credentials and
 Access token in that order. Breaks off after first validation.
diff --git a/tests/app/idp/idp/urls.py b/tests/app/idp/idp/urls.py
@@ -14,6 +14,7 @@
 1. Import the include() function: from django.urls import include, path
 2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
 """
+
 from django.contrib import admin
 from django.urls import include, path
 
diff --git a/tests/app/rp/package-lock.json b/tests/app/rp/package-lock.json
diff --git a/tests/app/rp/package.json b/tests/app/rp/package.json

-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 """
 Custom Sphinx documentation module to link to parts of the OAuth2 RFC.
 """
++
 fromdocutilsimportnodes