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

validate organization licenses

Browse Source
This commit is contained in:
Kyle Spearrin
2017-08-17 00:12:11 -04:00
parent 127ff2d361
commit 4585af5a85
9 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@ namespace Bit.Core.Models.Business
}
}
public bool CanUse(Guid installationId)
public bool CanUse(GlobalSettings globalSettings)
{
if(!Enabled || Issued > DateTime.UtcNow || Expires < DateTime.UtcNow)
{
@ -149,7 +149,7 @@ namespace Bit.Core.Models.Business
if(Version == 1)
{
return InstallationId == installationId && SelfHost;
return InstallationId == globalSettings.Installation.Id && SelfHost;
}
else
{
@ -157,7 +157,7 @@ namespace Bit.Core.Models.Business
}
}
public bool VerifyData(Organization organization)
public bool VerifyData(Organization organization, GlobalSettings globalSettings)
{
if(Issued > DateTime.UtcNow || Expires < DateTime.UtcNow)
{
@ -167,6 +167,7 @@ namespace Bit.Core.Models.Business
if(Version == 1)
{
return
globalSettings.Installation.Id == InstallationId &&
organization.LicenseKey.Equals(LicenseKey) &&
organization.Enabled == Enabled &&
organization.PlanType == PlanType &&
@ -175,7 +176,8 @@ namespace Bit.Core.Models.Business
organization.UseGroups == UseGroups &&
organization.UseDirectory == UseDirectory &&
organization.UseTotp == UseTotp &&
organization.SelfHost == SelfHost;
organization.SelfHost == SelfHost &&
organization.Name.Equals(Name);
}
else
{