From fa549fb72e1843bfaf82e0a475715be36e1825b7 Mon Sep 17 00:00:00 2001 From: Rui Tome Date: Wed, 12 Oct 2022 17:16:39 +0100 Subject: [PATCH] [EC-343] Added column 'UseCustomPermissions' to Organization table --- src/Core/Entities/Organization.cs | 1 + .../Data/Organizations/OrganizationAbility.cs | 2 + .../ProviderUserOrganizationDetails.cs | 1 + .../Repositories/OrganizationRepository.cs | 1 + ...roviderUserOrganizationDetailsViewQuery.cs | 1 + .../Stored Procedures/Organization_Create.sql | 9 +- .../Organization_ReadAbilities.sql | 1 + .../Stored Procedures/Organization_Update.sql | 6 +- src/Sql/dbo/Tables/Organization.sql | 1 + ...rganizationUserOrganizationDetailsView.sql | 1 + ...derUserProviderOrganizationDetailsView.sql | 1 + ...2022-10-11_00_UseCustomPermissionsFlag.sql | 397 ++++++++++++++++++ 12 files changed, 417 insertions(+), 5 deletions(-) create mode 100644 util/Migrator/DbScripts/2022-10-11_00_UseCustomPermissionsFlag.sql diff --git a/src/Core/Entities/Organization.cs b/src/Core/Entities/Organization.cs index 823eb5bafc..00232d050d 100644 --- a/src/Core/Entities/Organization.cs +++ b/src/Core/Entities/Organization.cs @@ -47,6 +47,7 @@ public class Organization : ITableObject, ISubscriber, IStorable, IStorabl public bool UseResetPassword { get; set; } public bool SelfHost { get; set; } public bool UsersGetPremium { get; set; } + public bool UseCustomPermissions { get; set; } public long? Storage { get; set; } public short? MaxStorageGb { get; set; } public GatewayType? Gateway { get; set; } diff --git a/src/Core/Models/Data/Organizations/OrganizationAbility.cs b/src/Core/Models/Data/Organizations/OrganizationAbility.cs index 9b9ee85095..809f4d5d40 100644 --- a/src/Core/Models/Data/Organizations/OrganizationAbility.cs +++ b/src/Core/Models/Data/Organizations/OrganizationAbility.cs @@ -19,6 +19,7 @@ public class OrganizationAbility UseKeyConnector = organization.UseKeyConnector; UseScim = organization.UseScim; UseResetPassword = organization.UseResetPassword; + UseCustomPermissions = organization.UseCustomPermissions; } public Guid Id { get; set; } @@ -31,4 +32,5 @@ public class OrganizationAbility public bool UseKeyConnector { get; set; } public bool UseScim { get; set; } public bool UseResetPassword { get; set; } + public bool UseCustomPermissions { get; set; } } diff --git a/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs b/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs index 9d0740b73b..e121962e6a 100644 --- a/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs +++ b/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs @@ -20,6 +20,7 @@ public class ProviderUserOrganizationDetails public bool UseResetPassword { get; set; } public bool SelfHost { get; set; } public bool UsersGetPremium { get; set; } + public bool UseCustomPermissions { get; set; } public int? Seats { get; set; } public short? MaxCollections { get; set; } public short? MaxStorageGb { get; set; } diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs index bd60b53e8e..589a01e859 100644 --- a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs +++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs @@ -85,6 +85,7 @@ public class OrganizationRepository : Repository