diff --git a/src/Admin/Models/OrganizationEditModel.cs b/src/Admin/Models/OrganizationEditModel.cs index fbf5b27b3f..918e2dcc0f 100644 --- a/src/Admin/Models/OrganizationEditModel.cs +++ b/src/Admin/Models/OrganizationEditModel.cs @@ -35,6 +35,7 @@ namespace Bit.Admin.Models UseDirectory = org.UseDirectory; UseEvents = org.UseEvents; UseTotp = org.UseTotp; + Use2fa = org.Use2fa; SelfHost = org.SelfHost; UsersGetPremium = org.UsersGetPremium; MaxStorageGb = org.MaxStorageGb; @@ -86,6 +87,8 @@ namespace Bit.Admin.Models [Display(Name = "TOTP")] public bool UseTotp { get; set; } [Display(Name = "Self Host")] + public bool Use2fa { get; set; } + [Display(Name = "2FA")] public bool SelfHost { get; set; } [Display(Name = "Users Get Premium")] public bool UsersGetPremium { get; set; } @@ -122,6 +125,7 @@ namespace Bit.Admin.Models existingOrganization.UseDirectory = UseDirectory; existingOrganization.UseEvents = UseEvents; existingOrganization.UseTotp = UseTotp; + existingOrganization.Use2fa = Use2fa; existingOrganization.SelfHost = SelfHost; existingOrganization.UsersGetPremium = UsersGetPremium; existingOrganization.MaxStorageGb = MaxStorageGb; diff --git a/src/Admin/Views/Organizations/Edit.cshtml b/src/Admin/Views/Organizations/Edit.cshtml index 1d454d8d94..ade1f5bac9 100644 --- a/src/Admin/Views/Organizations/Edit.cshtml +++ b/src/Admin/Views/Organizations/Edit.cshtml @@ -26,6 +26,7 @@ document.getElementById('@(nameof(Model.UseEvents))').checked = true; document.getElementById('@(nameof(Model.UsersGetPremium))').checked = true; document.getElementById('@(nameof(Model.UseTotp))').checked = true; + document.getElementById('@(nameof(Model.Use2fa))').checked = true; document.getElementById('@(nameof(Model.SelfHost))').checked = true; // Licensing document.getElementById('@(nameof(Model.LicenseKey))').value = '@Model.RandomLicenseKey'; @@ -429,6 +430,10 @@ +