nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 09:02:48 -05:00
Code Activity

[Reset Password] Organization Key Pair (#1292)

Browse Source 
* [Reset Password] Organization Key Pair

* Fixed type in Organization_ReadAbilites sproc

* Fixed broken unit test by making sure premium addon was false

* Updated PublicKey decorator and removed unecessary validation
This commit is contained in:
Vincent Salucci
2021-05-06 14:53:12 -05:00
committed by GitHub
parent cae204cb7c
commit 70ab5b25a1
26 changed files with 535 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Core/Models/Business/OrganizationLicense.cs
View File

@ -20,7 +20,7 @@ namespace Bit.Core.Models.Business
public OrganizationLicense(Organization org, SubscriptionInfo subscriptionInfo, Guid installationId,
ILicensingService licenseService, int? version = null)
{
Version = version.GetValueOrDefault(6); // TODO: bump to version 7
Version = version.GetValueOrDefault(7); // TODO: bump to version 8
LicenseKey = org.LicenseKey;
InstallationId = installationId;
Id = org.Id;
@ -40,6 +40,7 @@ namespace Bit.Core.Models.Business
UseTotp = org.UseTotp;
Use2fa = org.Use2fa;
UseApi = org.UseApi;
UseResetPassword = org.UseResetPassword;
MaxStorageGb = org.MaxStorageGb;
SelfHost = org.SelfHost;
UsersGetPremium = org.UsersGetPremium;
@ -109,6 +110,7 @@ namespace Bit.Core.Models.Business
public bool UseTotp { get; set; }
public bool Use2fa { get; set; }
public bool UseApi { get; set; }
public bool UseResetPassword { get; set; }
public short? MaxStorageGb { get; set; }
public bool SelfHost { get; set; }
public bool UsersGetPremium { get; set; }
@ -125,7 +127,7 @@ namespace Bit.Core.Models.Business
public byte[] GetDataBytes(bool forHash = false)
{
string data = null;
if (Version >= 1 && Version <= 7)
if (Version >= 1 && Version <= 8)
{
var props = typeof(OrganizationLicense)
.GetProperties(BindingFlags.Public | BindingFlags.Instance)
@ -144,6 +146,8 @@ namespace Bit.Core.Models.Business
(Version >= 6 || !p.Name.Equals(nameof(UsePolicies))) &&
// UseSso was added in Version 7
(Version >= 7 || !p.Name.Equals(nameof(UseSso))) &&
// UseResetPassword was added in Version 8
(Version >= 8 || !p.Name.Equals(nameof(UseResetPassword))) &&
(
!forHash ||
(
@ -180,7 +184,7 @@ namespace Bit.Core.Models.Business
return false;
}
if (Version >= 1 && Version <= 7)
if (Version >= 1 && Version <= 8)
{
return InstallationId == globalSettings.Installation.Id && SelfHost;
}
@ -197,7 +201,7 @@ namespace Bit.Core.Models.Business
return false;
}
if (Version >= 1 && Version <= 7)
if (Version >= 1 && Version <= 8)
{
var valid =
globalSettings.Installation.Id == InstallationId &&
@ -241,6 +245,11 @@ namespace Bit.Core.Models.Business
{
valid = organization.UseSso == UseSso;
}
if (valid && Version >= 8)
{
valid = organization.UseResetPassword == UseResetPassword;
}
return valid;
}