refactor websocket url mounting

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
goauthentik · May 9, 2023 · b8da3da · b8da3da
1 parent 42178af
commit b8da3da
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/authentik/api/v3/urls.py b/authentik/api/v3/urls.py
@@ -21,7 +21,7 @@
 for _authentik_app in get_apps():
     try:
         api_urls = import_module(f"{_authentik_app.name}.urls")
-    except ModuleNotFoundError:
+    except (ModuleNotFoundError, ImportError):
         continue
     if not hasattr(api_urls, "api_urlpatterns"):
         continue

diff --git a/authentik/core/apps.py b/authentik/core/apps.py
@@ -11,7 +11,6 @@ class AuthentikCoreConfig(ManagedAppConfig):
     label = "authentik_core"
     verbose_name = "authentik Core"
     mountpoint = ""
-    ws_mountpoint = "authentik.core.urls"
     default = True
 
     def reconcile_load_core_signals(self):

diff --git a/authentik/outposts/apps.py b/authentik/outposts/apps.py
@@ -24,7 +24,6 @@ class AuthentikOutpostConfig(ManagedAppConfig):
     label = "authentik_outposts"
     verbose_name = "authentik Outpost"
     default = True
-    ws_mountpoint = "authentik.outposts.urls"
 
     def reconcile_load_outposts_signals(self):
         """Load outposts signals"""

diff --git a/authentik/root/websocket.py b/authentik/root/websocket.py
@@ -9,13 +9,15 @@
 
 websocket_urlpatterns = []
 for _authentik_app in get_apps():
-    mountpoint = getattr(_authentik_app, "ws_mountpoint", None)
-    if not mountpoint:
+    try:
+        api_urls = import_module(f"{_authentik_app.name}.urls")
+    except ModuleNotFoundError:
         continue
-    ws_paths = import_module(mountpoint)
-    websocket_urlpatterns.extend(getattr(ws_paths, "websocket_urlpatterns"))
+    if not hasattr(api_urls, "websocket_urlpatterns"):
+        continue
+    urls: list = getattr(api_urls, "websocket_urlpatterns")
+    websocket_urlpatterns.extend(urls)
     LOGGER.debug(
-        "Mounted URLs",
+        "Mounted Websocket URLs",
         app_name=_authentik_app.name,
-        app_mountpoint=mountpoint,
     )