Polish KarlDNS production UI and docs

router_dyndns/routers/management_passwords.py

@@ -18,12 +18,13 @@ from .management_shared import (
     set_unlock_cookie,
     unlock_cookie_seconds,
 )
+from .path_params import ManagementSlugPath
 
 router = APIRouter()
 
 
 @router.post("/m/{management_slug}/unlock", include_in_schema=False)
-async def unlock_magic(management_slug: str, request: Request, settings: SettingsDep, store: StoreDep) -> Response:
+async def unlock_magic(management_slug: ManagementSlugPath, request: Request, settings: SettingsDep, store: StoreDep) -> Response:
     account = await get_active_management_account_async(store, management_slug)
     if not account.get("dashboard_password_hash"):
         return RedirectResponse(f"/m/{management_slug}", status_code=303)
@@ -34,7 +35,7 @@ async def unlock_magic(management_slug: str, request: Request, settings: Setting
     is_valid = await run_in_threadpool(store.verify_dashboard_password, hostname, password)
     if not is_valid:
         return HTMLResponse(
-            _render_management_unlock_page(management_slug, account, dashboard_csrf_token(management_slug, account), "Incorrect dashboard password."),
+            _render_management_unlock_page(management_slug, account, dashboard_csrf_token(management_slug, account), "Incorrect password."),
             status_code=401,
         )
     response = RedirectResponse(f"/m/{management_slug}", status_code=303)
@@ -50,14 +51,14 @@ async def unlock_magic(management_slug: str, request: Request, settings: Setting
 
 @router.post("/m/{management_slug}/password", include_in_schema=False)
 async def set_dashboard_password(
-    management_slug: str,
+    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, management_slug, account):
+    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)
     form = await request_form(request, settings)
     require_dashboard_csrf(management_slug, account, first_form_value(form, "csrf"))
@@ -69,7 +70,7 @@ async def set_dashboard_password(
             first_form_value(form, "current_dashboard_password"),
         )
         if not is_current:
-            return await management_error_response_async(service, settings, management_slug, account, "Current dashboard password is incorrect.")
+            return await management_error_response_async(service, settings, management_slug, account, "Current password is incorrect.")
     password = first_form_value(form, "dashboard_password")
     confirm = first_form_value(form, "dashboard_password_confirm")
     if len(password) < 8:
@@ -79,7 +80,7 @@ async def set_dashboard_password(
             management_slug,
             account,
             dashboard_csrf_token(management_slug, account),
-            message="Dashboard password must be at least 8 characters.",
+            message="Password must be at least 8 characters.",
         )
         return HTMLResponse(page, status_code=400)
     if password != confirm:
@@ -89,7 +90,7 @@ async def set_dashboard_password(
             management_slug,
             account,
             dashboard_csrf_token(management_slug, account),
-            message="Dashboard password confirmation did not match.",
+            message="The passwords do not match.",
         )
         return HTMLResponse(page, status_code=400)
     had_password = bool(account.get("dashboard_password_hash"))
@@ -111,14 +112,14 @@ async def set_dashboard_password(
 
 @router.post("/m/{management_slug}/password/remove", include_in_schema=False)
 async def remove_dashboard_password(
-    management_slug: str,
+    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, management_slug, account):
+    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)
     form = await request_form(request, settings)
     require_dashboard_csrf(management_slug, account, first_form_value(form, "csrf"))
@@ -130,7 +131,7 @@ async def remove_dashboard_password(
             first_form_value(form, "current_dashboard_password"),
         )
         if not is_current:
-            return await management_error_response_async(service, settings, management_slug, account, "Current dashboard password is incorrect.")
+            return await management_error_response_async(service, settings, management_slug, account, "Current password is incorrect.")
     await run_in_threadpool(store.clear_dashboard_password, hostname)
     await run_in_threadpool(
         store.log_update_event,