Polish KarlDNS production UI and docs

router_dyndns/routers/management_domains.py

@@ -23,12 +23,13 @@ from .management_shared import (
     locked_management_response,
     render_management_page_async,
 )
+from .path_params import ClaimSecretPath, ManagementSlugPath
 
 router = APIRouter()
 
 
 @router.get("/d/{claim_secret}", response_class=HTMLResponse, include_in_schema=False)
-async def manage_domain_claim(claim_secret: str, settings: SettingsDep, store: StoreDep, service: ServiceDep) -> str:
+async def manage_domain_claim(claim_secret: ClaimSecretPath, settings: SettingsDep, store: StoreDep, service: ServiceDep) -> str:
     challenge = await run_in_threadpool(store.get_domain_challenge_by_secret, claim_secret)
     if not challenge:
         raise HTTPException(status_code=404, detail="not found")
@@ -37,14 +38,14 @@ async def manage_domain_claim(claim_secret: str, settings: SettingsDep, store: S
 
 @router.post("/m/{management_slug}/domains/request", response_class=HTMLResponse, include_in_schema=False)
 async def request_dashboard_domain(
-    management_slug: str,
+    management_slug: ManagementSlugPath,
     request: Request,
     settings: SettingsDep,
     store: StoreDep,
     service: ServiceDep,
 ) -> str:
     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 locked_management_response(management_slug, account)
     form = await request_form(request, settings)
     require_dashboard_csrf(management_slug, account, first_form_value(form, "csrf"))
@@ -71,28 +72,28 @@ async def request_dashboard_domain(
         management_slug,
         account,
         dashboard_csrf_token(management_slug, account),
-        message="Domain claim created. Add the TXT record, then verify it.",
+        message="Claim created. Add the TXT record, then verify it.",
         challenge=challenge,
     )
 
 
 @router.post("/m/{management_slug}/domains/verify", response_class=HTMLResponse, include_in_schema=False)
 async def verify_dashboard_domain(
-    management_slug: str,
+    management_slug: ManagementSlugPath,
     request: Request,
     settings: SettingsDep,
     store: StoreDep,
     service: ServiceDep,
 ) -> str:
     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 locked_management_response(management_slug, account)
     form = await request_form(request, settings)
     require_dashboard_csrf(management_slug, account, first_form_value(form, "csrf"))
     domain = normalize_domain(first_form_value(form, "domain"))
     claim_secret = first_form_value(form, "claim_secret")
     found, challenge = await run_in_threadpool(service.verify_domain, domain, claim_secret, str(account["hostname"]))
-    message = "Domain verified. You can now create a custom hostname." if found else "TXT record not found yet. DNS propagation can take a few minutes."
+    message = "Domain verified. You can create a hostname now." if found else "TXT record not found yet. Try again in a few minutes."
     await run_in_threadpool(
         store.log_update_event,
         str(account["hostname"]),
@@ -115,14 +116,14 @@ async def verify_dashboard_domain(
 
 @router.post("/m/{management_slug}/domains/hostnames", response_class=HTMLResponse, include_in_schema=False)
 async def create_dashboard_custom_hostname(
-    management_slug: str,
+    management_slug: ManagementSlugPath,
     request: Request,
     settings: SettingsDep,
     store: StoreDep,
     service: ServiceDep,
 ) -> str:
     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 locked_management_response(management_slug, account)
     form = await request_form(request, settings)
     require_dashboard_csrf(management_slug, account, first_form_value(form, "csrf"))
@@ -148,6 +149,6 @@ async def create_dashboard_custom_hostname(
         management_slug,
         account,
         dashboard_csrf_token(management_slug, account),
-        message="Custom hostname created. Copy these router settings now.",
+        message="Hostname created. Copy these router settings now.",
         created_account=created,
     )