Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-13 20:21:22 +01:00
Code Issues Projects Releases Wiki Activity

added use 2fa to org edit

Browse Source
This commit is contained in:
Kyle Spearrin 2018-04-20 16:37:17 -04:00
parent 699a2eec0e
commit 8e98e489ab
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Admin/Models/OrganizationEditModel.cs
View File

@ -35,6 +35,7 @@ namespace Bit.Admin.Models
UseDirectory = org.UseDirectory; UseDirectory = org.UseDirectory;
UseEvents = org.UseEvents; UseEvents = org.UseEvents;
UseTotp = org.UseTotp; UseTotp = org.UseTotp;
Use2fa = org.Use2fa;
SelfHost = org.SelfHost; SelfHost = org.SelfHost;
UsersGetPremium = org.UsersGetPremium; UsersGetPremium = org.UsersGetPremium;
MaxStorageGb = org.MaxStorageGb; MaxStorageGb = org.MaxStorageGb;
@ -86,6 +87,8 @@ namespace Bit.Admin.Models
[Display(Name = "TOTP")] [Display(Name = "TOTP")]
public bool UseTotp { get; set; } public bool UseTotp { get; set; }
[Display(Name = "Self Host")] [Display(Name = "Self Host")]
public bool Use2fa { get; set; }
[Display(Name = "2FA")]
public bool SelfHost { get; set; } public bool SelfHost { get; set; }
[Display(Name = "Users Get Premium")] [Display(Name = "Users Get Premium")]
public bool UsersGetPremium { get; set; } public bool UsersGetPremium { get; set; }
@ -122,6 +125,7 @@ namespace Bit.Admin.Models
existingOrganization.UseDirectory = UseDirectory; existingOrganization.UseDirectory = UseDirectory;
existingOrganization.UseEvents = UseEvents; existingOrganization.UseEvents = UseEvents;
existingOrganization.UseTotp = UseTotp; existingOrganization.UseTotp = UseTotp;
existingOrganization.Use2fa = Use2fa;
existingOrganization.SelfHost = SelfHost; existingOrganization.SelfHost = SelfHost;
existingOrganization.UsersGetPremium = UsersGetPremium; existingOrganization.UsersGetPremium = UsersGetPremium;
existingOrganization.MaxStorageGb = MaxStorageGb; existingOrganization.MaxStorageGb = MaxStorageGb;

5
src/Admin/Views/Organizations/Edit.cshtml
View File

@ -26,6 +26,7 @@
document.getElementById('@(nameof(Model.UseEvents))').checked = true; document.getElementById('@(nameof(Model.UseEvents))').checked = true;
document.getElementById('@(nameof(Model.UsersGetPremium))').checked = true; document.getElementById('@(nameof(Model.UsersGetPremium))').checked = true;
document.getElementById('@(nameof(Model.UseTotp))').checked = true; document.getElementById('@(nameof(Model.UseTotp))').checked = true;
document.getElementById('@(nameof(Model.Use2fa))').checked = true;
document.getElementById('@(nameof(Model.SelfHost))').checked = true; document.getElementById('@(nameof(Model.SelfHost))').checked = true;
// Licensing // Licensing
document.getElementById('@(nameof(Model.LicenseKey))').value = '@Model.RandomLicenseKey'; document.getElementById('@(nameof(Model.LicenseKey))').value = '@Model.RandomLicenseKey';
@ -429,6 +430,10 @@
<input type="checkbox" class="form-check-input" asp-for="SelfHost"> <input type="checkbox" class="form-check-input" asp-for="SelfHost">
<label class="form-check-label" asp-for="SelfHost"></label> <label class="form-check-label" asp-for="SelfHost"></label>
</div> </div>
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="Use2fa">
<label class="form-check-label" asp-for="Use2fa"></label>
</div>
<div class="form-check"> <div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="UseGroups"> <input type="checkbox" class="form-check-input" asp-for="UseGroups">
<label class="form-check-label" asp-for="UseGroups"></label> <label class="form-check-label" asp-for="UseGroups"></label>