From 5a5a2a5d69f6e83f0961c202db085579fb7552ec Mon Sep 17 00:00:00 2001
From: Jens L <jens@goauthentik.io>
Date: Mon, 8 Apr 2024 15:24:16 +0200
Subject: [PATCH] enterprise: fix audit middleware import (#9177)

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 authentik/enterprise/audit/apps.py             |  4 ++--
 authentik/enterprise/audit/tests.py            | 18 ++++++++++++++++++
 .../enterprise/EnterpriseLicenseListPage.ts    |  5 ++++-
 web/src/admin/events/EventViewPage.ts          |  4 ++--
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 authentik/enterprise/audit/tests.py

diff --git a/authentik/enterprise/audit/apps.py b/authentik/enterprise/audit/apps.py
index 181e266f20..8d298d8b25 100644
--- a/authentik/enterprise/audit/apps.py
+++ b/authentik/enterprise/audit/apps.py
@@ -13,9 +13,9 @@ class AuthentikEnterpriseAuditConfig(EnterpriseConfig):
     verbose_name = "authentik Enterprise.Audit"
     default = True
 
-    @EnterpriseConfig.reconcile_global
-    def install_middleware(self):
+    def ready(self):
         """Install enterprise audit middleware"""
         orig_import = "authentik.events.middleware.AuditMiddleware"
         new_import = "authentik.enterprise.audit.middleware.EnterpriseAuditMiddleware"
         settings.MIDDLEWARE = [new_import if x == orig_import else x for x in settings.MIDDLEWARE]
+        return super().ready()
diff --git a/authentik/enterprise/audit/tests.py b/authentik/enterprise/audit/tests.py
new file mode 100644
index 0000000000..bb7e761b0a
--- /dev/null
+++ b/authentik/enterprise/audit/tests.py
@@ -0,0 +1,18 @@
+from django.apps import apps
+from django.conf import settings
+from django.test import TestCase
+
+
+class TestEnterpriseAudit(TestCase):
+
+    def test_import(self):
+        """Ensure middleware is imported when app.ready is called"""
+        # Revert import swap
+        orig_import = "authentik.events.middleware.AuditMiddleware"
+        new_import = "authentik.enterprise.audit.middleware.EnterpriseAuditMiddleware"
+        settings.MIDDLEWARE = [orig_import if x == new_import else x for x in settings.MIDDLEWARE]
+        # Re-call ready()
+        apps.get_app_config("authentik_enterprise_audit").ready()
+        self.assertIn(
+            "authentik.enterprise.audit.middleware.EnterpriseAuditMiddleware", settings.MIDDLEWARE
+        )
diff --git a/web/src/admin/enterprise/EnterpriseLicenseListPage.ts b/web/src/admin/enterprise/EnterpriseLicenseListPage.ts
index 8cd2f3aa21..594a9c436d 100644
--- a/web/src/admin/enterprise/EnterpriseLicenseListPage.ts
+++ b/web/src/admin/enterprise/EnterpriseLicenseListPage.ts
@@ -75,6 +75,9 @@ export class EnterpriseLicenseListPage extends TablePage<License> {
                 .pf-m-no-padding-bottom {
                     padding-bottom: 0;
                 }
+                .install-id {
+                    word-break: break-all;
+                }
             `,
         );
     }
@@ -255,7 +258,7 @@ export class EnterpriseLicenseListPage extends TablePage<License> {
                 >
             </div>
             <div class="pf-c-card__title">${msg("Your Install ID")}</div>
-            <div class="pf-c-card__body">${installID}</div>
+            <div class="pf-c-card__body install-id">${installID}</div>
         `;
 
         return html`<div class="pf-l-grid__item pf-c-card">
diff --git a/web/src/admin/events/EventViewPage.ts b/web/src/admin/events/EventViewPage.ts
index f50eb6012c..ddf29fbfbb 100644
--- a/web/src/admin/events/EventViewPage.ts
+++ b/web/src/admin/events/EventViewPage.ts
@@ -18,7 +18,7 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
-import { EventsApi } from "@goauthentik/api";
+import { EventToJSON, EventsApi } from "@goauthentik/api";
 
 @customElement("ak-event-view")
 export class EventViewPage extends AKElement {
@@ -143,7 +143,7 @@ export class EventViewPage extends AKElement {
                     <div class="pf-c-card pf-l-grid__item pf-m-12-col">
                         <div class="pf-c-card__title">${msg("Raw event info")}</div>
                         <div class="pf-c-card__body">
-                            <pre>${JSON.stringify(this.event, null, 4)}</pre>
+                            <pre>${JSON.stringify(EventToJSON(this.event), null, 4)}</pre>
                         </div>
                     </div>
                 </div>