octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-23 11:29:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'BlackDex-add-mfa-icon-to-orgs'

Browse Source
This commit is contained in:
Daniel García 2023-01-12 19:16:16 +01:00
commit ae9553ca1c
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/db/models/organization.rs
View File

@ -2,7 +2,7 @@ use num_traits::FromPrimitive;
use serde_json::Value; use serde_json::Value;
use std::cmp::Ordering; use std::cmp::Ordering;
use super::{CollectionUser, GroupUser, OrgPolicy, OrgPolicyType, User}; use super::{CollectionUser, GroupUser, OrgPolicy, OrgPolicyType, TwoFactor, User};
use crate::CONFIG; use crate::CONFIG;
db_object! { db_object! {
@ -365,6 +365,8 @@ impl UserOrganization {
self.status self.status
}; };
let twofactor_enabled = !TwoFactor::find_by_user(&user.uuid, conn).await.is_empty();
json!({ json!({
"Id": self.uuid, "Id": self.uuid,
"UserId": self.user_uuid, "UserId": self.user_uuid,
@ -374,6 +376,7 @@ impl UserOrganization {
"Status": status, "Status": status,
"Type": self.atype, "Type": self.atype,
"AccessAll": self.access_all, "AccessAll": self.access_all,
"TwoFactorEnabled": twofactor_enabled,
"Object": "organizationUserUserDetails", "Object": "organizationUserUserDetails",
}) })