fix(socialaccount): Pass email to populate_user()

allauth/socialaccount/providers/base/provider.py

@@ -120,11 +120,13 @@ def sociallogin_from_response(self, request, response):
             provider=self.sub_id,
         )
         email_addresses = self.extract_email_addresses(response)
-        self.cleanup_email_addresses(
+        email = self.cleanup_email_addresses(
             common_fields.get("email"),
             email_addresses,
             email_verified=common_fields.get("email_verified"),
         )
+        if email:
+            common_fields["email"] = email
         sociallogin = SocialLogin(
             account=socialaccount, email_addresses=email_addresses
         )
@@ -165,7 +167,9 @@ def extract_common_fields(self, data):
         """
         return {}
 
-    def cleanup_email_addresses(self, email, addresses, email_verified=False):
+    def cleanup_email_addresses(
+        self, email: Optional[str], addresses: list, email_verified: bool = False
+    ) -> Optional[str]:
         # Avoid loading models before adapters have been registered.
         from allauth.account.models import EmailAddress
 
@@ -181,6 +185,12 @@ def cleanup_email_addresses(self, email, addresses, email_verified=False):
             if adapter.is_email_verified(self, address.email):
                 address.verified = True
 
+        # Sort in order of importance (primary, verified...)
+        addresses.sort(key=lambda a: (a.primary, a.verified, a.email), reverse=True)
+        if not email and addresses:
+            email = addresses[0].email
+        return email
+
     def extract_email_addresses(self, data):
         """
         For example:

allauth/socialaccount/providers/github/tests.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from allauth.account.models import EmailAddress
 from allauth.socialaccount.models import SocialAccount
 from allauth.socialaccount.tests import OAuth2TestsMixin
@@ -95,7 +97,12 @@ def test_account_name_null(self):
         """,
             ),
         ]
-        self.login(mocks)
+        with patch(
+            "allauth.socialaccount.adapter.DefaultSocialAccountAdapter.populate_user"
+        ) as populate_mock:
+            self.login(mocks)
+        populate_data = populate_mock.call_args[0][2]
+        assert populate_data["email"] == "octocat@github.com"
         socialaccount = SocialAccount.objects.get(uid="201022")
         self.assertIsNone(socialaccount.extra_data.get("name"))
         account = socialaccount.get_provider_account()