Merge remote-tracking branch 'upstream/master' into honor-database-assigment-from-router

Author: shaleh

.github/workflows/lint.yaml

@@ -0,0 +1,21 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  ruff:
+    name: Ruff
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.10"
+    - name: Install Ruff
+      run: |
+        python -m pip install ruff>=0.6
+    - name: Lint using Ruff
+      run: |
+        ruff format --check
+        ruff check

.github/workflows/release.yml

@@ -16,19 +16,17 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 
       - name: Install dependencies
         run: |
-          python -m pip install -U pip
-          python -m pip install -U setuptools twine wheel
+          python -m pip install -U pip build twine
 
       - name: Build package
         run: |
-          python setup.py --version
-          python setup.py sdist --format=gztar bdist_wheel
+          python -m build
           twine check dist/*
 
       - name: Upload packages to Jazzband

.github/workflows/test.yml

@@ -10,46 +10,26 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-        - '3.8'
-        - '3.9'
         - '3.10'
         - '3.11'
         - '3.12'
         django-version:
-        - '3.2'
-        - '4.0'
-        - '4.1'
         - '4.2'
         - '5.0'
+        - '5.1'
         - 'main'
-        exclude:
+        include:
           # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
-
-          # < Python 3.10 is not supported by Django 5.0+
-          - python-version: '3.8'
-            django-version: '5.0'
-          - python-version: '3.9'
-            django-version: '5.0'
           - python-version: '3.8'
-            django-version: 'main'
+            django-version: '4.2'
           - python-version: '3.9'
-            django-version: 'main'
-
-          # Python 3.12 is not supported by Django < 5.0
-          - python-version: '3.12'
-            django-version: '3.2'
-          - python-version: '3.12'
-            django-version: '4.0'
-          - python-version: '3.12'
-            django-version: '4.1'
-          - python-version: '3.12'
             django-version: '4.2'
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -64,7 +44,7 @@ jobs:
       with:
         path: ${{ steps.pip-cache.outputs.dir }}
         key:
-          ${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/tox.ini') }}
+          ${{ matrix.python-version }}-v1-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/tox.ini') }}
         restore-keys: |
           ${{ matrix.python-version }}-v1-
 

.gitignore

@@ -30,6 +30,7 @@ pip-log.txt
 .coverage
 .tox
 .pytest_cache/
+.ruff_cache/
 nosetests.xml
 
 # Translations

.pre-commit-config.yaml

@@ -1,9 +1,10 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.6.0
     hooks:
-      - id: black
-        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
     hooks:
@@ -15,16 +16,6 @@ repos:
       - id: check-yaml
       - id: mixed-line-ending
         args: ['--fix=lf']
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
-    hooks:
-      - id: flake8
-        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
   - repo: https://github.com/sphinx-contrib/sphinx-lint
     rev: v0.9.1
     hooks:

AUTHORS

@@ -51,6 +51,7 @@ Dylan Tack
 Eduardo Oliveira
 Egor Poderiagin
 Emanuele Palazzetti
+Fazeel Ghafoor
 Federico Dolce
 Florian Demmer
 Frederico Vieira
@@ -104,6 +105,7 @@ Sandro Rodrigues
 Sean 'Shaleh' Perry
 Shaheed Haque
 Shaun Stanworth
+Sayyid Hamid Mahdavi
 Silvano Cerza
 Sora Yanai
 Sören Wegener

CHANGELOG.md

@@ -16,14 +16,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 ### Added
+* Add migration to include `token_checksum` field in AbstractAccessToken model.
+* Added compatibility with `LoginRequiredMiddleware` introduced in Django 5.1
 * #1404 Add a new setting `REFRESH_TOKEN_REUSE_PROTECTION`
 ### Changed
+* Update token to TextField from CharField with 255 character limit and SHA-256 checksum in AbstractAccessToken model. Removing the 255 character limit enables supporting JWT tokens with additional claims
+* Update middleware, validators, and views to use token checksums instead of token for token retrieval and validation.
+* #1446 use generic models pk instead of id.
 * Transactions wrapping writes of the Tokens now rely on Django's database routers to determine the correct
   database to use instead of assuming that 'default' is the correct one.
 
 ### Deprecated
 ### Removed
 * #1425 Remove deprecated `RedirectURIValidator`, `WildcardSet` per #1345; `validate_logout_request` per #1274
+* Remove support for Django versions below 4.2
 
 ### Fixed
 * #1443 Query strings with invalid hex values now raise a SuspiciousOperation exception (in DRF extension) instead of raising a 500 ValueError: Invalid hex encoding in query string.

README.rst

@@ -44,7 +44,7 @@ Requirements
 ------------
 
 * Python 3.8+
-* Django 3.2, 4.0 (4.0.1+ due to a regression), 4.1, 4.2, or 5.0
+* Django 4.2, 5.0 or 5.1
 * oauthlib 3.1+
 
 Installation

docs/contributing.rst

@@ -27,29 +27,26 @@ add a comment stating you're working on it.
 Code Style
 ==========
 
-The project uses `flake8 <https://flake8.pycqa.org/en/latest/>`_ for linting,
-`black <https://black.readthedocs.io/en/stable/>`_ for formatting the code,
-`isort <https://pycqa.github.io/isort/>`_ for formatting and sorting imports,
-and `pre-commit <https://pre-commit.com/>`_ for checking/fixing commits for
-correctness before they are made.
+The project uses `ruff <https://docs.astral.sh/ruff/>`_ for linting, formatting the code and sorting imports,
+and `pre-commit <https://pre-commit.com/>`_ for checking/fixing commits for correctness before they are made.
 
 You will need to install ``pre-commit`` yourself, and then ``pre-commit`` will
-take care of installing ``flake8``, ``black`` and ``isort``.
+take care of installing ``ruff``.
 
 After cloning your repository, go into it and run::
 
     pre-commit install
 
 to install the hooks. On the next commit that you make, ``pre-commit`` will
 download and install the necessary hooks (a one off task). If anything in the
-commit would fail the hooks, the commit will be abandoned. For ``black`` and
-``isort``, any necessary changes will be made automatically, but not staged.
+commit would fail the hooks, the commit will be abandoned. For ``ruff``, any
+necessary changes will be made automatically, but not staged.
 Review the changes, and then re-stage and commit again.
 
 Using ``pre-commit`` ensures that code that would fail in QA does not make it
 into a commit in the first place, and will save you time in the long run. You
 can also (largely) stop worrying about code style, although you should always
-check how the code looks after ``black`` has formatted it, and think if there
+check how the code looks after ``ruff`` has formatted it, and think if there
 is a better way to structure the code so that it is more readable.
 
 Documentation
@@ -265,7 +262,7 @@ add a comment. If you think a function is not trivial, add a docstrings.
 
 To see if your code formatting will pass muster use::
 
-  tox -e flake8
+  tox -e lint
 
 The contents of this page are heavily based on the docs from `django-admin2 <https://github.com/twoscoops/django-admin2>`_
 

docs/index.rst

@@ -22,7 +22,7 @@ Requirements
 ------------
 
 * Python 3.8+
-* Django 3.2, 4.0 (4.0.1+ due to a regression), 4.1, 4.2, or 5.0
+* Django 4.2, 5.0 or 5.1
 * oauthlib 3.1+
 
 Index