Merge branch 'master' into storefront-nuxt

engine/vibes_auth/admin_site.py

@@ -48,14 +48,15 @@ class SchonAdminSite(UnfoldAdminSite):
 
         return super().login(request, extra_context)
 
-    def extra_urls(self):
-        return [
+    def get_urls(self):
+        custom_urls = [
             path(
                 "verify-otp/",
                 self.verify_otp_view,
                 name="verify-otp",
             ),
         ]
+        return custom_urls + super().get_urls()
 
     def verify_otp_view(self, request: HttpRequest) -> HttpResponse:
         from engine.vibes_auth.models import AdminOTPCode, User

engine/vibes_auth/apps.py

@@ -11,12 +11,9 @@ class VibesAuthConfig(AppConfig):
     hide = False
 
     def ready(self) -> None:
-        from django.contrib import admin  # noqa: E402
-        from django.contrib.admin import sites  # noqa: E402
+        from django.contrib import admin
 
         import engine.vibes_auth.signals  # noqa: F401
-        from engine.vibes_auth.admin_site import SchonAdminSite  # noqa: E402
+        from engine.vibes_auth.admin_site import SchonAdminSite
 
-        site = SchonAdminSite()
-        admin.site = site
-        sites.site = site
+        admin.site.__class__ = SchonAdminSite