Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-29 13:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Add is sponsored item to subscription response

Browse Source
This commit is contained in:
Matt Gibson 2021-11-10 18:05:31 -05:00 committed by Justin Baur
parent 3d28ae1547
commit be6ab1883c
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Api/Controllers/OrganizationSponsorshipsController.cs
View File

@ -158,10 +158,15 @@ namespace Bit.Api.Controllers
var existingOrgSponsorship = await _organizationSponsorshipRepository var existingOrgSponsorship = await _organizationSponsorshipRepository
.GetBySponsoringOrganizationUserIdAsync(orgUser.Id); .GetBySponsoringOrganizationUserIdAsync(orgUser.Id);
if (existingOrgSponsorship == null || existingOrgSponsorship.SponsoredOrganizationId == null) if (existingOrgSponsorship == null)
{ {
throw new BadRequestException("You are not currently sponsoring an organization."); throw new BadRequestException("You are not currently sponsoring an organization.");
} }
if (existingOrgSponsorship.SponsoredOrganizationId == null)
{
await _organizationSponsorshipRepository.DeleteAsync(existingOrgSponsorship);
return;
}
var sponsoredOrganization = await _organizationRepository var sponsoredOrganization = await _organizationRepository
.GetByIdAsync(existingOrgSponsorship.SponsoredOrganizationId.Value); .GetByIdAsync(existingOrgSponsorship.SponsoredOrganizationId.Value);

2
src/Core/Models/Api/Response/SubscriptionResponseModel.cs
View File

@ -82,12 +82,14 @@ namespace Bit.Core.Models.Api
Amount = item.Amount; Amount = item.Amount;
Interval = item.Interval; Interval = item.Interval;
Quantity = item.Quantity; Quantity = item.Quantity;
SponsoredSubscriptionItem = item.SponsoredSubscriptionItem;
} }
public string Name { get; set; } public string Name { get; set; }
public decimal Amount { get; set; } public decimal Amount { get; set; }
public int Quantity { get; set; } public int Quantity { get; set; }
public string Interval { get; set; } public string Interval { get; set; }
public bool SponsoredSubscriptionItem { get; set; }
} }
} }

2
src/Core/Models/Business/SubscriptionInfo.cs
View File

@ -52,12 +52,14 @@ namespace Bit.Core.Models.Business
} }
Quantity = (int)item.Quantity; Quantity = (int)item.Quantity;
SponsoredSubscriptionItem = Utilities.StaticStore.SponsoredPlans.Any(p => p.StripePlanId == item.Plan.Id);
} }
public string Name { get; set; } public string Name { get; set; }
public decimal Amount { get; set; } public decimal Amount { get; set; }
public int Quantity { get; set; } public int Quantity { get; set; }
public string Interval { get; set; } public string Interval { get; set; }
public bool SponsoredSubscriptionItem { get; set; }
} }
} }

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

@ -198,8 +198,7 @@ namespace Bit.Core.Services
var sponsoredPlan = Utilities.StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value); var sponsoredPlan = Utilities.StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value);
var subscriptionUpdate = new SponsorOrganizationSubscriptionUpdate(existingPlan, sponsoredPlan, applySponsorship); var subscriptionUpdate = new SponsorOrganizationSubscriptionUpdate(existingPlan, sponsoredPlan, applySponsorship);
var prorationTime = DateTime.UtcNow; await FinalizeSubscriptionChangeAsync(org, subscriptionUpdate, DateTime.UtcNow);
await FinalizeSubscriptionChangeAsync(org, subscriptionUpdate, prorationTime);
var sub = await _stripeAdapter.SubscriptionGetAsync(org.GatewaySubscriptionId); var sub = await _stripeAdapter.SubscriptionGetAsync(org.GatewaySubscriptionId);
org.ExpirationDate = sub.CurrentPeriodEnd; org.ExpirationDate = sub.CurrentPeriodEnd;

6
test/Api.Test/Controllers/OrganizationSponsorshipsControllerTests.cs
View File

@ -393,10 +393,10 @@ namespace Bit.Api.Test.Controllers
.GetBySponsoringOrganizationUserIdAsync(orgUser.Id) .GetBySponsoringOrganizationUserIdAsync(orgUser.Id)
.Returns((OrganizationSponsorship)sponsorship); .Returns((OrganizationSponsorship)sponsorship);
var exception = await Assert.ThrowsAsync<BadRequestException>(() => await sutProvider.Sut.RevokeSponsorship(orgUser.OrganizationId.ToString());
sutProvider.Sut.RevokeSponsorship(orgUser.OrganizationId.ToString()));
await sutProvider.GetDependency<IOrganizationSponsorshipRepository>().Received(1).DeleteAsync(sponsorship);
Assert.Contains("You are not currently sponsoring an organization.", exception.Message);
await sutProvider.GetDependency<IOrganizationSponsorshipService>() await sutProvider.GetDependency<IOrganizationSponsorshipService>()
.DidNotReceiveWithAnyArgs() .DidNotReceiveWithAnyArgs()
.RemoveSponsorshipAsync(default, default); .RemoveSponsorshipAsync(default, default);