vw_small

commit 93c881a7a9abf30c1d2cfea961d5637de2757b86
parent 0af3956abd2ff9b550130716e41fc14088dac84c
Author: Jake Howard <git@theorangeone.net>
Date:   Wed, 31 Mar 2021 21:45:05 +0100

Reflow some lines manually

Diffstat:
M
src/api/admin.rs
 | 
8
++++++--
M
src/api/core/ciphers.rs
 | 
5
+----
M
src/api/core/two_factor/authenticator.rs
 | 
6
+-----
M
src/db/models/org_policy.rs
 | 
2
+-

4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/api/admin.rs b/src/api/admin.rs
@@ -142,8 +142,12 @@ fn admin_url(referer: Referer) -> String {
 fn admin_login(flash: Option<FlashMessage>) -> ApiResult<Html<String>> {
     // If there is an error, show it
     let msg = flash.map(|msg| format!("{}: {}", msg.name(), msg.msg()));
-    let json =
-        json!({"page_content": "admin/login", "version": VERSION, "error": msg, "urlpath": CONFIG.domain_path()});
+    let json = json!({
+        "page_content": "admin/login",
+        "version": VERSION,
+        "error": msg,
+        "urlpath": CONFIG.domain_path()
+    });
 
     // Return the page
     let text = CONFIG.render_template(BASE_TEMPLATE, &json)?;
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
@@ -281,10 +281,7 @@ fn enforce_personal_ownership_policy(data: &CipherData, headers: &Headers, conn:
         let user_uuid = &headers.user.uuid;
         let policy_type = OrgPolicyType::PersonalOwnership;
         if OrgPolicy::is_applicable_to_user(user_uuid, policy_type, conn) {
-            err!(
-                "Due to an Enterprise Policy, you are restricted from \
-                  saving items to your personal vault."
-            )
+            err!("Due to an Enterprise Policy, you are restricted from saving items to your personal vault.")
         }
     }
     Ok(())
diff --git a/src/api/core/two_factor/authenticator.rs b/src/api/core/two_factor/authenticator.rs
@@ -141,11 +141,7 @@ pub fn validate_totp_code(user_uuid: &str, totp_code: u64, secret: &str, ip: &Cl
     // The amount of steps back and forward in time
     // Also check if we need to disable time drifted TOTP codes.
     // If that is the case, we set the steps to 0 so only the current TOTP is valid.
-    let steps: i64 = if CONFIG.authenticator_disable_time_drift() {
-        0
-    } else {
-        1
-    };
+    let steps = !CONFIG.authenticator_disable_time_drift() as i64;
 
     for step in -steps..=steps {
         let time_step = current_timestamp / 30i64 + step;
diff --git a/src/db/models/org_policy.rs b/src/db/models/org_policy.rs
@@ -174,8 +174,8 @@ impl OrgPolicy {
     /// and the user is not an owner or admin of that org. This is only useful for checking
     /// applicability of policy types that have these particular semantics.
     pub fn is_applicable_to_user(user_uuid: &str, policy_type: OrgPolicyType, conn: &DbConn) -> bool {
+        // Returns confirmed users only.
         for policy in OrgPolicy::find_by_user(user_uuid, conn) {
-            // Returns confirmed users only.
             if policy.enabled && policy.has_type(policy_type) {
                 let org_uuid = &policy.org_uuid;
                 if let Some(user) = UserOrganization::find_by_user_and_org(user_uuid, org_uuid, conn) {