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

Add product type to organization details

Browse Source
This commit is contained in:
Matt Gibson
2021-11-09 21:12:27 -05:00
committed by Justin Baur
parent 76c5ddb611
commit a2467ea6ea
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ namespace Bit.Core.Models.Api
FamilySponsorshipAvailable = FamilySponsorshipFriendlyName == null && FamilySponsorshipAvailable = FamilySponsorshipFriendlyName == null &&
Utilities.StaticStore.GetSponsoredPlan(PlanSponsorshipType.FamiliesForEnterprise) Utilities.StaticStore.GetSponsoredPlan(PlanSponsorshipType.FamiliesForEnterprise)
.UsersCanSponsor(organization); .UsersCanSponsor(organization);
PlanProductType = Utilities.StaticStore.GetPlan(organization.PlanType).Product;
} }
public string Id { get; set; } public string Id { get; set; }
@ -74,5 +75,6 @@ namespace Bit.Core.Models.Api
public string ProviderName { get; set; } public string ProviderName { get; set; }
public string FamilySponsorshipFriendlyName { get; set; } public string FamilySponsorshipFriendlyName { get; set; }
public bool FamilySponsorshipAvailable { get; set; } public bool FamilySponsorshipAvailable { get; set; }
public ProductType PlanProductType { get; set; }
} }
} }

4
src/Core/Services/Implementations/OrganizationSponsorshipService.cs
View File

@ -40,10 +40,10 @@ namespace Bit.Core.Services
return false; return false;
} }
var decryptedToken = _dataProtector.Unprotect(encryptedToken); var decryptedToken = _dataProtector.Unprotect(encryptedToken[TokenClearTextPrefix.Length..]);
var dataParts = decryptedToken.Split(' '); var dataParts = decryptedToken.Split(' ');
if (dataParts.Length != 2) if (dataParts.Length != 3)
{ {
return false; return false;
} }