From f747bf126bf1bf8ef7c3c362249d0d37e4790706 Mon Sep 17 00:00:00 2001 From: BlackDex Date: Wed, 11 Jan 2023 22:13:20 +0100 Subject: [PATCH] Add MFA icon to org member overview The Organization member overview supports showing an icon if the user has MFA enabled or not. This PR adds this feature. This is very useful if you want to enable force mfa for example. --- src/db/models/organization.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs index a2ab75a7..331e1007 100644 --- a/src/db/models/organization.rs +++ b/src/db/models/organization.rs @@ -2,7 +2,7 @@ use num_traits::FromPrimitive; use serde_json::Value; use std::cmp::Ordering; -use super::{CollectionUser, GroupUser, OrgPolicy, OrgPolicyType, User}; +use super::{CollectionUser, GroupUser, OrgPolicy, OrgPolicyType, TwoFactor, User}; use crate::CONFIG; db_object! { @@ -365,6 +365,8 @@ impl UserOrganization { self.status }; + let twofactor_enabled = !TwoFactor::find_by_user(&user.uuid, conn).await.is_empty(); + json!({ "Id": self.uuid, "UserId": self.user_uuid, @@ -374,6 +376,7 @@ impl UserOrganization { "Status": status, "Type": self.atype, "AccessAll": self.access_all, + "TwoFactorEnabled": twofactor_enabled, "Object": "organizationUserUserDetails", })