Add formatting and type checks

karldns/routers/management.py

@@ -50,14 +50,24 @@ def manage_dashboard(
     account = get_active_management_account(store, management_slug)
     csrf_token = dashboard_csrf_token(management_slug, account)
     if not management_account_is_accepted(account):
-        return _render_pending_management_page(service, settings, management_slug, account, csrf_token, request_ip=client_ip(request, settings))
+        return _render_pending_management_page(
+            service, settings, management_slug, account, csrf_token, request_ip=client_ip(request, settings)
+        )
     if not has_management_access(request, settings, management_slug, account):
         return _render_management_unlock_page(management_slug, account, csrf_token)
     message = "Hostname registered. Add the update URL to your router." if activated else None
-    return _render_management_page(service, settings, management_slug, account, csrf_token, message=message, request_ip=client_ip(request, settings))
+    return _render_management_page(
+        service,
+        settings,
+        management_slug,
+        account,
+        csrf_token,
+        message=message,
+        request_ip=client_ip(request, settings),
+    )
 
 
-@router.post("/m/{management_slug}/activate", include_in_schema=False)
+@router.post("/m/{management_slug}/activate", include_in_schema=False, response_model=None)
 async def activate_dashboard(
     management_slug: ManagementSlugPath,
     request: Request,
@@ -68,7 +78,7 @@ async def activate_dashboard(
     ipaddr: str | None = None,
     myipv6: str | None = None,
     ip6addr: str | None = None,
-) -> RedirectResponse:
+) -> RedirectResponse | HTMLResponse:
     account = await get_active_management_account_async(store, management_slug)
     form = await request_form(request, settings)
     require_dashboard_csrf(management_slug, account, first_form_value(form, "csrf"))
@@ -102,8 +112,8 @@ async def activate_dashboard(
                 ),
                 status_code=500,
             )
-    account = await run_in_threadpool(store.activate_account, hostname)
-    if not account:
+    activated_account = await run_in_threadpool(lambda: store.activate_account(hostname))
+    if not activated_account:
         return _not_found()
     await run_in_threadpool(
         store.log_update_event,
@@ -117,14 +127,14 @@ async def activate_dashboard(
     return RedirectResponse(f"/m/{management_slug}?activated=1", status_code=303)
 
 
-@router.post("/m/{management_slug}/rotate", response_class=HTMLResponse, include_in_schema=False)
+@router.post("/m/{management_slug}/rotate", response_class=HTMLResponse, include_in_schema=False, response_model=None)
 async def rotate_dashboard_secrets(
     management_slug: ManagementSlugPath,
     request: Request,
     settings: SettingsDep,
     store: StoreDep,
     service: ServiceDep,
-) -> str:
+) -> str | HTMLResponse:
     account = await get_active_management_account_async(store, management_slug)
     if not management_account_is_accepted(account):
         return HTMLResponse(
@@ -172,10 +182,15 @@ async def rotate_dashboard_secrets(
 
 
 @router.post("/m/{management_slug}/delete", include_in_schema=False)
-async def delete_dashboard_hostname(management_slug: ManagementSlugPath, request: Request, settings: SettingsDep, store: StoreDep, service: ServiceDep) -> Response:
+async def delete_dashboard_hostname(
+    management_slug: ManagementSlugPath, request: Request, settings: SettingsDep, store: StoreDep, service: ServiceDep
+) -> Response:
     account = await get_active_management_account_async(store, management_slug)
     if not has_management_access(request, settings, management_slug, account):
-        return HTMLResponse(_render_management_unlock_page(management_slug, account, dashboard_csrf_token(management_slug, account)), status_code=401)
+        return HTMLResponse(
+            _render_management_unlock_page(management_slug, account, dashboard_csrf_token(management_slug, account)),
+            status_code=401,
+        )
     form = await request_form(request, settings)
     require_dashboard_csrf(management_slug, account, first_form_value(form, "csrf"))
     hostname = str(account["hostname"])
@@ -195,8 +210,7 @@ async def delete_dashboard_hostname(management_slug: ManagementSlugPath, request
     return HTMLResponse(
         _page(
             "Hostname deleted",
-            trusted(
-                """
+            trusted("""
             <main>
               <section class="hero-band compact">
                 <div class="container text-center d-grid justify-items-center gap-3">
@@ -207,8 +221,7 @@ async def delete_dashboard_hostname(management_slug: ManagementSlugPath, request
                 </div>
               </section>
             </main>
-            """
-            ),
+            """),
         )
     )