From 32dfd25f570b7a55bf43752684d286be0f6b2dc2 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Thu, 16 May 2024 17:38:34 +0200 Subject: format + WIP calendar-query --- aero-user/src/config.rs | 1 - aero-user/src/login/ldap_provider.rs | 2 +- aero-user/src/storage/in_memory.rs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'aero-user') diff --git a/aero-user/src/config.rs b/aero-user/src/config.rs index 44b1239..cea4520 100644 --- a/aero-user/src/config.rs +++ b/aero-user/src/config.rs @@ -11,7 +11,6 @@ pub struct CompanionConfig { pub pid: Option, pub imap: ImapUnsecureConfig, // @FIXME Add DAV - #[serde(flatten)] pub users: LoginStaticConfig, } diff --git a/aero-user/src/login/ldap_provider.rs b/aero-user/src/login/ldap_provider.rs index ca5a356..22b301e 100644 --- a/aero-user/src/login/ldap_provider.rs +++ b/aero-user/src/login/ldap_provider.rs @@ -2,9 +2,9 @@ use async_trait::async_trait; use ldap3::{LdapConnAsync, Scope, SearchEntry}; use log::debug; +use super::*; use crate::config::*; use crate::storage; -use super::*; pub struct LdapLoginProvider { ldap_server: String, diff --git a/aero-user/src/storage/in_memory.rs b/aero-user/src/storage/in_memory.rs index 9ef2721..5c8eb26 100644 --- a/aero-user/src/storage/in_memory.rs +++ b/aero-user/src/storage/in_memory.rs @@ -2,7 +2,7 @@ use std::collections::BTreeMap; use std::ops::Bound::{self, Excluded, Included, Unbounded}; use std::sync::RwLock; -use sodiumoxide::{hex, crypto::hash}; +use sodiumoxide::{crypto::hash, hex}; use tokio::sync::Notify; use crate::storage::*; -- cgit v1.2.3