diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs index 482bfe6..93e0678 100644 --- a/src/api/core/ciphers.rs +++ b/src/api/core/ciphers.rs @@ -767,11 +767,7 @@ fn post_attachment_admin( post_attachment(uuid, data, content_type, headers, conn, nt) } -#[post( - "/ciphers//attachment//share", - format = "multipart/form-data", - data = "" -)] +#[post("/ciphers//attachment//share", format = "multipart/form-data", data = "")] fn post_attachment_share( uuid: String, attachment_id: String, diff --git a/src/api/core/two_factor/authenticator.rs b/src/api/core/two_factor/authenticator.rs index f47d63b..d9e8f49 100644 --- a/src/api/core/two_factor/authenticator.rs +++ b/src/api/core/two_factor/authenticator.rs @@ -20,6 +20,7 @@ pub fn routes() -> Vec { activate_authenticator_put, ] } + #[post("/two-factor/get-authenticator", data = "")] fn generate_authenticator(data: JsonUpcase, headers: Headers, conn: DbConn) -> JsonResult { let data: PasswordData = data.into_inner().data; diff --git a/src/config.rs b/src/config.rs index db6ce05..7c918ec 100644 --- a/src/config.rs +++ b/src/config.rs @@ -135,7 +135,6 @@ macro_rules! make_config { (inner._env.build(), inner.config.clone()) }; - fn _get_form_type(rust_type: &str) -> &'static str { match rust_type { "Pass" => "password", diff --git a/src/db/models/device.rs b/src/db/models/device.rs index 530df44..8b6bf2c 100644 --- a/src/db/models/device.rs +++ b/src/db/models/device.rs @@ -77,7 +77,6 @@ impl Device { let orguser: Vec<_> = orgs.iter().filter(|o| o.atype == 2).map(|o| o.org_uuid.clone()).collect(); let orgmanager: Vec<_> = orgs.iter().filter(|o| o.atype == 3).map(|o| o.org_uuid.clone()).collect(); - // Create the JWT claims struct, to send to the client use crate::auth::{encode_jwt, LoginJWTClaims, DEFAULT_VALIDITY, JWT_LOGIN_ISSUER}; let claims = LoginJWTClaims { diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs index 1fb94a7..4ff0c56 100644 --- a/src/db/models/organization.rs +++ b/src/db/models/organization.rs @@ -165,9 +165,9 @@ impl Organization { "UsePolicies": true, "BusinessName": null, - "BusinessAddress1": null, - "BusinessAddress2": null, - "BusinessAddress3": null, + "BusinessAddress1": null, + "BusinessAddress2": null, + "BusinessAddress3": null, "BusinessCountry": null, "BusinessTaxNumber": null,