Fix: socialauth URLs were not resolved (#1324)

* Fix: socialauth URLs were not resolved

* Custom path converter for URLs

---------

Co-authored-by: Mario Behling <[email protected]>

Author: hongquan

app/eventyay/common/urls.py

@@ -2,10 +2,24 @@
 from urllib.parse import urljoin, urlparse
 
 from django.conf import settings
-from django.urls import resolve, reverse
+from django.urls import register_converter, resolve, reverse
 from urlman import Urls
 
 
+# Custom path converter for organizer slugs that allows dots
+class OrganizerSlugConverter:
+    regex = r'[a-zA-Z0-9_.-]+'
+
+    def to_python(self, value):
+        return value
+
+    def to_url(self, value):
+        return value
+
+
+register_converter(OrganizerSlugConverter, 'orgslug')
+
+
 def get_base_url(event=None, url=None):
     if url and url.startswith('/orga'):
         return settings.SITE_URL

app/eventyay/config/urls.py

@@ -4,16 +4,12 @@
 from django.conf.urls.static import static
 from django.urls import include, path
 from django.urls import re_path as url
-from django.views.generic import RedirectView
 
 import eventyay.control.urls
 import eventyay.eventyay_common.urls
 import eventyay.presale.urls
-from eventyay.base.views import health, redirect
+from eventyay.base.views import cachedfiles, csp, health, js_catalog, js_helpers, metrics, redirect
 from eventyay.control.views import pages
-from eventyay.base.views import js_helpers
-from eventyay.base.views import cachedfiles, csp, health, js_catalog, metrics, redirect
-
 
 base_patterns = [
     url(

app/eventyay/multidomain/maindomain_urlconf.py

@@ -1,34 +1,36 @@
 import importlib.util
-import os
 import json
+import logging
+import os
+from mimetypes import guess_type
 
 from django.apps import apps
+from django.core.serializers.json import DjangoJSONEncoder
+from django.http import Http404, HttpResponse
 from django.urls import include, path, re_path
+from django.utils.encoding import force_str
+from django.utils.functional import Promise
 from django.views.generic import TemplateView, View
-from django.http import HttpResponse, Http404
 from django.views.static import serve as static_serve
-from django.conf import settings
 from django_scopes import scope
-from mimetypes import guess_type
-from django.core.serializers.json import DjangoJSONEncoder
-from django.utils.functional import Promise
-from django.utils.encoding import force_str
 from i18nfield.strings import LazyI18nString
 
-# Ticket-video integration: plugin URLs are auto-included via plugin handler below.
+from eventyay.base.models import Event  # Added for /video event context
+from eventyay.common.urls import OrganizerSlugConverter  # noqa: F401 (registers converter)
 
+# Ticket-video integration: plugin URLs are auto-included via plugin handler below.
 from eventyay.config.urls import common_patterns
-from eventyay.multidomain.plugin_handler import plugin_event_urls
 from eventyay.multidomain import redirects
+from eventyay.multidomain.plugin_handler import plugin_event_urls
 from eventyay.presale.urls import (
     event_patterns,
     locale_patterns,
     organizer_patterns,
 )
-from eventyay.base.models import Event  # Added for /video event context
 
 BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 WEBAPP_DIST_DIR = os.path.normpath(os.path.join(BASE_DIR, 'static', 'webapp'))
+logger = logging.getLogger(__name__)
 
 EXCLUDED_LEGACY_PREFIXES = (
     "common",
@@ -82,14 +84,14 @@ def get(self, request, *args, **kwargs):
                 )
             except Event.DoesNotExist:
                 return HttpResponse('Event not found', status=404)
-        
+
         index_path = os.path.join(WEBAPP_DIST_DIR, 'index.html')
         if os.path.exists(index_path):
             with open(index_path, 'r') as f:
                 content = f.read()
         else:
             content = '<!-- /video build missing: {} -->'.format(index_path)
-        
+
         base_href = '/video/'
         if event:
             # Inject window.venueless config (frontend still expects this name)
@@ -104,11 +106,11 @@ def safe_reverse(name, **kw):
                 except Exception:
                     return None
             cfg = event.config or {}
-            
+
             with scope(event=event):
                 schedule = event.current_schedule or event.wip_schedule
                 schedule_data = schedule.build_data(all_talks=False) if schedule else None
-            
+
             base_path = event.urls.video_base.rstrip('/')
             base_href = event.urls.video_base
             injected = {
@@ -182,9 +184,9 @@ def get(self, request, path='', *args, **kwargs):
             (
                 locale_patterns
                 + [
-                    re_path(r'^(?P<organizer>[^/]+)/', include(organizer_patterns)),
+                    re_path(r'^(?P<organizer>[a-zA-Z0-9_.-]+)/', include(organizer_patterns)),
                     re_path(
-                        r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
+                        r'^(?P<organizer>[a-zA-Z0-9_.-]+)/(?P<event>[^/]+)/',
                         include(event_patterns),
                     ),
                     path(
@@ -210,14 +212,15 @@ def get(self, request, path='', *args, **kwargs):
             if hasattr(urlmod, 'event_patterns'):
                 patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name)
                 single_plugin_patterns.append(
-                    re_path(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(patterns))
+                    path('<orgslug:organizer>/<slug:event>/', include(patterns))
                 )
             if hasattr(urlmod, 'organizer_patterns'):
                 patterns = urlmod.organizer_patterns
                 single_plugin_patterns.append(
-                    re_path(r'^(?P<organizer>[^/]+)/', include(patterns))
+                    path('<orgslug:organizer>/', include(patterns))
                 )
             raw_plugin_patterns.append(path('', include((single_plugin_patterns, app.label))))
+            logger.debug('Registered URLs under "%s" namespace:\n%s', app.label, single_plugin_patterns)
 
 # Fallback: include pretix_venueless plugin URLs even if lacking EventyayPluginMeta
 try:
@@ -229,16 +232,16 @@ def get(self, request, path='', *args, **kwargs):
         if hasattr(urlmod, 'event_patterns'):
             patterns = plugin_event_urls(urlmod.event_patterns, plugin='pretix_venueless')
             single_plugin_patterns.append(
-                re_path(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(patterns))
+                re_path(r'^(?P<organizer>[a-zA-Z0-9_.-]+)/(?P<event>[^/]+)/', include(patterns))
             )
         if hasattr(urlmod, 'organizer_patterns'):
             patterns = urlmod.organizer_patterns
             single_plugin_patterns.append(
-                re_path(r'^(?P<organizer>[^/]+)/', include(patterns))
+                re_path(r'^(?P<organizer>[a-zA-Z0-9_.-]+)/', include(patterns))
             )
         raw_plugin_patterns.append(path('', include((single_plugin_patterns, 'pretix_venueless'))))
-except Exception:
-    pass
+except TypeError:
+    logger.exception('Error including pretix_venueless plugin URLs')
 
 plugin_patterns = [path('', include((raw_plugin_patterns, 'plugins')))]
 
@@ -249,7 +252,7 @@ def get(self, request, path='', *args, **kwargs):
 
 unified_event_patterns = [
     re_path(
-        r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
+        r'^(?P<organizer>[a-zA-Z0-9_.-]+)/(?P<event>[^/]+)/',
         include(
             [
                 # Video patterns under {organizer}/{event}/video/
@@ -301,10 +304,12 @@ def get(self, request, path='', *args, **kwargs):
 urlpatterns = (
     common_patterns
     + storage_patterns
+    # The plugins patterns must be before legacy_redirect_patterns and presale_patterns_main
+    # to avoid misdetection of plugin prefixes and organizer/event slugs.
+    + plugin_patterns
     + legacy_redirect_patterns
     + presale_patterns_main
     + unified_event_patterns
-    + plugin_patterns
 )
 
 handler404 = 'eventyay.base.views.errors.page_not_found'