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

[AC-1637] Added HtmlEncodingStringConverter to properties that are for input/output of Org Name and Business name

Browse Source
This commit is contained in:
Rui Tome
2023-09-26 14:26:20 +01:00
parent 0df2910ef7
commit 6dadcbed21
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs
View File

@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Enums; using Bit.Core.Enums;
using Bit.Core.Models.Business; using Bit.Core.Models.Business;
@ -10,8 +11,10 @@ public class OrganizationCreateRequestModel : IValidatableObject
{ {
[Required] [Required]
[StringLength(50)] [StringLength(50)]
[JsonConverter(typeof(HtmlEncodingStringConverter))]
public string Name { get; set; } public string Name { get; set; }
[StringLength(50)] [StringLength(50)]
[JsonConverter(typeof(HtmlEncodingStringConverter))]
public string BusinessName { get; set; } public string BusinessName { get; set; }
[Required] [Required]
[StringLength(256)] [StringLength(256)]

4
src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs
View File

@ -1,7 +1,9 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Models.Data; using Bit.Core.Models.Data;
using Bit.Core.Settings; using Bit.Core.Settings;
using Bit.Core.Utilities;
namespace Bit.Api.Models.Request.Organizations; namespace Bit.Api.Models.Request.Organizations;
@ -9,8 +11,10 @@ public class OrganizationUpdateRequestModel
{ {
[Required] [Required]
[StringLength(50)] [StringLength(50)]
[JsonConverter(typeof(HtmlEncodingStringConverter))]
public string Name { get; set; } public string Name { get; set; }
[StringLength(50)] [StringLength(50)]
[JsonConverter(typeof(HtmlEncodingStringConverter))]
public string BusinessName { get; set; } public string BusinessName { get; set; }
[EmailAddress] [EmailAddress]
[Required] [Required]

5
src/Api/Models/Response/Organizations/OrganizationResponseModel.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Entities; using System.Text.Json.Serialization;
using Bit.Core.Entities;
using Bit.Core.Enums; using Bit.Core.Enums;
using Bit.Core.Models.Api; using Bit.Core.Models.Api;
using Bit.Core.Models.Business; using Bit.Core.Models.Business;
@ -61,7 +62,9 @@ public class OrganizationResponseModel : ResponseModel
} }
public Guid Id { get; set; } public Guid Id { get; set; }
[JsonConverter(typeof(HtmlEncodingStringConverter))]
public string Name { get; set; } public string Name { get; set; }
[JsonConverter(typeof(HtmlEncodingStringConverter))]
public string BusinessName { get; set; } public string BusinessName { get; set; }
public string BusinessAddress1 { get; set; } public string BusinessAddress1 { get; set; }
public string BusinessAddress2 { get; set; } public string BusinessAddress2 { get; set; }

4
src/Api/Models/Response/ProfileOrganizationResponseModel.cs
View File

@ -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.Auth.Models.Data;
using Bit.Core.Enums; using Bit.Core.Enums;
using Bit.Core.Enums.Provider; using Bit.Core.Enums.Provider;
@ -70,6 +71,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
} }
public Guid Id { get; set; } public Guid Id { get; set; }
[JsonConverter(typeof(HtmlEncodingStringConverter))]
public string Name { get; set; } public string Name { get; set; }
public bool UsePolicies { get; set; } public bool UsePolicies { get; set; }
public bool UseSso { get; set; } public bool UseSso { get; set; }