github login fix

Author: alexeygrigorev

accounts/auth.py

@@ -28,18 +28,21 @@ def generate_random_password(
     )
 
 
-def extract_email(response_data):
-    email = ''
+def extract_email(response_data, sociallogin=None):
+    if response_data.get("email"):
+        return response_data["email"]
 
-    if 'email' in response_data:
-        email = response_data['email']
+    # GitHub-specific (via allauth fetch)
+    if sociallogin and sociallogin.email_addresses:
+        verified = [e for e in sociallogin.email_addresses if e.verified]
+        if verified:
+            return verified[0].email
+        return sociallogin.email_addresses[0].email
 
-    if 'user' in response_data:
-        user_data = response_data['user']
-        if 'email' in user_data:
-            email = user_data['email']
+    if response_data.get("notification_email"):
+        return response_data["notification_email"]
 
-    return email.lower().strip()    
+    raise KeyError("Email not found in response data")
 
 
 class ConsolidatingSocialAccountAdapter(DefaultSocialAccountAdapter):
@@ -55,7 +58,7 @@ def pre_social_login(self, request, sociallogin):
 
         email = None
         try:
-            email = extract_email(response_data)
+            email = extract_email(response_data, sociallogin=sociallogin)
             logger.info(f"Extracted email {email} from OAuth response")
             if email is None or len(email) == 0:
                 logger.info("No email found in social account data")

accounts/models.py

@@ -19,6 +19,10 @@ class CustomUser(AbstractUser):
         help_text="Your actual name that will appear on your certificates"
     )
 
+    def __str__(self):
+        # safest is to display something stable
+        return self.username or self.email or str(self.pk)
+
 
 class Token(models.Model):
     key = models.CharField(max_length=40, primary_key=True)

course_management/settings.py

@@ -305,6 +305,14 @@
 # Skip intermediate confirmation page - direct OAuth redirect
 SOCIALACCOUNT_LOGIN_ON_GET = True
 
+SOCIALACCOUNT_PROVIDERS = {
+    "github": {
+        "SCOPE": [
+            "user:email",
+        ],
+        "VERIFIED_EMAIL": True,
+    }
+}
 
 # Unfold Configurations
 UNFOLD = {