bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-01 16:13:33 +00:00
Code Issues Releases Wiki Activity

[PM-21257] Revert MaxProjects license changes, limit MaxProjectsQuery to cloud-only for 2-person organizations (#5776)

Browse Source 
* Revert "Add SmMaxProjects to OrganizationLicense (#5678)"

This reverts commit 7fe022e26f.

* Use PricingClient in MaxProjectsQuery and limit to cloud-only (free 2-person)
This commit is contained in:
Alex Morask
2025-05-13 08:51:36 -04:00
committed by GitHub
parent a1b22e66e5
commit 082bfa3c6a
10 changed files with 38 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Services/ILicensingService.cs
View File

@@ -21,8 +21,7 @@ public interface ILicensingService
Task<string?> CreateOrganizationTokenAsync(
Organization organization,
Guid installationId,
SubscriptionInfo subscriptionInfo,
int? smMaxProjects);
SubscriptionInfo subscriptionInfo);
Task<string?> CreateUserTokenAsync(User user, SubscriptionInfo subscriptionInfo);
}

3
src/Core/Services/Implementations/LicensingService.cs
View File

@@ -339,13 +339,12 @@ public class LicensingService : ILicensingService
}
}
public async Task<string> CreateOrganizationTokenAsync(Organization organization, Guid installationId, SubscriptionInfo subscriptionInfo, int? smMaxProjects)
public async Task<string> CreateOrganizationTokenAsync(Organization organization, Guid installationId, SubscriptionInfo subscriptionInfo)
{
var licenseContext = new LicenseContext
{
InstallationId = installationId,
SubscriptionInfo = subscriptionInfo,
SmMaxProjects = smMaxProjects
};
var claims = await _organizationLicenseClaimsFactory.GenerateClaims(organization, licenseContext);

2
src/Core/Services/NoopImplementations/NoopLicensingService.cs
View File

@@ -62,7 +62,7 @@ public class NoopLicensingService : ILicensingService
return null;
}
public Task<string?> CreateOrganizationTokenAsync(Organization organization, Guid installationId, SubscriptionInfo subscriptionInfo, int? smMaxProjects)
public Task<string?> CreateOrganizationTokenAsync(Organization organization, Guid installationId, SubscriptionInfo subscriptionInfo)
{
return Task.FromResult<string?>(null);
}