Update Django allauth to 0.57.0 (#11134)

* Update Django allauth to 0.57.0

* Use latest version of 0.57.x

readthedocs/oauth/services/base.py

@@ -73,7 +73,7 @@ def provider_id(self):
 
     @property
     def provider_name(self):
-        return registry.by_id(self.provider_id).name
+        return registry.get_class(self.provider_id).name
 
     def get_session(self):
         if self.session is None:

readthedocs/oauth/tasks.py

@@ -206,7 +206,7 @@ def attach_webhook(project_pk, user_pk, integration=None):
             )
             return None
 
-    provider = allauth_registry.by_id(service.adapter.provider_id)
+    provider_class = allauth_registry.get_class(service.adapter.provider_id)
 
     user_accounts = service.for_user(user)
     for account in user_accounts:
@@ -226,7 +226,7 @@ def attach_webhook(project_pk, user_pk, integration=None):
             dismissable=True,
             attached_to=project,
             format_values={
-                "provider_name": provider.name,
+                "provider_name": provider_class.name,
                 "url_docs_webhook": "https://docs.readthedocs.io/page/webhooks.html",
             },
         )
@@ -236,7 +236,7 @@ def attach_webhook(project_pk, user_pk, integration=None):
             dismissable=True,
             attached_to=project,
             format_values={
-                "provider_name": provider.name,
+                "provider_name": provider_class.name,
                 "url_connect_account": reverse(
                     "projects_integrations",
                     args=[project.slug],

readthedocs/projects/models.py

@@ -1069,8 +1069,8 @@ def git_provider_name(self):
         """Get the provider name for project. e.g: GitHub, GitLab, Bitbucket."""
         service = self.git_service_class()
         if service:
-            provider = allauth_registry.by_id(service.adapter.provider_id)
-            return provider.name
+            provider_class = allauth_registry.get_class(service.adapter.provider_id)
+            return provider_class.name
         return None
 
     def find(self, filename, version):

readthedocs/rtd_tests/tests/test_oauth_sync.py

@@ -1,6 +1,6 @@
 import django_dynamic_fixture as fixture
 import requests_mock
-from allauth.socialaccount.models import SocialAccount, SocialToken
+from allauth.socialaccount.models import SocialAccount, SocialApp, SocialToken
 from allauth.socialaccount.providers.github.views import GitHubOAuth2Adapter
 from django.contrib.auth.models import User
 from django.test import TestCase
@@ -61,13 +61,18 @@ class GitHubOAuthSyncTests(TestCase):
 
     def setUp(self):
         self.user = fixture.get(User)
+        self.socialapp = fixture.get(
+            SocialApp,
+            provider=GitHubOAuth2Adapter.provider_id,
+        )
         self.socialaccount = fixture.get(
             SocialAccount,
             user=self.user,
             provider=GitHubOAuth2Adapter.provider_id,
         )
         self.token = fixture.get(
             SocialToken,
+            app=self.socialapp,
             account=self.socialaccount,
         )
         self.service = GitHubService.for_user(self.user)[0]
@@ -288,6 +293,7 @@ def test_sync_repositories_only_creates_one_remote_repo_per_vcs_repo(
         )
         fixture.get(
             SocialToken,
+            app=self.socialapp,
             account=user_2_socialaccount,
         )
 

readthedocs/settings/base.py

@@ -314,6 +314,7 @@ def MIDDLEWARE(self):
             'django.middleware.clickjacking.XFrameOptionsMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',
             'django.contrib.messages.middleware.MessageMiddleware',
+            "allauth.account.middleware.AccountMiddleware",
             'dj_pagination.middleware.PaginationMiddleware',
             'csp.middleware.CSPMiddleware',
             'readthedocs.core.middleware.ReferrerPolicyMiddleware',

requirements/deploy.txt

@@ -117,7 +117,7 @@ django==4.2.10
     #   django-timezone-field
     #   djangorestframework
     #   jsonfield
-django-allauth==0.51.0
+django-allauth==0.57.2
     # via -r requirements/pip.txt
 django-annoying==0.10.6
     # via -r requirements/pip.txt

requirements/docker.txt

@@ -128,7 +128,7 @@ django==4.2.10
     #   django-timezone-field
     #   djangorestframework
     #   jsonfield
-django-allauth==0.51.0
+django-allauth==0.57.2
     # via -r requirements/pip.txt
 django-annoying==0.10.6
     # via -r requirements/pip.txt

requirements/pip.in

@@ -82,10 +82,9 @@ django-celery-beat
 # TODO: remove this dependency once we upgrade Celery. It should auto-install it.
 tzdata
 
-# 0.52.0 requires creating a new email template:
-#  templates/account/email/acccount_already_exists_message.html
-# See https://github.com/readthedocs/readthedocs.org/pull/9853#discussion_r1060496492
-django-allauth==0.51.0
+# 0.58.0 refactored the built-in templates,
+# we need to check if we need to update our custom templates.
+django-allauth==0.57.2
 
 requests-oauthlib
 

requirements/pip.txt

@@ -80,7 +80,7 @@ django==4.2.10
     #   django-timezone-field
     #   djangorestframework
     #   jsonfield
-django-allauth==0.51.0
+django-allauth==0.57.2
     # via -r requirements/pip.in
 django-annoying==0.10.6
     # via -r requirements/pip.in

requirements/testing.txt

@@ -118,7 +118,7 @@ django==4.2.10
     #   django-timezone-field
     #   djangorestframework
     #   jsonfield
-django-allauth==0.51.0
+django-allauth==0.57.2
     # via -r requirements/pip.txt
 django-annoying==0.10.6
     # via -r requirements/pip.txt