commit 632f4d545367b5ab1cefce66bc526e5dc0a786de
parent 6c5e35ce5c549b82629350dfe9f56f21dc2bc27e
Author: theycallmesteve <59837464+theycallmesteve@users.noreply.github.com>
Date: Thu, 7 May 2020 18:02:37 -0400
Whitespace fixes
Diffstat:
5 files changed, 5 insertions(+), 10 deletions(-)
diff --git 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/<uuid>/attachment/<attachment_id>/share",
- format = "multipart/form-data",
- data = "<data>"
-)]
+#[post("/ciphers/<uuid>/attachment/<attachment_id>/share", format = "multipart/form-data", 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
@@ -20,6 +20,7 @@ pub fn routes() -> Vec<Route> {
activate_authenticator_put,
]
}
+
#[post("/two-factor/get-authenticator", data = "<data>")]
fn generate_authenticator(data: JsonUpcase<PasswordData>, headers: Headers, conn: DbConn) -> JsonResult {
let data: PasswordData = data.into_inner().data;
diff --git 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
@@ -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
@@ -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,