remove placeholder email logic

Author: Aqil-Ahmad

app/eventyay/base/models/auth.py

@@ -40,7 +40,6 @@
 from eventyay.common.text.path import path_with_hash
 from eventyay.common.urls import EventUrls
 from eventyay.helpers.urls import build_absolute_uri
-from eventyay.person.utils import is_placeholder_email
 from eventyay.talk_rules.person import is_administrator
 
 from ...helpers.u2f import pub_key_from_der, websafe_decode
@@ -361,8 +360,7 @@ def get_full_name(self) -> str:
     def send_security_notice(self, messages, email=None):
         from eventyay.base.services.mail import SendMailException, mail
 
-        # Skip email notifications for placeholder Wikimedia emails
-        if is_placeholder_email(self.email):
+        if not self.email:
             return
 
         try:
@@ -384,8 +382,7 @@ def send_security_notice(self, messages, email=None):
     def send_password_reset(self, request: HttpRequest):
         from eventyay.base.services.mail import mail
 
-        # Skip email notifications for placeholder Wikimedia emails
-        if is_placeholder_email(self.email):
+        if not self.email:
             return
 
         subject = _('Password recovery')
@@ -703,8 +700,7 @@ def reset_password(self, event, user=None, mail_text=None, orga=False):
 
         self.log_action(action='eventyay.user.password.reset', user=user)
 
-        # Skip email notifications for placeholder Wikimedia emails
-        if is_placeholder_email(self.email):
+        if not self.email:
             return
 
         context = {
@@ -750,8 +746,7 @@ def change_password(self, new_password):
 
         self.log_action(action='eventyay.user.password.changed', user=self)
 
-        # Skip email notifications for placeholder Wikimedia emails
-        if is_placeholder_email(self.email):
+        if not self.email:
             return
 
         context = {

app/eventyay/person/utils.py

@@ -1,61 +1,3 @@
-def get_or_create_email_for_wikimedia_user(username, email=None, user_id=None):
-    """
-    Generate an email for Wikimedia users.
-    
-    Sanitizes username to ensure valid email format and uniqueness.
-    Falls back to user ID if username is empty or invalid.
-    
-    Args:
-        username (str): Wikimedia username
-        email (str): Email from Wikimedia profile (can be None)
-        user_id: Wikimedia user ID for uniqueness and fallback
-    
-    Returns:
-        str: Email address
-    """
-    if email and email.strip():
-        return email
-    
-    # Sanitize username: lowercase, strip, replace whitespace with dots, remove invalid chars
-    if username:
-        sanitized = username.lower().strip()
-        sanitized = sanitized.replace(' ', '.').replace('_', '.')
-        sanitized = ''.join(c for c in sanitized if c.isalnum() or c in '.-')
-        while '..' in sanitized:
-            sanitized = sanitized.replace('..', '.')
-        sanitized = sanitized.strip('.')
-    else:
-        sanitized = None
-    
-    # If sanitized username is empty or invalid, use user ID as fallback
-    if sanitized:
-        if user_id:
-            return f"{sanitized}.{user_id}@wikimedia.local"
-        return f"{sanitized}@wikimedia.local"
-    else:
-        # Fallback: use Wikimedia user ID only
-        if user_id:
-            return f"wm.{user_id}@wikimedia.local"
-        else:
-            return "[email protected]"
-
-
-def is_placeholder_email(email):
-    """
-    Check if an email is a placeholder (non-routable) Wikimedia address.
-    These emails should never have messages sent to them.
-    
-    Args:
-        email (str): Email address to check
-    
-    Returns:
-        bool: True if the email is a placeholder Wikimedia email
-    """
-    if not email:
-        return False
-    return email.endswith('@wikimedia.local')
-
-
 def is_wikimedia_user(user):
     """
     Check if user is authenticated via Wikimedia OAuth

app/eventyay/plugins/socialauth/views.py

@@ -18,8 +18,6 @@
 from eventyay.control.permissions import AdministratorPermissionRequiredMixin
 from eventyay.eventyay_common.views.auth import process_login_and_set_cookie
 from eventyay.helpers.urls import build_absolute_uri
-from eventyay.person.utils import get_or_create_email_for_wikimedia_user
-
 from .schemas.login_providers import LoginProviders
 from .schemas.oauth2_params import OAuth2Params
 
@@ -108,15 +106,9 @@ def get_or_create_user(request: HttpRequest) -> User:
                 # Use social account ID as fallback
                 wikimedia_username = f"wm_{social_account.uid}"
 
-        # Generate placeholder email for Wikimedia users without email
-        final_email = get_or_create_email_for_wikimedia_user(
-            wikimedia_username, 
-            email,
-            user_id=social_account.uid if social_account else None
-        )
+        final_email = email if (email and str(email).strip()) else None
 
         # For Wikimedia users, look up by wikimedia_username instead of email
-        # to avoid collisions between placeholder emails
         if social_account:
             user, created = User.objects.get_or_create(
                 wikimedia_username=wikimedia_username,

app/eventyay/presale/forms/checkout.py

@@ -38,16 +38,13 @@ def __init__(self, *args, **kwargs):
         # Make email optional for Wikimedia users
         if self.request and self.request.user and is_wikimedia_user(self.request.user):
             self.fields['email'].required = False
-            self.fields['email'].help_text = _('E-mail (optional for Wikimedia users)')
-        else:
-            self.fields['email'].required = True
+            self.fields['email'].help_text = _('E-mail address (optional for Wikimedia users)')
 
         if self.event.settings.order_email_asked_twice:
             self.fields['email_repeat'] = forms.EmailField(
                 label=_('E-mail address (repeated)'),
                 help_text=_('Please enter the same email address again to make sure you typed it correctly.'),
             )
-            # Make email_repeat optional for Wikimedia users too
             if self.request and self.request.user and is_wikimedia_user(self.request.user):
                 self.fields['email_repeat'].required = False
 
@@ -94,11 +91,9 @@ def __init__(self, *args, **kwargs):
 
     def clean(self):
         cleaned_data = super().clean()
-
         # For Wikimedia users, skip email validation
         if self.request and self.request.user and is_wikimedia_user(self.request.user):
             return cleaned_data
-
         # Validate email_repeat matches email if both are provided
         if (
             self.event.settings.order_email_asked_twice

tests/person/test_wikimedia_utils.py

@@ -1,65 +1,22 @@
 """
-Tests for Wikimedia email registration functionality.
+Tests for Wikimedia user utilities.
 """
 from django.test import TestCase
 from django.contrib.auth import get_user_model
 
-from eventyay.person.utils import (
-    get_or_create_email_for_wikimedia_user,
-    is_wikimedia_user,
-    is_placeholder_email,
-)
+from eventyay.person.utils import is_wikimedia_user
 
 User = get_user_model()
 
 
-class WikimediaEmailUtilsTests(TestCase):
-    """Test utilities for Wikimedia OAuth users."""
-
-    def test_placeholder_email_with_real_email(self):
-        """Real email takes precedence over placeholder generation."""
-        result = get_or_create_email_for_wikimedia_user('testuser', '[email protected]')
-        self.assertEqual(result, '[email protected]')
-
-    def test_placeholder_email_without_email(self):
-        """Placeholder email generated when no email provided."""
-        result = get_or_create_email_for_wikimedia_user('testuser', None, user_id=123)
-        self.assertEqual(result, '[email protected]')
-
-    def test_sanitize_username_with_spaces(self):
-        """Spaces converted to dots."""
-        result = get_or_create_email_for_wikimedia_user('Test User', None, user_id=456)
-        self.assertTrue(result.startswith('test.user'))
-        self.assertIn('@wikimedia.local', result)
-
-    def test_sanitize_username_with_underscores(self):
-        """Underscores converted to dots."""
-        result = get_or_create_email_for_wikimedia_user('test_user_name', None, user_id=789)
-        self.assertEqual(result, '[email protected]')
-
-    def test_remove_special_characters(self):
-        """Special characters removed from username."""
-        result = get_or_create_email_for_wikimedia_user('test@user#123', None, user_id=101)
-        self.assertEqual(result, '[email protected]')
-
-    def test_empty_username_fallback(self):
-        """Empty username uses ID-based fallback."""
-        result = get_or_create_email_for_wikimedia_user('', None, user_id=789)
-        self.assertEqual(result, '[email protected]')
-
-    def test_is_placeholder_email_true(self):
-        """Wikimedia.local emails identified as placeholders."""
-        self.assertTrue(is_placeholder_email('[email protected]'))
-
-    def test_is_placeholder_email_false(self):
-        """Real emails not identified as placeholders."""
-        self.assertFalse(is_placeholder_email('[email protected]'))
-        self.assertFalse(is_placeholder_email(None))
+class WikimediaUserUtilsTests(TestCase):
+    """Test utilities for identifying Wikimedia OAuth users."""
 
     def test_is_wikimedia_user_true(self):
         """Wikimedia users correctly identified."""
         user = User.objects.create_user(
-            email='[email protected]',
+            email='[email protected]',
+            wikimedia_username='testuser',
             is_wikimedia_user=True
         )
         self.assertTrue(is_wikimedia_user(user))
@@ -69,13 +26,22 @@ def test_is_wikimedia_user_false(self):
         user = User.objects.create_user(email='[email protected]')
         self.assertFalse(is_wikimedia_user(user))
 
-    def test_wikimedia_user_creation(self):
-        """Wikimedia user can be created with placeholder email."""
-        email = get_or_create_email_for_wikimedia_user('wikiuser', None, user_id=999)
+    def test_is_wikimedia_user_no_email(self):
+        """Wikimedia users can have no email."""
         user = User.objects.create_user(
-            email=email,
-            wikimedia_username='wikiuser',
+            email=None,
+            wikimedia_username='testuser',
             is_wikimedia_user=True
         )
-        self.assertEqual(user.email, '[email protected]')
-        self.assertTrue(user.is_wikimedia_user)
+        self.assertTrue(is_wikimedia_user(user))
+        self.assertIsNone(user.email)
+
+    def test_is_wikimedia_user_unauthenticated(self):
+        """Unauthenticated users are not Wikimedia users."""
+        user = User.objects.create_user(
+            email='[email protected]',
+            wikimedia_username='testuser',
+            is_wikimedia_user=True
+        )
+        user.is_authenticated = False
+        self.assertFalse(is_wikimedia_user(user))