mirror of
https://github.com/bitwarden/server
synced 2025-12-11 22:03:38 +00:00
* [AC-1637] Added HtmlEncodingStringConverter to encode/decode special chars on JSON serialization/deserialization
* [AC-1637] Added unit tests for HtmlEncodingStringConverter
* [AC-1637] Moved expected values on unit tests to the arrange phase
* [AC-1637] Added HtmlEncodingStringConverter to properties that are for input/output of Org Name and Business name
* [AC-1637] Modified views in Admin project to decode values to display
* [AC-1637] Replaced Html.Raw with HttpUtility.HtmlDecode
* [AC-1637] Added JsonConverter to Provider DTOs
* [AC-1637] Modified HandlebarsMailService to decode organization name before sending emails
* Revert "[AC-1637] Added JsonConverter to Provider DTOs"
This reverts commit 94d507cf93.
* [AC-1637] Fixed Admin panel organization search
* [AC-1637] Sanitizing Organization name and business name on creation in Admin panel
* [AC-1637] Sanitizing organization name and business name on creation by a provider
* [AC-1637] Sanitizing provider name on creation and on viewing in admin panel
* [AC-1637] Added sanitization to more places where Org name is used
* [AC-1637] Swapped using HttpUtility for WebUtility since the later is part of the dotnet framework
* [AC-1637] Updated error messages
* [AC-1637] Decoding on Admin panel add existing organization
* [AC-1637] Fix HTML decoding issues
* [AC-1637] Refactor HTML decoding in View and Model classes on Admin panel
* [AC-1637] Refactor provider name and business name usages to use methods that output decoded values
* [AC-1637] Fixed typo
* [AC-1637] Renamed Provider methods to retrieve Decoded Name and BusinessName
* [AC-1637] Renamed Organization methods to retrieve Decoded Name and BusinessName
* [AC-1637] Update the display name method in the `ProviderOrganizationOrganizationDetails` class to `DisplayName()`
119 lines
4.7 KiB
C#
119 lines
4.7 KiB
C#
using System.ComponentModel.DataAnnotations;
|
|
using System.Text.Json.Serialization;
|
|
using Bit.Core.Entities;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Models.Business;
|
|
using Bit.Core.Utilities;
|
|
|
|
namespace Bit.Api.AdminConsole.Models.Request.Organizations;
|
|
|
|
public class OrganizationCreateRequestModel : IValidatableObject
|
|
{
|
|
[Required]
|
|
[StringLength(50, ErrorMessage = "The field Name exceeds the maximum length.")]
|
|
[JsonConverter(typeof(HtmlEncodingStringConverter))]
|
|
public string Name { get; set; }
|
|
[StringLength(50, ErrorMessage = "The field Business Name exceeds the maximum length.")]
|
|
[JsonConverter(typeof(HtmlEncodingStringConverter))]
|
|
public string BusinessName { get; set; }
|
|
[Required]
|
|
[StringLength(256)]
|
|
[EmailAddress]
|
|
public string BillingEmail { get; set; }
|
|
public PlanType PlanType { get; set; }
|
|
[Required]
|
|
public string Key { get; set; }
|
|
public OrganizationKeysRequestModel Keys { get; set; }
|
|
public PaymentMethodType? PaymentMethodType { get; set; }
|
|
public string PaymentToken { get; set; }
|
|
[Range(0, int.MaxValue)]
|
|
public int AdditionalSeats { get; set; }
|
|
[Range(0, 99)]
|
|
public short? AdditionalStorageGb { get; set; }
|
|
public bool PremiumAccessAddon { get; set; }
|
|
[EncryptedString]
|
|
[EncryptedStringLength(1000)]
|
|
public string CollectionName { get; set; }
|
|
public string TaxIdNumber { get; set; }
|
|
public string BillingAddressLine1 { get; set; }
|
|
public string BillingAddressLine2 { get; set; }
|
|
public string BillingAddressCity { get; set; }
|
|
public string BillingAddressState { get; set; }
|
|
public string BillingAddressPostalCode { get; set; }
|
|
[StringLength(2)]
|
|
public string BillingAddressCountry { get; set; }
|
|
public int? MaxAutoscaleSeats { get; set; }
|
|
[Range(0, int.MaxValue)]
|
|
public int? AdditionalSmSeats { get; set; }
|
|
[Range(0, int.MaxValue)]
|
|
public int? AdditionalServiceAccounts { get; set; }
|
|
[Required]
|
|
public bool UseSecretsManager { get; set; }
|
|
public bool IsFromSecretsManagerTrial { get; set; }
|
|
|
|
public string InitiationPath { get; set; }
|
|
|
|
public virtual OrganizationSignup ToOrganizationSignup(User user)
|
|
{
|
|
var orgSignup = new OrganizationSignup
|
|
{
|
|
Owner = user,
|
|
OwnerKey = Key,
|
|
Name = Name,
|
|
Plan = PlanType,
|
|
PaymentMethodType = PaymentMethodType,
|
|
PaymentToken = PaymentToken,
|
|
AdditionalSeats = AdditionalSeats,
|
|
MaxAutoscaleSeats = MaxAutoscaleSeats,
|
|
AdditionalStorageGb = AdditionalStorageGb.GetValueOrDefault(0),
|
|
PremiumAccessAddon = PremiumAccessAddon,
|
|
BillingEmail = BillingEmail,
|
|
BusinessName = BusinessName,
|
|
CollectionName = CollectionName,
|
|
AdditionalSmSeats = AdditionalSmSeats.GetValueOrDefault(),
|
|
AdditionalServiceAccounts = AdditionalServiceAccounts.GetValueOrDefault(),
|
|
UseSecretsManager = UseSecretsManager,
|
|
IsFromSecretsManagerTrial = IsFromSecretsManagerTrial,
|
|
TaxInfo = new TaxInfo
|
|
{
|
|
TaxIdNumber = TaxIdNumber,
|
|
BillingAddressLine1 = BillingAddressLine1,
|
|
BillingAddressLine2 = BillingAddressLine2,
|
|
BillingAddressCity = BillingAddressCity,
|
|
BillingAddressState = BillingAddressState,
|
|
BillingAddressPostalCode = BillingAddressPostalCode,
|
|
BillingAddressCountry = BillingAddressCountry,
|
|
},
|
|
InitiationPath = InitiationPath,
|
|
};
|
|
|
|
Keys?.ToOrganizationSignup(orgSignup);
|
|
|
|
return orgSignup;
|
|
}
|
|
|
|
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
|
|
{
|
|
if (PlanType != PlanType.Free && string.IsNullOrWhiteSpace(PaymentToken))
|
|
{
|
|
yield return new ValidationResult("Payment required.", new string[] { nameof(PaymentToken) });
|
|
}
|
|
if (PlanType != PlanType.Free && !PaymentMethodType.HasValue)
|
|
{
|
|
yield return new ValidationResult("Payment method type required.",
|
|
new string[] { nameof(PaymentMethodType) });
|
|
}
|
|
if (PlanType != PlanType.Free && string.IsNullOrWhiteSpace(BillingAddressCountry))
|
|
{
|
|
yield return new ValidationResult("Country required.",
|
|
new string[] { nameof(BillingAddressCountry) });
|
|
}
|
|
if (PlanType != PlanType.Free && BillingAddressCountry == "US" &&
|
|
string.IsNullOrWhiteSpace(BillingAddressPostalCode))
|
|
{
|
|
yield return new ValidationResult("Zip / postal code is required.",
|
|
new string[] { nameof(BillingAddressPostalCode) });
|
|
}
|
|
}
|
|
}
|