From 7726d660b6af9e65bc940810a458ae9c867e7b9d Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 26 Mar 2020 12:54:20 +0100 Subject: [PATCH] src/server/rest.rs: use correct formatter --- src/server/rest.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index 5383fc77..2efa2fde 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -550,13 +550,19 @@ pub async fn handle_request(api: Arc, req: Request) -> Result { - if api_method.protected && env_type == RpcEnvironmentType::PUBLIC { - return proxy_protected_request(api_method, parts, body).await; + let result = if api_method.protected && env_type == RpcEnvironmentType::PUBLIC { + proxy_protected_request(api_method, parts, body).await } else { - return handle_api_request(rpcenv, api_method, formatter, parts, body, uri_param).await; + handle_api_request(rpcenv, api_method, formatter, parts, body, uri_param).await + }; + + if let Err(err) = result { + return Ok((formatter.format_error)(err)); } + return result; } } + } } else { // not Auth required for accessing files!