Skip to content

[PM-32594] Add authorization to admin-initiated sponsorship endpoints #7095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cturnbull-bitwarden wants to merge 4 commits into
base: main
Choose a base branch
from
+451 βˆ’6
Open

[PM-32594] Add authorization to admin-initiated sponsorship endpoints #7095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95812d7
Add authorization to admin-initiated sponsorship endpoints
cturnbull-bitwarden Feb 26, 2026
f331a18
`dotnet format`
cturnbull-bitwarden Feb 26, 2026
b171613
Merge branch 'main' into billing/PM-32594-sponsorships-revoke-vulnera…
cturnbull-bitwarden Feb 27, 2026
53a7d7b
Merge branch 'main' into billing/PM-32594-sponsorships-revoke-vulnera…
cturnbull-bitwarden Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ο»Ώ// FIXME: Update this file to be null safe and then delete the line below
#nullable disable

using Bit.Api.AdminConsole.Authorization;
using Bit.Api.AdminConsole.Authorization.Requirements;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response;
using Bit.Api.Models.Response.Organizations;
Expand Down Expand Up @@ -104,9 +106,10 @@ await _organizationUserRepository.GetByOrganizationAsync(sponsoringOrgId, _curre
}

[Authorize("Application")]
[HttpPost("{sponsoringOrgId}/families-for-enterprise/resend")]
[Authorize<ManageUsersRequirement>]
[HttpPost("{organizationId}/families-for-enterprise/resend")]
[SelfHosted(NotSelfHostedOnly = true)]
public async Task ResendSponsorshipOffer(Guid sponsoringOrgId, [FromQuery] string sponsoredFriendlyName)
public async Task ResendSponsorshipOffer([FromRoute(Name = "organizationId")] Guid sponsoringOrgId, [FromQuery] string sponsoredFriendlyName)
{
var freeFamiliesSponsorshipPolicy = await _policyQuery.RunAsync(sponsoringOrgId,
PolicyType.FreeFamiliesSponsorshipPolicy);
Expand Down Expand Up @@ -221,9 +224,10 @@ public async Task PostRevokeSponsorship(Guid sponsoringOrganizationId)
}

[Authorize("Application")]
[HttpDelete("{sponsoringOrgId}/{sponsoredFriendlyName}/revoke")]
[Authorize<ManageUsersRequirement>]
[HttpDelete("{organizationId}/{sponsoredFriendlyName}/revoke")]
[SelfHosted(NotSelfHostedOnly = true)]
public async Task AdminInitiatedRevokeSponsorshipAsync(Guid sponsoringOrgId, string sponsoredFriendlyName)
public async Task AdminInitiatedRevokeSponsorshipAsync([FromRoute(Name = "organizationId")] Guid sponsoringOrgId, string sponsoredFriendlyName)
{
var sponsorships = await _organizationSponsorshipRepository.GetManyBySponsoringOrganizationAsync(sponsoringOrgId);
var existingOrgSponsorship = sponsorships.FirstOrDefault(s => s.FriendlyName != null && s.FriendlyName.Equals(sponsoredFriendlyName, StringComparison.OrdinalIgnoreCase));
Expand Down
6 changes: 4 additions & 2 deletions src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ο»Ώ// FIXME: Update this file to be null safe and then delete the line below
#nullable disable

using Bit.Api.AdminConsole.Authorization;
using Bit.Api.AdminConsole.Authorization.Requirements;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response;
Expand Down Expand Up @@ -88,8 +89,9 @@ public async Task PostRevokeSponsorship(Guid sponsoringOrgId)
await RevokeSponsorship(sponsoringOrgId);
}

[HttpDelete("{sponsoringOrgId}/{sponsoredFriendlyName}/revoke")]
public async Task AdminInitiatedRevokeSponsorshipAsync(Guid sponsoringOrgId, string sponsoredFriendlyName)
[Authorize<ManageUsersRequirement>]
[HttpDelete("{organizationId}/{sponsoredFriendlyName}/revoke")]
public async Task AdminInitiatedRevokeSponsorshipAsync([FromRoute(Name = "organizationId")] Guid sponsoringOrgId, string sponsoredFriendlyName)
{
var sponsorships = await _organizationSponsorshipRepository.GetManyBySponsoringOrganizationAsync(sponsoringOrgId);
var existingOrgSponsorship = sponsorships.FirstOrDefault(s => s.FriendlyName != null && s.FriendlyName.Equals(sponsoredFriendlyName, StringComparison.OrdinalIgnoreCase));
Expand Down
Loading
Loading