diff --git a/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs index 35151dc4f6..b58bd46786 100644 --- a/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs +++ b/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations; +using System.Text.Json.Serialization; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models.Business; @@ -10,8 +11,10 @@ public class OrganizationCreateRequestModel : IValidatableObject { [Required] [StringLength(50)] + [JsonConverter(typeof(HtmlEncodingStringConverter))] public string Name { get; set; } [StringLength(50)] + [JsonConverter(typeof(HtmlEncodingStringConverter))] public string BusinessName { get; set; } [Required] [StringLength(256)] diff --git a/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs index 79983a5549..c0c3af0896 100644 --- a/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs +++ b/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs @@ -1,7 +1,9 @@ using System.ComponentModel.DataAnnotations; +using System.Text.Json.Serialization; using Bit.Core.Entities; using Bit.Core.Models.Data; using Bit.Core.Settings; +using Bit.Core.Utilities; namespace Bit.Api.Models.Request.Organizations; @@ -9,8 +11,10 @@ public class OrganizationUpdateRequestModel { [Required] [StringLength(50)] + [JsonConverter(typeof(HtmlEncodingStringConverter))] public string Name { get; set; } [StringLength(50)] + [JsonConverter(typeof(HtmlEncodingStringConverter))] public string BusinessName { get; set; } [EmailAddress] [Required] diff --git a/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs index 11f5a795a4..8052a96021 100644 --- a/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs +++ b/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs @@ -1,4 +1,5 @@ -using Bit.Core.Entities; +using System.Text.Json.Serialization; +using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models.Api; using Bit.Core.Models.Business; @@ -61,7 +62,9 @@ public class OrganizationResponseModel : ResponseModel } public Guid Id { get; set; } + [JsonConverter(typeof(HtmlEncodingStringConverter))] public string Name { get; set; } + [JsonConverter(typeof(HtmlEncodingStringConverter))] public string BusinessName { get; set; } public string BusinessAddress1 { get; set; } public string BusinessAddress2 { get; set; } diff --git a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs b/src/Api/Models/Response/ProfileOrganizationResponseModel.cs index a0ededa0b6..bcd1e7f1eb 100644 --- a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs +++ b/src/Api/Models/Response/ProfileOrganizationResponseModel.cs @@ -1,4 +1,5 @@ -using Bit.Core.Auth.Enums; +using System.Text.Json.Serialization; +using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models.Data; using Bit.Core.Enums; using Bit.Core.Enums.Provider; @@ -70,6 +71,7 @@ public class ProfileOrganizationResponseModel : ResponseModel } public Guid Id { get; set; } + [JsonConverter(typeof(HtmlEncodingStringConverter))] public string Name { get; set; } public bool UsePolicies { get; set; } public bool UseSso { get; set; }