bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-20 10:13:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into feature/families-for-enterprise

Browse Source
This commit is contained in:
Justin Baur
2021-11-12 22:33:58 -05:00
committed by GitHub
parent dba01a2c4e f1c41257b3
commit 252b558fe1
90 changed files with 3974 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,13 @@ namespace Bit.Core.Models.Api
Utilities.StaticStore.GetSponsoredPlan(PlanSponsorshipType.FamiliesForEnterprise)
.UsersCanSponsor(organization);
PlanProductType = Utilities.StaticStore.GetPlan(organization.PlanType).Product;
if (organization.SsoConfig != null)
{
var ssoConfigData = SsoConfigurationData.Deserialize(organization.SsoConfig);
UsesKeyConnector = ssoConfigData.UseKeyConnector && !string.IsNullOrEmpty(ssoConfigData.KeyConnectorUrl);
KeyConnectorUrl = ssoConfigData.KeyConnectorUrl;
}
}
public string Id { get; set; }
@@ -76,5 +83,7 @@ namespace Bit.Core.Models.Api
public string FamilySponsorshipFriendlyName { get; set; }
public bool FamilySponsorshipAvailable { get; set; }
public ProductType PlanProductType { get; set; }
public bool UsesKeyConnector { get; set; }
public string KeyConnectorUrl { get; set; }
}
}