fix(socialaccount): Fetch settings from main provider

pennersr · Sep 22, 2023 · be779df · be779df
1 parent 24049ad
commit be779df
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/allauth/socialaccount/models.py b/allauth/socialaccount/models.py
@@ -283,8 +283,9 @@ def lookup(self):
         points, if any.
         """
         if not self._lookup_by_socialaccount():
+            provider_id = self.account.get_provider().id
             if app_settings.EMAIL_AUTHENTICATION or app_settings.PROVIDERS.get(
-                self.account.provider, {}
+                provider_id, {}
             ).get("EMAIL_AUTHENTICATION", False):
                 self._lookup_by_email()
 

diff --git a/allauth/socialaccount/tests/test_login.py b/allauth/socialaccount/tests/test_login.py
@@ -1,3 +1,4 @@
+import copy
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
@@ -37,14 +38,19 @@ def test_email_authentication(
     if setting == "on-global":
         settings.SOCIALACCOUNT_EMAIL_AUTHENTICATION = True
     elif setting == "on-provider":
-        settings.SOCIALACCOUNT_PROVIDERS["google"] = {"EMAIL_AUTHENTICATION": True}
+        settings.SOCIALACCOUNT_PROVIDERS = copy.deepcopy(
+            settings.SOCIALACCOUNT_PROVIDERS
+        )
+        settings.SOCIALACCOUNT_PROVIDERS["openid_connect"][
+            "EMAIL_AUTHENTICATION"
+        ] = True
     else:
         settings.SOCIALACCOUNT_EMAIL_AUTHENTICATION = False
     settings.SOCIALACCOUNT_EMAIL_AUTHENTICATION_AUTO_CONNECT = auto_connect
 
     user = user_factory()
 
-    sociallogin = sociallogin_factory(email=user.email, provider="google")
+    sociallogin = sociallogin_factory(email=user.email, provider="unittest-server")
 
     request = rf.get("/")
     SessionMiddleware(lambda request: None).process_request(request)