nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00
Code Activity

Allow org update api on self hosted for identifier only (#898)

Browse Source
This commit is contained in:
Kyle Spearrin
2020-08-28 11:22:19 -04:00
committed by GitHub
parent 526bdfdb05
commit 303b9a7875
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/Models/Api/Request/Organizations/OrganizationUpdateRequestModel.cs
View File

@ -17,11 +17,15 @@ namespace Bit.Core.Models.Api
[StringLength(50)]
public string BillingEmail { get; set; }
public virtual Organization ToOrganization(Organization existingOrganization)
public virtual Organization ToOrganization(Organization existingOrganization, GlobalSettings globalSettings)
{
existingOrganization.Name = Name;
existingOrganization.BusinessName = BusinessName;
existingOrganization.BillingEmail = BillingEmail?.ToLowerInvariant()?.Trim();
if (!globalSettings.SelfHosted)
{
// These items come from the license file
existingOrganization.Name = Name;
existingOrganization.BusinessName = BusinessName;
existingOrganization.BillingEmail = BillingEmail?.ToLowerInvariant()?.Trim();
}
existingOrganization.Identifier = Identifier;
return existingOrganization;
}