Add django 5.2 support [fixes #180] (#181)

st4lk · web-flow · commit 4de8aa378993 · 2025-05-31T01:20:48.000+03:00
* Add django 5.2 support
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.9'
         cache: pip
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,34 +11,16 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - '3.7'
-        - '3.8'
         - '3.9'
         - '3.10'
         - '3.11'
         - '3.12'
         django-version:
-        - '32'
-        - '41'
         - '42'
         - '50'
         exclude:
-          - python-version: '3.7'
-            django-version: '41'
-          - python-version: '3.7'
-            django-version: '42'
-          - python-version: '3.7'
-            django-version: '50'
-          - python-version: '3.8'
-            django-version: '50'
           - python-version: '3.9'
             django-version: '50'
-          - python-version: '3.11'
-            django-version: '32'
-          - python-version: '3.12'
-            django-version: '32'
-          - python-version: '3.12'
-            django-version: '41'
     env:
       PYTHON_VERSION: ${{ matrix.python-version }}
       DJANGO_VERSION: ${{ matrix.django-version }}
@@ -48,7 +30,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,4 @@ settings_local.py
 venv/
 .pyenv/
 lcov.info
+cert.*
diff --git a/Makefile b/Makefile
@@ -62,7 +62,7 @@ native-migrate: native-install-all
 	PYTHONPATH='.' python example_project/manage.py migrate
 
 native-run-example: native-migrate
-	PYTHONPATH='.' python example_project/manage.py runsslserver 0.0.0.0:$(PORT)
+	PYTHONPATH='.' python example_project/manage.py runserver_plus --cert-file cert.crt 0.0.0.0:$(PORT)
 
 native-clean:
 	find . -path ./venv -prune | grep -E "(__pycache__|\.pyc|\.pyo$$)" | xargs rm -rf
diff --git a/README.md b/README.md
@@ -14,11 +14,11 @@ OAuth signin with django rest framework.
 Requirements
 -----------
 
-- python (3.7, 3.8, 3.9, 3.10, 3.11, 3.12)
-- django (3.2, 4.1, 4.2, 5.0, 5.1)
+- python (3.9, 3.10, 3.11, 3.12)
+- django (4.2, 5.0, 5.1, 5.2)
 - djangorestframework (>=3.9, <4.0)
-- social-auth-core (>=4.3, <5.0)
-- social-auth-app-django (>=5.0, <6.0)
+- social-auth-core (>=4.6.1, <5.0)
+- social-auth-app-django (>=5.4.3, <6.0)
 - [optional] djangorestframework-simplejwt (>=5.0.0)
 - [optional] django-rest-knox (>=4.0.0, <5.0.0)
 
@@ -497,7 +497,7 @@ There is an [example project](https://github.com/st4lk/django-rest-social-auth/t
 
 - open [https://127.0.0.1:8000/](https://127.0.0.1:8000/) in your browser
 
-    Note: `runsslserver` is used instead of built-in `runserver` to serve the project with TLS (aka SSL) certificate.
+    Note: `runserver_plus` is used instead of built-in `runserver` to serve the project with TLS (aka SSL) certificate.
     HTTPS is required by some social providers (facebook), without it they won't work.
     The certificate will not be trusted by your system - that is expected.
     Just tell your browser to proceed with this untrusted certificate - it is acceptable for development purposes.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,17 @@
 rest_social_auth release notes
 ==============================
 
+v9.0.0
+------
+- Add support of Django 5.2
+- Drop support of Django 3.2, 4.1
+- Drop support of Python 3.7, 3.8
+- Updated minimal required social-auth versions:
+	* social-auth-core (>=4.6.1, <5.0)
+	* social-auth-app-django (>=5.4.3, <6.0)
+
+Issues: #180
+
 v8.4.0
 ------
 - Add support of Django 5.1
diff --git a/example_project/config/settings.py b/example_project/config/settings.py
@@ -43,8 +43,8 @@
     'rest_framework.authtoken',
     'social_django',
     'rest_social_auth',
-    'sslserver',  # some social providers require https
     'knox',  # For django-rest-knox
+    'django_extensions',  # some social providers require https
 
     'users',
 )
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-django>=3.2,<5.2
+django>=4.2
 djangorestframework<4.0
-social-auth-core>=4.3,<5.0
-social-auth-app-django>=5.0,<6.0
+social-auth-core>=4.6.1,<5.0
+social-auth-app-django>=5.4.3,<6.0
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,5 +1,8 @@
 pytest-django==4.5.2
-httpretty==1.1.4
 unittest2==1.1.0
-django-sslserver>=0.22
-flake8==4.0.0
+django-extensions==4.1
+flake8==7.2.0
+responses==0.25.7
+typing_extensions==4.13.2
+Werkzeug==3.1.3
+pyOpenSSL==25.1.0
diff --git a/rest_social_auth/__init__.py b/rest_social_auth/__init__.py
@@ -1,2 +1,2 @@
 __author__ = 'st4lk'
-__version__ = '8.4.0'
+__version__ = '9.0.0'
diff --git a/tests/base.py b/tests/base.py
@@ -1,6 +1,6 @@
 import json
 
-from httpretty import HTTPretty
+import responses
 from social_core.backends.utils import load_backends
 from social_core.tests.backends.test_facebook import FacebookOAuth2Test
 from social_core.tests.backends.test_twitter import TwitterOAuth1Test
@@ -19,14 +19,20 @@
 
 # don't run third party tests
 for attr in (attr for attr in dir(FacebookOAuth2Test) if attr.startswith('test_')):
-    delattr(FacebookOAuth2Test, attr)
+    try:
+        delattr(FacebookOAuth2Test, attr)
+    except AttributeError:
+        pass
 for attr in (attr for attr in dir(TwitterOAuth1Test) if attr.startswith('test_')):
-    delattr(TwitterOAuth1Test, attr)
+    try:
+        delattr(TwitterOAuth1Test, attr)
+    except AttributeError:
+        pass
 
 
 class RestSocialMixin:
     def setUp(self):
-        HTTPretty.enable(allow_net_connect=False)
+        responses.start()
         Backend = module_member(self.backend_path)
         self.strategy = views.load_strategy()
         self.backend = Backend(self.strategy, redirect_uri=self.complete_url)
@@ -50,9 +56,8 @@ def setUp(self):
         self.do_rest_login()
 
     def tearDown(self):
-
-        HTTPretty.disable()
-        HTTPretty.reset()
+        responses.stop()
+        responses.reset()
         self.backend = None
         self.strategy = None
         self.name = None
@@ -71,6 +76,22 @@ def do_rest_login(self):
         self.auth_handlers(start_url)
         self.pre_complete_callback(start_url)
 
+    def setup_api_mocks(self):
+        # Add missing mocks for access token and user data endpoints
+        responses.reset()
+        responses.add(
+            responses.GET,
+            self.backend.access_token_url(),
+            body=self.access_token_body,
+            status=self.access_token_status
+        )
+        responses.add(
+            responses.GET,
+            self.user_data_url,
+            body=self.user_data_body,
+            status=200
+        )
+
 
 class BaseTwitterApiTestCase(RestSocialMixin, TwitterOAuth1Test):
 
diff --git a/tests/test_session.py b/tests/test_session.py
@@ -7,7 +7,7 @@
 from django.test.utils import override_settings
 from rest_framework.test import APITestCase
 from rest_framework.permissions import DjangoModelPermissionsOrAnonReadOnly
-from httpretty import HTTPretty
+import responses
 from social_core.utils import parse_qs
 
 from .base import BaseFacebookAPITestCase, BaseTwitterApiTestCase
@@ -43,6 +43,7 @@ class TestSocialAuth2(APITestCase, BaseFacebookAPITestCase):
 
     @modify_settings(**session_modify_settings)
     def _check_login_social_session(self, url, data):
+        self.setup_api_mocks()
         resp = self.client.post(url, data)
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data['email'], self.email)
@@ -75,31 +76,34 @@ def test_unknown_provider_session(self):
         self.assertEqual(resp.status_code, 404)
 
     def test_login_social_http_origin(self):
+        self.setup_api_mocks()
         resp = self.client.post(
             reverse('login_social_session'),
             data={'provider': 'facebook', 'code': '3D52VoM1uiw94a1ETnGvYlCw'},
             HTTP_ORIGIN="http://frontend.com")
         self.assertEqual(resp.status_code, 200)
-        url_params = dict(parse_qsl(urlparse(HTTPretty.latest_requests[0].path).query))
+        url_params = dict(parse_qsl(urlparse(responses.calls[0].request.path_url).query))
         self.assertEqual(url_params['redirect_uri'], "http://frontend.com/")
 
     @override_settings(REST_SOCIAL_OAUTH_ABSOLUTE_REDIRECT_URI='http://myproject.com/')
     def test_login_absolute_redirect(self):
+        self.setup_api_mocks()
         resp = self.client.post(
             reverse('login_social_session'),
             data={'provider': 'facebook', 'code': '3D52VoM1uiw94a1ETnGvYlCw'})
         self.assertEqual(resp.status_code, 200)
-        url_params = dict(parse_qsl(urlparse(HTTPretty.latest_requests[0].path).query))
+        url_params = dict(parse_qsl(urlparse(responses.calls[0].request.path_url).query))
         self.assertEqual('http://myproject.com/', url_params['redirect_uri'])
 
     @override_settings(REST_SOCIAL_OAUTH_ABSOLUTE_REDIRECT_URI='http://myproject.com/')
     def test_login_manual_redirect(self):
+        self.setup_api_mocks()
         resp = self.client.post(
             reverse('login_social_session'),
             data={'provider': 'facebook', 'code': '3D52VoM1uiw94a1ETnGvYlCw',
                   'redirect_uri': 'http://manualdomain.com/'})
         self.assertEqual(resp.status_code, 200)
-        url_params = dict(parse_qsl(urlparse(HTTPretty.latest_requests[0].path).query))
+        url_params = dict(parse_qsl(urlparse(responses.calls[0].request.path_url).query))
         self.assertEqual('http://manualdomain.com/', url_params['redirect_uri'])
 
     @mock.patch('rest_framework.views.APIView.permission_classes')
diff --git a/tests/test_token.py b/tests/test_token.py
@@ -19,6 +19,20 @@
         'users',
     ],
     MIDDLEWARE=[],
+    SOCIAL_AUTH_PIPELINE=(
+        'users.social_pipeline.auto_logout',  # custom action
+        'social_core.pipeline.social_auth.social_details',
+        'social_core.pipeline.social_auth.social_uid',
+        'social_core.pipeline.social_auth.auth_allowed',
+        'users.social_pipeline.check_for_email',  # custom action
+        'social_core.pipeline.social_auth.social_user',
+        'social_core.pipeline.user.get_username',
+        'social_core.pipeline.user.create_user',
+        'social_core.pipeline.social_auth.associate_user',
+        'social_core.pipeline.social_auth.load_extra_data',
+        'social_core.pipeline.user.user_details',
+        'users.social_pipeline.save_avatar',  # custom action
+    ),
 )
 
 
@@ -42,6 +56,7 @@ def test_login_social_oauth1_token(self):
 class TestSocialAuth2Token(APITestCase, BaseFacebookAPITestCase):
 
     def _check_login_social_token_user(self, url, data):
+        self.setup_api_mocks()
         resp = self.client.post(url, data)
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data['email'], self.email)
@@ -51,6 +66,7 @@ def _check_login_social_token_user(self, url, data):
         self.assertEqual(token.user.email, self.email)
 
     def _check_login_social_token_only(self, url, data):
+        self.setup_api_mocks()
         resp = self.client.post(url, data)
         self.assertEqual(resp.status_code, 200)
         # check token exists
@@ -79,10 +95,15 @@ def test_login_social_token_only_provider_in_url(self):
             data={'code': '3D52VoM1uiw94a1ETnGvYlCw'})
 
     def test_user_login_with_no_email(self):
+        # Modify user data to have no email BEFORE setting up the test
         user_data_body = json.loads(self.user_data_body)
         user_data_body['email'] = ''
         self.user_data_body = json.dumps(user_data_body)
+
+        # Set up mocks and do the rest login
         self.do_rest_login()
+        self.setup_api_mocks()
+
         resp = self.client.post(
             reverse('login_social_token'),
             data={'provider': 'facebook', 'code': '3D52VoM1uiw94a1ETnGvYlCw'},
diff --git a/tox.ini b/tox.ini
@@ -1,36 +1,32 @@
 [tox]
 envlist=
-    py{37}-django{32}
-    py{38}-django{32, 41, 42}
-    py{39}-django{32, 41, 42}
-    py{310}-django{32, 41, 42, 50, 51}
-    py{311}-django{41, 42, 50, 51}
-    py{312}-django{42, 50, 51}
+    py{38}-django{42}
+    py{39}-django{42}
+    py{310}-django{42, 50, 51, 52}
+    py{311}-django{42, 50, 51, 52}
+    py{312}-django{42, 50, 51, 52}
 
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}/example_project
     LC_ALL = en_US.utf-8
 basepython =
-    py37: python3.7
-    py38: python3.8
     py39: python3.9
     py310: python3.10
     py311: python3.11
     py312: python3.12
 deps =
     djangorestframework<4.0
-    social-auth-core==4.3.0
-    social-auth-app-django==5.0.0
+    social-auth-core==4.6.1
+    social-auth-app-django==5.4.3
     djangorestframework-jwt
     djangorestframework_simplejwt
     django-rest-knox<5.0.0
     coverage
-    django32: Django>=3.2,<3.3
-    django41: Django>=4.1,<4.2
     django42: Django>=4.2,<4.3
     django50: Django>=5.0,<5.1
     django51: Django>=5.1,<5.2
+    django52: Django>=5.2,<5.3
     -rrequirements_test.txt
 commands =
     coverage run --source=rest_social_auth -m pytest {posargs}

-Original file line number
+Diff line change
 venv/
 .pyenv/
 lcov.info
 +cert.*
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@`
`43`	`43`	`'rest_framework.authtoken',`
`44`	`44`	`'social_django',`
`45`	`45`	`'rest_social_auth',`
`46`		`- 'sslserver', # some social providers require https`
`47`	`46`	`'knox', # For django-rest-knox`
	`47`	`+ 'django_extensions', # some social providers require https`
`48`	`48`
`49`	`49`	`'users',`
`50`	`50`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`__author__ = 'st4lk'`
`2`		`-__version__ = '8.4.0'`
	`2`	`+__version__ = '9.0.0'`