diff --git a/src/serve.rs b/src/serve.rs index 7da5b9d..a2f5eae 100644 --- a/src/serve.rs +++ b/src/serve.rs @@ -11,10 +11,7 @@ use serde_json::{json, Value}; use crate::{db, jose, proc}; use crate::do_response; -use crate::serve_common; -use crate::serve_common::GenericError; -use crate::serve_common::MemoryKey; -use crate::serve_common::Result; +use crate::serve_common::{self, GenericError, MemoryKey, Result}; use crate::serve_encrypt_decrypt; use crate::serve_init; use crate::serve_read_write; @@ -151,6 +148,8 @@ Supports commands: - POST /update - POST /encrypt - POST /decrypt +- POST /read +- POST /write "##, env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION") ).into())?) } else { diff --git a/src/serve_encrypt_decrypt.rs b/src/serve_encrypt_decrypt.rs index 637d398..4127750 100644 --- a/src/serve_encrypt_decrypt.rs +++ b/src/serve_encrypt_decrypt.rs @@ -6,16 +6,16 @@ use serde_json::{json, Value}; use crate::do_response; use crate::jose; -use crate::serve_common; -use crate::serve_common::{byte_to_multi_view_map, get_master_key, MultipleViewValue}; -use crate::serve_common::Result; +use crate::serve_common::{self, byte_to_multi_view_map, get_master_key, MultipleViewValue, Result}; #[derive(Serialize, Deserialize)] struct DecryptRequest { encrypted_value: String, } -pub async fn decrypt(req: Request) -> Result> { +pub + +async fn decrypt(req: Request) -> Result> { do_response!(inner_decrypt(req).await) } diff --git a/src/serve_init.rs b/src/serve_init.rs index 9e31890..16c8b00 100644 --- a/src/serve_init.rs +++ b/src/serve_init.rs @@ -11,8 +11,7 @@ use zeroize::Zeroize; use crate::{db, jose}; use crate::db::Key; use crate::do_response; -use crate::serve_common; -use crate::serve_common::Result; +use crate::serve_common::{self, Result}; pub async fn init(req: Request) -> Result> { do_response!(inner_init(req).await) diff --git a/src/serve_read_write.rs b/src/serve_read_write.rs index c820ca4..320565c 100644 --- a/src/serve_read_write.rs +++ b/src/serve_read_write.rs @@ -7,9 +7,7 @@ use serde_json::{json, Value}; use crate::{db, jose}; use crate::db::Key; use crate::do_response; -use crate::serve_common::{byte_to_multi_view_map, get_master_key, MultipleViewValue, open_local_db}; -use crate::serve_common; -use crate::serve_common::Result; +use crate::serve_common::{self, byte_to_multi_view_map, get_master_key, MultipleViewValue, open_local_db, Result}; #[derive(Serialize, Deserialize)] struct Named { diff --git a/src/serve_status.rs b/src/serve_status.rs index b4f48cb..670c8e0 100644 --- a/src/serve_status.rs +++ b/src/serve_status.rs @@ -3,8 +3,7 @@ use rust_util::XResult; use serde_json::{json, Value}; use crate::do_response; -use crate::serve_common; -use crate::serve_common::Result; +use crate::serve_common::{self, Result}; pub async fn status() -> Result> { do_response!(inner_status().await)