mirror of
https://github.com/bitwarden/server.git
synced 2025-07-01 08:02:49 -05:00
[AC-1650] [AC-1578] (#3320)
* Upgraded old 2019 plans to have the same features as 2020 and beyond * Removed redundant test and moved additional test cases to GetByOrgIdAsync_SmNoneFreePlans_ReturnsNull * Fixed issue where feature flag wasn't returning correct plans * Resolved issue where getting plans would return a value that LINQ previously cached when feature flag was in a different state --------- Co-authored-by: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
This commit is contained in:
@ -98,14 +98,6 @@ public class PolicyService : IPolicyService
|
||||
await DependsOnSingleOrgAsync(org);
|
||||
}
|
||||
break;
|
||||
|
||||
// Activate Autofill is only available to Enterprise 2020-current plans
|
||||
case PolicyType.ActivateAutofill:
|
||||
if (policy.Enabled)
|
||||
{
|
||||
LockedTo2020Plan(org);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
@ -274,14 +266,6 @@ public class PolicyService : IPolicyService
|
||||
}
|
||||
}
|
||||
|
||||
private void LockedTo2020Plan(Organization org)
|
||||
{
|
||||
if (org.PlanType != PlanType.EnterpriseAnnually && org.PlanType != PlanType.EnterpriseMonthly)
|
||||
{
|
||||
throw new BadRequestException("This policy is only available to 2020 Enterprise plans.");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task RequiredBySsoTrustedDeviceEncryptionAsync(Organization org)
|
||||
{
|
||||
var ssoConfig = await _ssoConfigRepository.GetByOrganizationIdAsync(org.Id);
|
||||
|
Reference in New Issue
Block a user