nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 13:08:17 -05:00
Code

PM-2944] Make Entities Nullable In Admin Console (#4386)

Browse Source 
* Enable `nullable` in `ISubscriber`

* Enable `nullable` in `Group`

* Enable `nullable` in `GroupUser`

* Enable `nullable` in `Organization`

* Enable `nullable` in `OrganizationUser`

* Enable `nullable` in `Policy`

* Enable `nullable` in `Provider`

* Enable `nullable` in `ProviderOrganization`

* Enable `nullable` in `ProviderUser`

* Update Tests

* Formatting

* Update TwoFactor Tests

* Fix Scim Tests

* Format

* Add Migrations

* Format
This commit is contained in:
Justin Baur 2024-07-04 21:14:37 -04:00 committed by GitHub
parent 7da37ee231
commit 8b5f65fc00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 9874 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitwarden_license/test/Scim.IntegrationTest/Factories/ScimApplicationFactory.cs
View File

@ -201,7 +201,14 @@ public class ScimApplicationFactory : WebApplicationFactoryBase<Startup>
{ {
return new List<Organization>() return new List<Organization>()
{ {
new Organization { Id = TestOrganizationId1, Name = "Test Organization 1", UseGroups = true } new Organization
{
Id = TestOrganizationId1,
Name = "Test Organization 1",
BillingEmail = $"billing-email+{TestOrganizationId1}@example.com",
UseGroups = true,
Plan = "Enterprise",
},
}; };
} }

6
src/Core/AdminConsole/Entities/Group.cs
View File

@ -3,6 +3,8 @@ using Bit.Core.Entities;
using Bit.Core.Models; using Bit.Core.Models;
using Bit.Core.Utilities; using Bit.Core.Utilities;
#nullable enable
namespace Bit.Core.AdminConsole.Entities; namespace Bit.Core.AdminConsole.Entities;
public class Group : ITableObject<Guid>, IExternal public class Group : ITableObject<Guid>, IExternal
@ -10,10 +12,10 @@ public class Group : ITableObject<Guid>, IExternal
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid OrganizationId { get; set; } public Guid OrganizationId { get; set; }
[MaxLength(100)] [MaxLength(100)]
public string Name { get; set; } public string Name { get; set; } = null!;
public bool AccessAll { get; set; } public bool AccessAll { get; set; }
[MaxLength(300)] [MaxLength(300)]
public string ExternalId { get; set; } public string? ExternalId { get; set; }
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow; public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow; public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;

2
src/Core/AdminConsole/Entities/GroupUser.cs
View File

@ -1,5 +1,7 @@
namespace Bit.Core.AdminConsole.Entities; namespace Bit.Core.AdminConsole.Entities;
#nullable enable
public class GroupUser public class GroupUser
{ {
public Guid GroupId { get; set; } public Guid GroupId { get; set; }

50
src/Core/AdminConsole/Entities/Organization.cs
View File

@ -10,39 +10,41 @@ using Bit.Core.Models.Business;
using Bit.Core.Tools.Entities; using Bit.Core.Tools.Entities;
using Bit.Core.Utilities; using Bit.Core.Utilities;
#nullable enable
namespace Bit.Core.AdminConsole.Entities; namespace Bit.Core.AdminConsole.Entities;
public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable, IReferenceable public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable, IReferenceable
{ {
private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders; private Dictionary<TwoFactorProviderType, TwoFactorProvider>? _twoFactorProviders;
public Guid Id { get; set; } public Guid Id { get; set; }
[MaxLength(50)] [MaxLength(50)]
public string Identifier { get; set; } public string? Identifier { get; set; }
/// <summary> /// <summary>
/// This value is HTML encoded. For display purposes use the method DisplayName() instead. /// This value is HTML encoded. For display purposes use the method DisplayName() instead.
/// </summary> /// </summary>
[MaxLength(50)] [MaxLength(50)]
public string Name { get; set; } public string Name { get; set; } = null!;
/// <summary> /// <summary>
/// This value is HTML encoded. For display purposes use the method DisplayBusinessName() instead. /// This value is HTML encoded. For display purposes use the method DisplayBusinessName() instead.
/// </summary> /// </summary>
[MaxLength(50)] [MaxLength(50)]
public string BusinessName { get; set; } public string? BusinessName { get; set; }
[MaxLength(50)] [MaxLength(50)]
public string BusinessAddress1 { get; set; } public string? BusinessAddress1 { get; set; }
[MaxLength(50)] [MaxLength(50)]
public string BusinessAddress2 { get; set; } public string? BusinessAddress2 { get; set; }
[MaxLength(50)] [MaxLength(50)]
public string BusinessAddress3 { get; set; } public string? BusinessAddress3 { get; set; }
[MaxLength(2)] [MaxLength(2)]
public string BusinessCountry { get; set; } public string? BusinessCountry { get; set; }
[MaxLength(30)] [MaxLength(30)]
public string BusinessTaxNumber { get; set; } public string? BusinessTaxNumber { get; set; }
[MaxLength(256)] [MaxLength(256)]
public string BillingEmail { get; set; } public string BillingEmail { get; set; } = null!;
[MaxLength(50)] [MaxLength(50)]
public string Plan { get; set; } public string Plan { get; set; } = null!;
public PlanType PlanType { get; set; } public PlanType PlanType { get; set; }
public int? Seats { get; set; } public int? Seats { get; set; }
public short? MaxCollections { get; set; } public short? MaxCollections { get; set; }
@ -65,16 +67,16 @@ public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable,
public short? MaxStorageGb { get; set; } public short? MaxStorageGb { get; set; }
public GatewayType? Gateway { get; set; } public GatewayType? Gateway { get; set; }
[MaxLength(50)] [MaxLength(50)]
public string GatewayCustomerId { get; set; } public string? GatewayCustomerId { get; set; }
[MaxLength(50)] [MaxLength(50)]
public string GatewaySubscriptionId { get; set; } public string? GatewaySubscriptionId { get; set; }
public string ReferenceData { get; set; } public string? ReferenceData { get; set; }
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;
[MaxLength(100)] [MaxLength(100)]
public string LicenseKey { get; set; } public string? LicenseKey { get; set; }
public string PublicKey { get; set; } public string? PublicKey { get; set; }
public string PrivateKey { get; set; } public string? PrivateKey { get; set; }
public string TwoFactorProviders { get; set; } public string? TwoFactorProviders { get; set; }
public DateTime? ExpirationDate { get; set; } public DateTime? ExpirationDate { get; set; }
public DateTime CreationDate { get; set; } = DateTime.UtcNow; public DateTime CreationDate { get; set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; set; } = DateTime.UtcNow; public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
@ -123,22 +125,22 @@ public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable,
/// <summary> /// <summary>
/// Returns the business name of the organization, HTML decoded ready for display. /// Returns the business name of the organization, HTML decoded ready for display.
/// </summary> /// </summary>
public string DisplayBusinessName() public string? DisplayBusinessName()
{ {
return WebUtility.HtmlDecode(BusinessName); return WebUtility.HtmlDecode(BusinessName);
} }
public string BillingEmailAddress() public string? BillingEmailAddress()
{ {
return BillingEmail?.ToLowerInvariant()?.Trim(); return BillingEmail?.ToLowerInvariant()?.Trim();
} }
public string BillingName() public string? BillingName()
{ {
return DisplayBusinessName(); return DisplayBusinessName();
} }
public string SubscriberName() public string? SubscriberName()
{ {
return DisplayName(); return DisplayName();
} }
@ -198,7 +200,7 @@ public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable,
return maxStorageBytes - Storage.Value; return maxStorageBytes - Storage.Value;
} }
public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders() public Dictionary<TwoFactorProviderType, TwoFactorProvider>? GetTwoFactorProviders()
{ {
if (string.IsNullOrWhiteSpace(TwoFactorProviders)) if (string.IsNullOrWhiteSpace(TwoFactorProviders))
{ {
@ -257,7 +259,7 @@ public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable,
return providers.Any(p => (p.Value?.Enabled ?? false) && Use2fa); return providers.Any(p => (p.Value?.Enabled ?? false) && Use2fa);
} }
public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider) public TwoFactorProvider? GetTwoFactorProvider(TwoFactorProviderType provider)
{ {
var providers = GetTwoFactorProviders(); var providers = GetTwoFactorProviders();
if (providers == null || !providers.ContainsKey(provider)) if (providers == null || !providers.ContainsKey(provider))

14
src/Core/AdminConsole/Entities/OrganizationUser.cs
View File

@ -4,6 +4,8 @@ using Bit.Core.Models;
using Bit.Core.Models.Data; using Bit.Core.Models.Data;
using Bit.Core.Utilities; using Bit.Core.Utilities;
#nullable enable
namespace Bit.Core.Entities; namespace Bit.Core.Entities;
public class OrganizationUser : ITableObject<Guid>, IExternal public class OrganizationUser : ITableObject<Guid>, IExternal
@ -12,17 +14,17 @@ public class OrganizationUser : ITableObject<Guid>, IExternal
public Guid OrganizationId { get; set; } public Guid OrganizationId { get; set; }
public Guid? UserId { get; set; } public Guid? UserId { get; set; }
[MaxLength(256)] [MaxLength(256)]
public string Email { get; set; } public string? Email { get; set; }
public string Key { get; set; } public string? Key { get; set; }
public string ResetPasswordKey { get; set; } public string? ResetPasswordKey { get; set; }
public OrganizationUserStatusType Status { get; set; } public OrganizationUserStatusType Status { get; set; }
public OrganizationUserType Type { get; set; } public OrganizationUserType Type { get; set; }
public bool AccessAll { get; set; } public bool AccessAll { get; set; }
[MaxLength(300)] [MaxLength(300)]
public string ExternalId { get; set; } public string? ExternalId { get; set; }
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow; public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow; public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
public string Permissions { get; set; } public string? Permissions { get; set; }
public bool AccessSecretsManager { get; set; } public bool AccessSecretsManager { get; set; }
public void SetNewId() public void SetNewId()
@ -30,7 +32,7 @@ public class OrganizationUser : ITableObject<Guid>, IExternal
Id = CoreHelpers.GenerateComb(); Id = CoreHelpers.GenerateComb();
} }
public Permissions GetPermissions() public Permissions? GetPermissions()
{ {
return string.IsNullOrWhiteSpace(Permissions) ? null return string.IsNullOrWhiteSpace(Permissions) ? null
: CoreHelpers.LoadClassFromJsonData<Permissions>(Permissions); : CoreHelpers.LoadClassFromJsonData<Permissions>(Permissions);

4
src/Core/AdminConsole/Entities/Policy.cs
View File

@ -3,6 +3,8 @@ using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Utilities; using Bit.Core.Utilities;
#nullable enable
namespace Bit.Core.AdminConsole.Entities; namespace Bit.Core.AdminConsole.Entities;
public class Policy : ITableObject<Guid> public class Policy : ITableObject<Guid>
@ -10,7 +12,7 @@ public class Policy : ITableObject<Guid>
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid OrganizationId { get; set; } public Guid OrganizationId { get; set; }
public PolicyType Type { get; set; } public PolicyType Type { get; set; }
public string Data { get; set; } public string? Data { get; set; }
public bool Enabled { get; set; } public bool Enabled { get; set; }
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow; public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow; public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;

34
src/Core/AdminConsole/Entities/Provider/Provider.cs
View File

@ -4,6 +4,8 @@ using Bit.Core.Entities;
using Bit.Core.Enums; using Bit.Core.Enums;
using Bit.Core.Utilities; using Bit.Core.Utilities;
#nullable enable
namespace Bit.Core.AdminConsole.Entities.Provider; namespace Bit.Core.AdminConsole.Entities.Provider;
public class Provider : ITableObject<Guid>, ISubscriber public class Provider : ITableObject<Guid>, ISubscriber
@ -12,18 +14,18 @@ public class Provider : ITableObject<Guid>, ISubscriber
/// <summary> /// <summary>
/// This value is HTML encoded. For display purposes use the method DisplayName() instead. /// This value is HTML encoded. For display purposes use the method DisplayName() instead.
/// </summary> /// </summary>
public string Name { get; set; } public string? Name { get; set; }
/// <summary> /// <summary>
/// This value is HTML encoded. For display purposes use the method DisplayBusinessName() instead. /// This value is HTML encoded. For display purposes use the method DisplayBusinessName() instead.
/// </summary> /// </summary>
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; }
public string BusinessAddress3 { get; set; } public string? BusinessAddress3 { get; set; }
public string BusinessCountry { get; set; } public string? BusinessCountry { get; set; }
public string BusinessTaxNumber { get; set; } public string? BusinessTaxNumber { get; set; }
public string BillingEmail { get; set; } public string? BillingEmail { get; set; }
public string BillingPhone { get; set; } public string? BillingPhone { get; set; }
public ProviderStatusType Status { get; set; } public ProviderStatusType Status { get; set; }
public bool UseEvents { get; set; } public bool UseEvents { get; set; }
public ProviderType Type { get; set; } public ProviderType Type { get; set; }
@ -31,14 +33,14 @@ public class Provider : ITableObject<Guid>, ISubscriber
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow; public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow; public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
public GatewayType? Gateway { get; set; } public GatewayType? Gateway { get; set; }
public string GatewayCustomerId { get; set; } public string? GatewayCustomerId { get; set; }
public string GatewaySubscriptionId { get; set; } public string? GatewaySubscriptionId { get; set; }
public string BillingEmailAddress() => BillingEmail?.ToLowerInvariant().Trim(); public string? BillingEmailAddress() => BillingEmail?.ToLowerInvariant().Trim();
public string BillingName() => DisplayBusinessName(); public string? BillingName() => DisplayBusinessName();
public string SubscriberName() => DisplayName(); public string? SubscriberName() => DisplayName();
public string BraintreeCustomerIdPrefix() => "p"; public string BraintreeCustomerIdPrefix() => "p";
@ -65,7 +67,7 @@ public class Provider : ITableObject<Guid>, ISubscriber
/// <summary> /// <summary>
/// Returns the name of the provider, HTML decoded ready for display. /// Returns the name of the provider, HTML decoded ready for display.
/// </summary> /// </summary>
public string DisplayName() public string? DisplayName()
{ {
return WebUtility.HtmlDecode(Name); return WebUtility.HtmlDecode(Name);
} }
@ -73,7 +75,7 @@ public class Provider : ITableObject<Guid>, ISubscriber
/// <summary> /// <summary>
/// Returns the business name of the provider, HTML decoded ready for display. /// Returns the business name of the provider, HTML decoded ready for display.
/// </summary> /// </summary>
public string DisplayBusinessName() public string? DisplayBusinessName()
{ {
return WebUtility.HtmlDecode(BusinessName); return WebUtility.HtmlDecode(BusinessName);
} }

6
src/Core/AdminConsole/Entities/Provider/ProviderOrganization.cs
View File

@ -1,6 +1,8 @@
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Utilities; using Bit.Core.Utilities;
#nullable enable
namespace Bit.Core.AdminConsole.Entities.Provider; namespace Bit.Core.AdminConsole.Entities.Provider;
public class ProviderOrganization : ITableObject<Guid> public class ProviderOrganization : ITableObject<Guid>
@ -8,8 +10,8 @@ public class ProviderOrganization : ITableObject<Guid>
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid ProviderId { get; set; } public Guid ProviderId { get; set; }
public Guid OrganizationId { get; set; } public Guid OrganizationId { get; set; }
public string Key { get; set; } public string? Key { get; set; }
public string Settings { get; set; } public string? Settings { get; set; }
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow; public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow; public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;

8
src/Core/AdminConsole/Entities/Provider/ProviderUser.cs
View File

@ -2,6 +2,8 @@
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Utilities; using Bit.Core.Utilities;
#nullable enable
namespace Bit.Core.AdminConsole.Entities.Provider; namespace Bit.Core.AdminConsole.Entities.Provider;
public class ProviderUser : ITableObject<Guid> public class ProviderUser : ITableObject<Guid>
@ -9,11 +11,11 @@ public class ProviderUser : ITableObject<Guid>
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid ProviderId { get; set; } public Guid ProviderId { get; set; }
public Guid? UserId { get; set; } public Guid? UserId { get; set; }
public string Email { get; set; } public string? Email { get; set; }
public string Key { get; set; } public string? Key { get; set; }
public ProviderUserStatusType Status { get; set; } public ProviderUserStatusType Status { get; set; }
public ProviderUserType Type { get; set; } public ProviderUserType Type { get; set; }
public string Permissions { get; set; } public string? Permissions { get; set; }
public DateTime CreationDate { get; set; } = DateTime.UtcNow; public DateTime CreationDate { get; set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; set; } = DateTime.UtcNow; public DateTime RevisionDate { get; set; } = DateTime.UtcNow;

12
src/Core/Entities/ISubscriber.cs
View File

@ -1,16 +1,18 @@
using Bit.Core.Enums; using Bit.Core.Enums;
#nullable enable
namespace Bit.Core.Entities; namespace Bit.Core.Entities;
public interface ISubscriber public interface ISubscriber
{ {
Guid Id { get; } Guid Id { get; }
GatewayType? Gateway { get; set; } GatewayType? Gateway { get; set; }
string GatewayCustomerId { get; set; } string? GatewayCustomerId { get; set; }
string GatewaySubscriptionId { get; set; } string? GatewaySubscriptionId { get; set; }
string BillingEmailAddress(); string? BillingEmailAddress();
string BillingName(); string? BillingName();
string SubscriberName(); string? SubscriberName();
string BraintreeCustomerIdPrefix(); string BraintreeCustomerIdPrefix();
string BraintreeIdField(); string BraintreeIdField();
string BraintreeCloudRegionField(); string BraintreeCloudRegionField();

4
test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs
View File

@ -563,7 +563,9 @@ public class IdentityServerSsoTests
var organization = await organizationRepository.CreateAsync(new Organization var organization = await organizationRepository.CreateAsync(new Organization
{ {
Name = "Test Org", Name = "Test Org",
UsePolicies = true BillingEmail = "billing-email@example.com",
Plan = "Enterprise",
UsePolicies = true,
}); });
var organizationUserRepository = factory.Services.GetRequiredService<IOrganizationUserRepository>(); var organizationUserRepository = factory.Services.GetRequiredService<IOrganizationUserRepository>();

11
test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
View File

@ -607,7 +607,16 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
var organizationUserRepository = _factory.Services.GetService<IOrganizationUserRepository>(); var organizationUserRepository = _factory.Services.GetService<IOrganizationUserRepository>();
var policyRepository = _factory.Services.GetService<IPolicyRepository>(); var policyRepository = _factory.Services.GetService<IPolicyRepository>();
var organization = new Organization { Id = organizationId, Enabled = true, UseSso = ssoPolicyEnabled, UsePolicies = true }; var organization = new Organization
{
Id = organizationId,
Name = $"Org Name | {organizationId}",
Enabled = true,
UseSso = ssoPolicyEnabled,
Plan = "Enterprise",
UsePolicies = true,
BillingEmail = $"billing-email+{organizationId}@example.com",
};
await organizationRepository.CreateAsync(organization); await organizationRepository.CreateAsync(organization);
var user = await userRepository.GetByEmailAsync(username); var user = await userRepository.GetByEmailAsync(username);

2
test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs
View File

@ -78,6 +78,8 @@ public class IdentityServerTwoFactorTests : IClassFixture<IdentityApplicationFac
Name = "Test Org", Name = "Test Org",
Use2fa = true, Use2fa = true,
TwoFactorProviders = orgTwoFactor, TwoFactorProviders = orgTwoFactor,
BillingEmail = "billing-email@example.com",
Plan = "Enterprise",
}); });
await _factory.Services.GetService<IOrganizationUserRepository>() await _factory.Services.GetService<IOrganizationUserRepository>()

2693
util/MySqlMigrations/Migrations/20240703205907_UpdateNullConstraintsAdminConsole.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

709
util/MySqlMigrations/Migrations/20240703205907_UpdateNullConstraintsAdminConsole.cs Normal file
View File

@ -0,0 +1,709 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.MySqlMigrations.Migrations;
/// <inheritdoc />
public partial class UpdateNullConstraintsAdminConsole : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "User",
keyColumn: "Culture",
keyValue: null,
column: "Culture",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Culture",
table: "User",
type: "varchar(10)",
maxLength: 10,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(10)",
oldMaxLength: 10,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "TaxRate",
keyColumn: "PostalCode",
keyValue: null,
column: "PostalCode",
value: "");
migrationBuilder.AlterColumn<string>(
name: "PostalCode",
table: "TaxRate",
type: "varchar(10)",
maxLength: 10,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(10)",
oldMaxLength: 10,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "TaxRate",
keyColumn: "Country",
keyValue: null,
column: "Country",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Country",
table: "TaxRate",
type: "varchar(50)",
maxLength: 50,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "ProviderInvoiceItem",
keyColumn: "PlanName",
keyValue: null,
column: "PlanName",
value: "");
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "ProviderInvoiceItem",
keyColumn: "InvoiceId",
keyValue: null,
column: "InvoiceId",
value: "");
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "ProviderInvoiceItem",
keyColumn: "ClientName",
keyValue: null,
column: "ClientName",
value: "");
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "OrganizationDomain",
keyColumn: "Txt",
keyValue: null,
column: "Txt",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Txt",
table: "OrganizationDomain",
type: "longtext",
nullable: false,
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "OrganizationDomain",
keyColumn: "DomainName",
keyValue: null,
column: "DomainName",
value: "");
migrationBuilder.AlterColumn<string>(
name: "DomainName",
table: "OrganizationDomain",
type: "varchar(255)",
maxLength: 255,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(255)",
oldMaxLength: 255,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "OrganizationApiKey",
keyColumn: "ApiKey",
keyValue: null,
column: "ApiKey",
value: "");
migrationBuilder.AlterColumn<string>(
name: "ApiKey",
table: "OrganizationApiKey",
type: "varchar(30)",
maxLength: 30,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(30)",
oldMaxLength: 30,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Organization",
keyColumn: "Plan",
keyValue: null,
column: "Plan",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Plan",
table: "Organization",
type: "varchar(50)",
maxLength: 50,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Organization",
keyColumn: "Name",
keyValue: null,
column: "Name",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Organization",
type: "varchar(50)",
maxLength: 50,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Organization",
keyColumn: "BillingEmail",
keyValue: null,
column: "BillingEmail",
value: "");
migrationBuilder.AlterColumn<string>(
name: "BillingEmail",
table: "Organization",
type: "varchar(256)",
maxLength: 256,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(256)",
oldMaxLength: 256,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Installation",
keyColumn: "Key",
keyValue: null,
column: "Key",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "Installation",
type: "varchar(150)",
maxLength: 150,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(150)",
oldMaxLength: 150,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Installation",
keyColumn: "Email",
keyValue: null,
column: "Email",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "Installation",
type: "varchar(256)",
maxLength: 256,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(256)",
oldMaxLength: 256,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Group",
keyColumn: "Name",
keyValue: null,
column: "Name",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Group",
type: "varchar(100)",
maxLength: 100,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(100)",
oldMaxLength: 100,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Device",
keyColumn: "Name",
keyValue: null,
column: "Name",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Device",
type: "varchar(50)",
maxLength: 50,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Device",
keyColumn: "Identifier",
keyValue: null,
column: "Identifier",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Identifier",
table: "Device",
type: "varchar(50)",
maxLength: 50,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Collection",
keyColumn: "Name",
keyValue: null,
column: "Name",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Collection",
type: "longtext",
nullable: false,
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "ApiKey",
keyColumn: "Scope",
keyValue: null,
column: "Scope",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Scope",
table: "ApiKey",
type: "varchar(4000)",
maxLength: 4000,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(4000)",
oldMaxLength: 4000,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "ApiKey",
keyColumn: "Name",
keyValue: null,
column: "Name",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "ApiKey",
type: "varchar(200)",
maxLength: 200,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(200)",
oldMaxLength: 200,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "ApiKey",
keyColumn: "Key",
keyValue: null,
column: "Key",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "ApiKey",
type: "longtext",
nullable: false,
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "ApiKey",
keyColumn: "EncryptedPayload",
keyValue: null,
column: "EncryptedPayload",
value: "");
migrationBuilder.AlterColumn<string>(
name: "EncryptedPayload",
table: "ApiKey",
type: "varchar(4000)",
maxLength: 4000,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(4000)",
oldMaxLength: 4000,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Culture",
table: "User",
type: "varchar(10)",
maxLength: 10,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(10)",
oldMaxLength: 10)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "PostalCode",
table: "TaxRate",
type: "varchar(10)",
maxLength: 10,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(10)",
oldMaxLength: 10)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Country",
table: "TaxRate",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Txt",
table: "OrganizationDomain",
type: "longtext",
nullable: true,
oldClrType: typeof(string),
oldType: "longtext")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "DomainName",
table: "OrganizationDomain",
type: "varchar(255)",
maxLength: 255,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(255)",
oldMaxLength: 255)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "ApiKey",
table: "OrganizationApiKey",
type: "varchar(30)",
maxLength: 30,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(30)",
oldMaxLength: 30)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Plan",
table: "Organization",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Organization",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "BillingEmail",
table: "Organization",
type: "varchar(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(256)",
oldMaxLength: 256)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "Installation",
type: "varchar(150)",
maxLength: 150,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(150)",
oldMaxLength: 150)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "Installation",
type: "varchar(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(256)",
oldMaxLength: 256)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Group",
type: "varchar(100)",
maxLength: 100,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(100)",
oldMaxLength: 100)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Device",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Identifier",
table: "Device",
type: "varchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(50)",
oldMaxLength: 50)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Collection",
type: "longtext",
nullable: true,
oldClrType: typeof(string),
oldType: "longtext")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Scope",
table: "ApiKey",
type: "varchar(4000)",
maxLength: 4000,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(4000)",
oldMaxLength: 4000)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "ApiKey",
type: "varchar(200)",
maxLength: 200,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(200)",
oldMaxLength: 200)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "ApiKey",
type: "longtext",
nullable: true,
oldClrType: typeof(string),
oldType: "longtext")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "EncryptedPayload",
table: "ApiKey",
type: "varchar(4000)",
maxLength: 4000,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(4000)",
oldMaxLength: 4000)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
}

4
util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -32,6 +32,7 @@ namespace Bit.MySqlMigrations.Migrations
.HasDefaultValue(true); .HasDefaultValue(true);
b.Property<string>("BillingEmail") b.Property<string>("BillingEmail")
.IsRequired()
.HasMaxLength(256) .HasMaxLength(256)
.HasColumnType("varchar(256)"); .HasColumnType("varchar(256)");
@ -110,6 +111,7 @@ namespace Bit.MySqlMigrations.Migrations
.HasColumnType("smallint"); .HasColumnType("smallint");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired()
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("varchar(50)"); .HasColumnType("varchar(50)");
@ -117,6 +119,7 @@ namespace Bit.MySqlMigrations.Migrations
.HasColumnType("datetime(6)"); .HasColumnType("datetime(6)");
b.Property<string>("Plan") b.Property<string>("Plan")
.IsRequired()
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("varchar(50)"); .HasColumnType("varchar(50)");
@ -1023,6 +1026,7 @@ namespace Bit.MySqlMigrations.Migrations
.HasColumnType("varchar(300)"); .HasColumnType("varchar(300)");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired()
.HasMaxLength(100) .HasMaxLength(100)
.HasColumnType("varchar(100)"); .HasColumnType("varchar(100)");

2700
util/PostgresMigrations/Migrations/20240703205916_UpdateNullConstraintsAdminConsole.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

489
util/PostgresMigrations/Migrations/20240703205916_UpdateNullConstraintsAdminConsole.cs Normal file
View File

@ -0,0 +1,489 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.PostgresMigrations.Migrations;
/// <inheritdoc />
public partial class UpdateNullConstraintsAdminConsole : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Culture",
table: "User",
type: "character varying(10)",
maxLength: 10,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(10)",
oldMaxLength: 10,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "PostalCode",
table: "TaxRate",
type: "character varying(10)",
maxLength: 10,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(10)",
oldMaxLength: 10,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Country",
table: "TaxRate",
type: "character varying(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Txt",
table: "OrganizationDomain",
type: "text",
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "DomainName",
table: "OrganizationDomain",
type: "character varying(255)",
maxLength: 255,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(255)",
oldMaxLength: 255,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ApiKey",
table: "OrganizationApiKey",
type: "character varying(30)",
maxLength: 30,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(30)",
oldMaxLength: 30,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Plan",
table: "Organization",
type: "character varying(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Organization",
type: "character varying(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "BillingEmail",
table: "Organization",
type: "character varying(256)",
maxLength: 256,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "Installation",
type: "character varying(150)",
maxLength: 150,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(150)",
oldMaxLength: 150,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "Installation",
type: "character varying(256)",
maxLength: 256,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Group",
type: "character varying(100)",
maxLength: 100,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(100)",
oldMaxLength: 100,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Device",
type: "character varying(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Identifier",
table: "Device",
type: "character varying(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Collection",
type: "text",
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Scope",
table: "ApiKey",
type: "character varying(4000)",
maxLength: 4000,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(4000)",
oldMaxLength: 4000,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "ApiKey",
type: "character varying(200)",
maxLength: 200,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(200)",
oldMaxLength: 200,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "ApiKey",
type: "text",
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "EncryptedPayload",
table: "ApiKey",
type: "character varying(4000)",
maxLength: 4000,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "character varying(4000)",
oldMaxLength: 4000,
oldNullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Culture",
table: "User",
type: "character varying(10)",
maxLength: 10,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(10)",
oldMaxLength: 10);
migrationBuilder.AlterColumn<string>(
name: "PostalCode",
table: "TaxRate",
type: "character varying(10)",
maxLength: 10,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(10)",
oldMaxLength: 10);
migrationBuilder.AlterColumn<string>(
name: "Country",
table: "TaxRate",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "Txt",
table: "OrganizationDomain",
type: "text",
nullable: true,
oldClrType: typeof(string),
oldType: "text");
migrationBuilder.AlterColumn<string>(
name: "DomainName",
table: "OrganizationDomain",
type: "character varying(255)",
maxLength: 255,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(255)",
oldMaxLength: 255);
migrationBuilder.AlterColumn<string>(
name: "ApiKey",
table: "OrganizationApiKey",
type: "character varying(30)",
maxLength: 30,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(30)",
oldMaxLength: 30);
migrationBuilder.AlterColumn<string>(
name: "Plan",
table: "Organization",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Organization",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "BillingEmail",
table: "Organization",
type: "character varying(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(256)",
oldMaxLength: 256);
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "Installation",
type: "character varying(150)",
maxLength: 150,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(150)",
oldMaxLength: 150);
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "Installation",
type: "character varying(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(256)",
oldMaxLength: 256);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Group",
type: "character varying(100)",
maxLength: 100,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(100)",
oldMaxLength: 100);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Device",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "Identifier",
table: "Device",
type: "character varying(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(50)",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Collection",
type: "text",
nullable: true,
oldClrType: typeof(string),
oldType: "text");
migrationBuilder.AlterColumn<string>(
name: "Scope",
table: "ApiKey",
type: "character varying(4000)",
maxLength: 4000,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(4000)",
oldMaxLength: 4000);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "ApiKey",
type: "character varying(200)",
maxLength: 200,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(200)",
oldMaxLength: 200);
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "ApiKey",
type: "text",
nullable: true,
oldClrType: typeof(string),
oldType: "text");
migrationBuilder.AlterColumn<string>(
name: "EncryptedPayload",
table: "ApiKey",
type: "character varying(4000)",
maxLength: 4000,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(4000)",
oldMaxLength: 4000);
}
}

4
util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -33,6 +33,7 @@ namespace Bit.PostgresMigrations.Migrations
.HasDefaultValue(true); .HasDefaultValue(true);
b.Property<string>("BillingEmail") b.Property<string>("BillingEmail")
.IsRequired()
.HasMaxLength(256) .HasMaxLength(256)
.HasColumnType("character varying(256)"); .HasColumnType("character varying(256)");
@ -112,6 +113,7 @@ namespace Bit.PostgresMigrations.Migrations
.HasColumnType("smallint"); .HasColumnType("smallint");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired()
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("character varying(50)"); .HasColumnType("character varying(50)");
@ -119,6 +121,7 @@ namespace Bit.PostgresMigrations.Migrations
.HasColumnType("timestamp with time zone"); .HasColumnType("timestamp with time zone");
b.Property<string>("Plan") b.Property<string>("Plan")
.IsRequired()
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("character varying(50)"); .HasColumnType("character varying(50)");
@ -1028,6 +1031,7 @@ namespace Bit.PostgresMigrations.Migrations
.HasColumnType("character varying(300)"); .HasColumnType("character varying(300)");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired()
.HasMaxLength(100) .HasMaxLength(100)
.HasColumnType("character varying(100)"); .HasColumnType("character varying(100)");

2682
util/SqliteMigrations/Migrations/20240703205857_UpdateNullConstraintsAdminConsole.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

489
util/SqliteMigrations/Migrations/20240703205857_UpdateNullConstraintsAdminConsole.cs Normal file
View File

@ -0,0 +1,489 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.SqliteMigrations.Migrations;
/// <inheritdoc />
public partial class UpdateNullConstraintsAdminConsole : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Culture",
table: "User",
type: "TEXT",
maxLength: 10,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 10,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "PostalCode",
table: "TaxRate",
type: "TEXT",
maxLength: 10,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 10,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Country",
table: "TaxRate",
type: "TEXT",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "TEXT",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "TEXT",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "TEXT",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Txt",
table: "OrganizationDomain",
type: "TEXT",
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "DomainName",
table: "OrganizationDomain",
type: "TEXT",
maxLength: 255,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 255,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ApiKey",
table: "OrganizationApiKey",
type: "TEXT",
maxLength: 30,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 30,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Plan",
table: "Organization",
type: "TEXT",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Organization",
type: "TEXT",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "BillingEmail",
table: "Organization",
type: "TEXT",
maxLength: 256,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "Installation",
type: "TEXT",
maxLength: 150,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 150,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "Installation",
type: "TEXT",
maxLength: 256,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Group",
type: "TEXT",
maxLength: 100,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 100,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Device",
type: "TEXT",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Identifier",
table: "Device",
type: "TEXT",
maxLength: 50,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Collection",
type: "TEXT",
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Scope",
table: "ApiKey",
type: "TEXT",
maxLength: 4000,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 4000,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "ApiKey",
type: "TEXT",
maxLength: 200,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 200,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "ApiKey",
type: "TEXT",
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "EncryptedPayload",
table: "ApiKey",
type: "TEXT",
maxLength: 4000,
nullable: false,
defaultValue: "",
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 4000,
oldNullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Culture",
table: "User",
type: "TEXT",
maxLength: 10,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 10);
migrationBuilder.AlterColumn<string>(
name: "PostalCode",
table: "TaxRate",
type: "TEXT",
maxLength: 10,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 10);
migrationBuilder.AlterColumn<string>(
name: "Country",
table: "TaxRate",
type: "TEXT",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "PlanName",
table: "ProviderInvoiceItem",
type: "TEXT",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "InvoiceId",
table: "ProviderInvoiceItem",
type: "TEXT",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "ClientName",
table: "ProviderInvoiceItem",
type: "TEXT",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "Txt",
table: "OrganizationDomain",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "DomainName",
table: "OrganizationDomain",
type: "TEXT",
maxLength: 255,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 255);
migrationBuilder.AlterColumn<string>(
name: "ApiKey",
table: "OrganizationApiKey",
type: "TEXT",
maxLength: 30,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 30);
migrationBuilder.AlterColumn<string>(
name: "Plan",
table: "Organization",
type: "TEXT",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Organization",
type: "TEXT",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "BillingEmail",
table: "Organization",
type: "TEXT",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256);
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "Installation",
type: "TEXT",
maxLength: 150,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 150);
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "Installation",
type: "TEXT",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Group",
type: "TEXT",
maxLength: 100,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 100);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Device",
type: "TEXT",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "Identifier",
table: "Device",
type: "TEXT",
maxLength: 50,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 50);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "Collection",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "Scope",
table: "ApiKey",
type: "TEXT",
maxLength: 4000,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 4000);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "ApiKey",
type: "TEXT",
maxLength: 200,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 200);
migrationBuilder.AlterColumn<string>(
name: "Key",
table: "ApiKey",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "EncryptedPayload",
table: "ApiKey",
type: "TEXT",
maxLength: 4000,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 4000);
}
}

4
util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -27,6 +27,7 @@ namespace Bit.SqliteMigrations.Migrations
.HasDefaultValue(true); .HasDefaultValue(true);
b.Property<string>("BillingEmail") b.Property<string>("BillingEmail")
.IsRequired()
.HasMaxLength(256) .HasMaxLength(256)
.HasColumnType("TEXT"); .HasColumnType("TEXT");
@ -105,6 +106,7 @@ namespace Bit.SqliteMigrations.Migrations
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired()
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("TEXT"); .HasColumnType("TEXT");
@ -112,6 +114,7 @@ namespace Bit.SqliteMigrations.Migrations
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("Plan") b.Property<string>("Plan")
.IsRequired()
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("TEXT"); .HasColumnType("TEXT");
@ -1012,6 +1015,7 @@ namespace Bit.SqliteMigrations.Migrations
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired()
.HasMaxLength(100) .HasMaxLength(100)
.HasColumnType("TEXT"); .HasColumnType("TEXT");