saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-13 12:05:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some clippy lints and changed update_uuid_revision to only use one db query

Browse Source
This commit is contained in:
Daniel García
2019-02-08 18:45:07 +01:00
parent ef63342e20
commit 8b4a6f2a64
8 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/core/organizations.rs
View File

@@ -452,7 +452,7 @@ where
D: Deserializer<'de>,
{
// Deserialize null to empty Vec
Deserialize::deserialize(deserializer).or(Ok(vec![]))
Deserialize::deserialize(deserializer).or_else(|_| Ok(vec![]))
}
#[derive(Deserialize)]
@@ -486,9 +486,10 @@ fn send_invite(org_id: String, data: JsonUpcase<InviteData>, headers: AdminHeade
}
for email in data.Emails.iter() {
let mut user_org_status = match CONFIG.mail_enabled() {
true => UserOrgStatus::Invited as i32,
false => UserOrgStatus::Accepted as i32, // Automatically mark user as accepted if no email invites
let mut user_org_status = if CONFIG.mail_enabled() {
UserOrgStatus::Invited as i32
} else {
UserOrgStatus::Accepted as i32 // Automatically mark user as accepted if no email invites
};
let user = match User::find_by_mail(&email, &conn) {
None => {