From d627b02c5fa1d19b1a372b027c8135cc71acfd69 Mon Sep 17 00:00:00 2001 From: BlockListed <44610569+BlockListed@users.noreply.github.com> Date: Sat, 9 Sep 2023 18:08:42 +0200 Subject: [PATCH] remove admin_path function since it just returns a const --- src/api/admin.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api/admin.rs b/src/api/admin.rs index d2b55ea4..830f64f0 100644 --- a/src/api/admin.rs +++ b/src/api/admin.rs @@ -98,7 +98,7 @@ const BASE_TEMPLATE: &str = "admin/base"; const ACTING_ADMIN_USER: &str = "vaultwarden-admin-00000-000000000000"; -fn admin_path() -> String { +fn admin_path() -> String { ADMIN_PATH.to_string() } @@ -125,9 +125,10 @@ impl<'r> FromRequest<'r> for IpHeader { } fn admin_url(base_url: &str) -> String { - format!("{}{}", base_url, admin_path()) + format!("{}{}", base_url, ADMIN_PATH) } + #[derive(Responder)] enum AdminResponse { #[response(status = 200)] @@ -197,7 +198,7 @@ fn post_admin_login(data: Form, cookies: &CookieJar<'_>, ip: ClientIp cookies.add(cookie); if let Some(redirect) = redirect { - Ok(Redirect::to(format!("{}{}", admin_path(), redirect))) + Ok(Redirect::to(format!("{}{}", ADMIN_PATH, redirect))) } else { Err(AdminResponse::Ok(render_admin_page())) }