Browse Source
* [AC-1117] Add manage permission (#3126) * Update sql files to add Manage permission * Add migration script * Rename collection manage migration file to remove duplicate migration date * Migrations * Add manage to models * Add manage to repository * Add constraint to Manage columns * Migration lint fixes * Add manage to OrganizationUserUserDetails_ReadWithCollectionsById * Add missing manage fields * Add 'Manage' to UserCollectionDetails * Use CREATE OR ALTER where possible * [AC-1374] Limit collection creation/deletion to Owner/Admin (#3145) * feat: update org table with new column, write migration, refs AC-1374 * feat: update views with new column, refs AC-1374 * feat: Alter sprocs (org create/update) to include new column, refs AC-1374 * feat: update entity/data/request/response models to handle new column, refs AC-1374 * feat: update necessary Provider related views during migration, refs AC-1374 * fix: update org create to default new column to false, refs AC-1374 * feat: added new API/request model for collection management and removed property from update request model, refs AC-1374 * fix: renamed migration script to be after secrets manage beta column changes, refs AC-1374 * fix: dotnet format, refs AC-1374 * feat: add ef migrations to reflect mssql changes, refs AC-1374 * fix: dotnet format, refs AC-1374 * feat: update API signature to accept Guid and explain Cd verbiage, refs AC-1374 * fix: merge conflict resolution * [AC-1174] CollectionUser and CollectionGroup authorization handlers (#3194) * [AC-1174] Introduce BulkAuthorizationHandler.cs * [AC-1174] Introduce CollectionUserAuthorizationHandler * [AC-1174] Add CreateForNewCollection CollectionUser requirement * [AC-1174] Add some more details to CollectionCustomization * [AC-1174] Formatting * [AC-1174] Add CollectionGroupOperation.cs * [AC-1174] Introduce CollectionGroupAuthorizationHandler.cs * [AC-1174] Cleanup CollectionFixture customization Implement and use re-usable extension method to support seeded Guids * [AC-1174] Introduce WithValueFromList AutoFixtureExtensions Modify CollectionCustomization to use multiple organization Ids for auto generated test data * [AC-1174] Simplify CollectionUserAuthorizationHandler.cs Modify the authorization handler to only perform authorization logic. Validation logic will need to be handled by any calling commands/controllers instead. * [AC-1174] Introduce shared CollectionAccessAuthorizationHandlerBase A shared base authorization handler was created for both CollectionUser and CollectionGroup resources, as they share the same underlying management authorization logic. * [AC-1174] Update CollectionUserAuthorizationHandler and CollectionGroupAuthorizationHandler to use the new CollectionAccessAuthorizationHandlerBase class * [AC-1174] Formatting * [AC-1174] Cleanup typo and redundant ToList() call * [AC-1174] Add check for provider users * [AC-1174] Reduce nested loops * [AC-1174] Introduce ICollectionAccess.cs * [AC-1174] Remove individual CollectionGroup and CollectionUser auth handlers and use base class instead * [AC-1174] Tweak unit test to fail minimally * [AC-1174] Reorganize authorization handlers in Core project * [AC-1174] Introduce new AddCoreAuthorizationHandlers() extension method * [AC-1174] Move CollectionAccessAuthorizationHandler into Api project * [AC-1174] Move CollectionFixture to Vault folder * [AC-1174] Rename operation to CreateUpdateDelete * [AC-1174] Require single organization for collection access authorization handler - Add requirement that all target collections must belong to the same organization - Simplify logic related to multiple organizations - Update tests and helpers - Use ToHashSet to improve lookup time * [AC-1174] Fix null reference exception * [AC-1174] Throw bad request exception when collections belong to different organizations * [AC-1174] Switch to CollectionAuthorizationHandler instead of CollectionAccessAuthorizationHandler to reduce complexity * Fix improper merge conflict resolution * fix: add permission check for collection management api, refs AC-1647 (#3252) * [AC-1125] Enforce org setting for creating/deleting collections (#3241) * [AC-1117] Add manage permission (#3126) * Update sql files to add Manage permission * Add migration script * Rename collection manage migration file to remove duplicate migration date * Migrations * Add manage to models * Add manage to repository * Add constraint to Manage columns * Migration lint fixes * Add manage to OrganizationUserUserDetails_ReadWithCollectionsById * Add missing manage fields * Add 'Manage' to UserCollectionDetails * Use CREATE OR ALTER where possible * [AC-1374] Limit collection creation/deletion to Owner/Admin (#3145) * feat: update org table with new column, write migration, refs AC-1374 * feat: update views with new column, refs AC-1374 * feat: Alter sprocs (org create/update) to include new column, refs AC-1374 * feat: update entity/data/request/response models to handle new column, refs AC-1374 * feat: update necessary Provider related views during migration, refs AC-1374 * fix: update org create to default new column to false, refs AC-1374 * feat: added new API/request model for collection management and removed property from update request model, refs AC-1374 * fix: renamed migration script to be after secrets manage beta column changes, refs AC-1374 * fix: dotnet format, refs AC-1374 * feat: add ef migrations to reflect mssql changes, refs AC-1374 * fix: dotnet format, refs AC-1374 * feat: update API signature to accept Guid and explain Cd verbiage, refs AC-1374 * feat: created collection auth handler/operations, added LimitCollectionCdOwnerAdmin to CurrentContentOrganization, refs AC-1125 * feat: create vault service collection extensions and register with base services, refs AC-1125 * feat: deprecated CurrentContext.CreateNewCollections, refs AC-1125 * feat: deprecate DeleteAnyCollection for single resource usages, refs AC-1125 * feat: move service registration to api, update references, refs AC-1125 * feat: add bulk delete authorization handler, refs AC-1125 * feat: always assign user and give manage access on create, refs AC-1125 * fix: updated CurrentContextOrganization type, refs AC-1125 * feat: combined existing collection authorization handlers/operations, refs AC-1125 * fix: OrganizationServiceTests -> CurrentContentOrganization typo, refs AC-1125 * fix: format, refs AC-1125 * fix: update collection controller tests, refs AC-1125 * fix: dotnet format, refs AC-1125 * feat: removed extra BulkAuthorizationHandler, refs AC-1125 * fix: dotnet format, refs AC-1125 * fix: change string to guid for org id, update bulk delete request model, refs AC-1125 * fix: remove delete many collection check, refs AC-1125 * fix: clean up collection auth handler, refs AC-1125 * fix: format fix for CollectionOperations, refs AC-1125 * fix: removed unnecessary owner check, add org null check to custom permission validation, refs AC-1125 * fix: remove unused methods in CurrentContext, refs AC-1125 * fix: removed obsolete test, fixed failling delete many test, refs AC-1125 * fix: CollectionAuthorizationHandlerTests fixes, refs AC-1125 * fix: OrganizationServiceTests fix broken test by mocking GetOrganization, refs AC-1125 * fix: CollectionAuthorizationHandler - remove unused repository, refs AC-1125 * feat: moved UserId null check to common method, refs AC-1125 * fix: updated auth handler tests to remove dependency on requirement for common code checks, refs AC-1125 * feat: updated conditionals/comments for create/delete methods within colleciton auth handler, refs AC-1125 * feat: added create/delete collection auth handler success methods, refs AC-1125 * fix: new up permissions to prevent excessive null checks, refs AC-1125 * fix: remove old reference to CreateNewCollections, refs AC-1125 * fix: typo within ViewAssignedCollections method, refs AC-1125 --------- Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com> * refactor: remove organizationId from CollectionBulkDeleteRequestModel, refs AC-1649 (#3282) * [AC-1174] Bulk Collection Management (#3229) * [AC-1174] Update SelectionReadOnlyRequestModel to use Guid for Id property * [AC-1174] Introduce initial bulk-access collection endpoint * [AC-1174] Introduce BulkAddCollectionAccessCommand and validation logic/tests * [AC-1174] Add CreateOrUpdateAccessMany method to CollectionRepository * [AC-1174] Add event logs for bulk add collection access command * [AC-1174] Add User_BumpAccountRevisionDateByCollectionIds and database migration script * [AC-1174] Implement EF repository method * [AC-1174] Improve null checks * [AC-1174] Remove unnecessary BulkCollectionAccessRequestModel helpers * [AC-1174] Add unit tests for new controller endpoint * [AC-1174] Fix formatting * [AC-1174] Remove comment * [AC-1174] Remove redundant organizationId parameter * [AC-1174] Ensure user and group Ids are distinct * [AC-1174] Cleanup tests based on PR feedback * [AC-1174] Formatting * [AC-1174] Update CollectionGroup alias in the sproc * [AC-1174] Add some additional comments to SQL sproc * [AC-1174] Add comment explaining additional SaveChangesAsync call --------- Co-authored-by: Thomas Rittson <trittson@bitwarden.com> * [AC-1646] Rename LimitCollectionCdOwnerAdmin column (#3300) * Rename LimitCollectionCdOwnerAdmin -> LimitCollectionCreationDeletion * Rename and bump migration script * [AC-1666] Removed EditAnyCollection from Create/Delete permission checks (#3301) * fix: remove EditAnyCollection from Create/Delete permission check, refs AC-1666 * fix: updated comment, refs AC-1666 * [AC-1669] Bug - Remove obsolete assignUserId from CollectionService.SaveAsync(...) (#3312) * fix: remove AssignUserId from CollectionService.SaveAsync, refs AC-1669 * fix: add manage access conditional before creating collection, refs AC-1669 * fix: move access logic for create/update, fix all tests, refs AC-1669 * fix: add CollectionAccessSelection fixture, update tests, update bad reqeuest message, refs AC-1669 * fix: format, refs AC-1669 * fix: update null params with specific arg.is null checks, refs Ac-1669 * fix: update attribute class name, refs AC-1669 * [AC-1713] [Flexible collections] Add feature flags to server (#3334) * Add feature flags for FlexibleCollections and BulkCollectionAccess * Flag new routes and behaviour --------- Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com> * Add joint codeownership for auth handlers (#3346) * [AC-1717] Update default values for LimitCollectionCreationDeletion (#3365) * Change default value in organization create sproc to 1 * Drop old column name still present in some QA instances * Set LimitCollectionCreationDeletion value in code based on feature flag * Fix: add missing namespace after merging in master * Fix: add missing namespace after merging in master * [AC-1683] Fix DB migrations for new Manage permission (#3307) * [AC-1683] Update migration script and introduce V2 procedures and types * [AC-1683] Update repository calls to use new V2 procedures / types * [AC-1684] Update bulk add collection migration script to use new V2 type * [AC-1683] Undo Manage changes to more original procedures * [AC-1683] Restore whitespace changes * [AC-1683] Clarify comments regarding explicit column lists * [AC-1683] Update migration script dates * [AC-1683] Split the migration script for readability * [AC-1683] Re-name SelectReadOnlyArray_V2 to CollectionAccessSelectionType * [AC-1648] [Flexible Collections] Bump migration scripts before feature branch merge (#3371) * Bump dates on sql migration scripts * Bump date on ef migrations * [AC-1727] Add AllowAdminAccessToAllCollectionItems column to Organization table * [AC-1720] Update stored procedures and views that query the organization table and new column * [AC-1727] Add EF migrations for new DB column * [AC-1729] Update API request/response models * [AC-1122] Add new setting to CurrentContextOrganization.cs * [AC-1122] Ensure new setting is disabled for new orgs when the feature flag is enabled * [AC-1122] Use V1 feature flag for new setting * [AC-1122] Formatting * [AC-1122] Update migration script date --------- Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com> Co-authored-by: Thomas Rittson <trittson@bitwarden.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>pull/3479/head
Shane Melton
2 years ago
committed by
GitHub
25 changed files with 7321 additions and 10 deletions
@ -0,0 +1,407 @@
@@ -0,0 +1,407 @@
|
||||
--Add column 'AllowAdminAccessToAllCollectionItems' to 'Organization' table |
||||
IF COL_LENGTH('[dbo].[Organization]', 'AllowAdminAccessToAllCollectionItems') IS NULL |
||||
BEGIN |
||||
ALTER TABLE |
||||
[dbo].[Organization] |
||||
ADD |
||||
[AllowAdminAccessToAllCollectionItems] BIT NOT NULL CONSTRAINT [DF_Organization_AllowAdminAccessToAllCollectionItems] DEFAULT (1) |
||||
END |
||||
GO |
||||
|
||||
/** |
||||
ORGANIZATION STORED PROCEDURES |
||||
*/ |
||||
|
||||
--Alter `Organization_Create` sproc to include `AllowAdminAccessToAllCollectionItems` column and default value |
||||
CREATE OR ALTER PROCEDURE [dbo].[Organization_Create] |
||||
@Id UNIQUEIDENTIFIER OUTPUT, |
||||
@Identifier NVARCHAR(50), |
||||
@Name NVARCHAR(50), |
||||
@BusinessName NVARCHAR(50), |
||||
@BusinessAddress1 NVARCHAR(50), |
||||
@BusinessAddress2 NVARCHAR(50), |
||||
@BusinessAddress3 NVARCHAR(50), |
||||
@BusinessCountry VARCHAR(2), |
||||
@BusinessTaxNumber NVARCHAR(30), |
||||
@BillingEmail NVARCHAR(256), |
||||
@Plan NVARCHAR(50), |
||||
@PlanType TINYINT, |
||||
@Seats INT, |
||||
@MaxCollections SMALLINT, |
||||
@UsePolicies BIT, |
||||
@UseSso BIT, |
||||
@UseGroups BIT, |
||||
@UseDirectory BIT, |
||||
@UseEvents BIT, |
||||
@UseTotp BIT, |
||||
@Use2fa BIT, |
||||
@UseApi BIT, |
||||
@UseResetPassword BIT, |
||||
@SelfHost BIT, |
||||
@UsersGetPremium BIT, |
||||
@Storage BIGINT, |
||||
@MaxStorageGb SMALLINT, |
||||
@Gateway TINYINT, |
||||
@GatewayCustomerId VARCHAR(50), |
||||
@GatewaySubscriptionId VARCHAR(50), |
||||
@ReferenceData VARCHAR(MAX), |
||||
@Enabled BIT, |
||||
@LicenseKey VARCHAR(100), |
||||
@PublicKey VARCHAR(MAX), |
||||
@PrivateKey VARCHAR(MAX), |
||||
@TwoFactorProviders NVARCHAR(MAX), |
||||
@ExpirationDate DATETIME2(7), |
||||
@CreationDate DATETIME2(7), |
||||
@RevisionDate DATETIME2(7), |
||||
@OwnersNotifiedOfAutoscaling DATETIME2(7), |
||||
@MaxAutoscaleSeats INT, |
||||
@UseKeyConnector BIT = 0, |
||||
@UseScim BIT = 0, |
||||
@UseCustomPermissions BIT = 0, |
||||
@UseSecretsManager BIT = 0, |
||||
@Status TINYINT = 0, |
||||
@UsePasswordManager BIT = 1, |
||||
@SmSeats INT = null, |
||||
@SmServiceAccounts INT = null, |
||||
@MaxAutoscaleSmSeats INT= null, |
||||
@MaxAutoscaleSmServiceAccounts INT = null, |
||||
@SecretsManagerBeta BIT = 0, |
||||
@LimitCollectionCreationDeletion BIT = 1, |
||||
@AllowAdminAccessToAllCollectionItems BIT = 1 |
||||
AS |
||||
BEGIN |
||||
SET NOCOUNT ON |
||||
|
||||
INSERT INTO [dbo].[Organization] |
||||
( |
||||
[Id], |
||||
[Identifier], |
||||
[Name], |
||||
[BusinessName], |
||||
[BusinessAddress1], |
||||
[BusinessAddress2], |
||||
[BusinessAddress3], |
||||
[BusinessCountry], |
||||
[BusinessTaxNumber], |
||||
[BillingEmail], |
||||
[Plan], |
||||
[PlanType], |
||||
[Seats], |
||||
[MaxCollections], |
||||
[UsePolicies], |
||||
[UseSso], |
||||
[UseGroups], |
||||
[UseDirectory], |
||||
[UseEvents], |
||||
[UseTotp], |
||||
[Use2fa], |
||||
[UseApi], |
||||
[UseResetPassword], |
||||
[SelfHost], |
||||
[UsersGetPremium], |
||||
[Storage], |
||||
[MaxStorageGb], |
||||
[Gateway], |
||||
[GatewayCustomerId], |
||||
[GatewaySubscriptionId], |
||||
[ReferenceData], |
||||
[Enabled], |
||||
[LicenseKey], |
||||
[PublicKey], |
||||
[PrivateKey], |
||||
[TwoFactorProviders], |
||||
[ExpirationDate], |
||||
[CreationDate], |
||||
[RevisionDate], |
||||
[OwnersNotifiedOfAutoscaling], |
||||
[MaxAutoscaleSeats], |
||||
[UseKeyConnector], |
||||
[UseScim], |
||||
[UseCustomPermissions], |
||||
[UseSecretsManager], |
||||
[Status], |
||||
[UsePasswordManager], |
||||
[SmSeats], |
||||
[SmServiceAccounts], |
||||
[MaxAutoscaleSmSeats], |
||||
[MaxAutoscaleSmServiceAccounts], |
||||
[SecretsManagerBeta], |
||||
[LimitCollectionCreationDeletion], |
||||
[AllowAdminAccessToAllCollectionItems] |
||||
) |
||||
VALUES |
||||
( |
||||
@Id, |
||||
@Identifier, |
||||
@Name, |
||||
@BusinessName, |
||||
@BusinessAddress1, |
||||
@BusinessAddress2, |
||||
@BusinessAddress3, |
||||
@BusinessCountry, |
||||
@BusinessTaxNumber, |
||||
@BillingEmail, |
||||
@Plan, |
||||
@PlanType, |
||||
@Seats, |
||||
@MaxCollections, |
||||
@UsePolicies, |
||||
@UseSso, |
||||
@UseGroups, |
||||
@UseDirectory, |
||||
@UseEvents, |
||||
@UseTotp, |
||||
@Use2fa, |
||||
@UseApi, |
||||
@UseResetPassword, |
||||
@SelfHost, |
||||
@UsersGetPremium, |
||||
@Storage, |
||||
@MaxStorageGb, |
||||
@Gateway, |
||||
@GatewayCustomerId, |
||||
@GatewaySubscriptionId, |
||||
@ReferenceData, |
||||
@Enabled, |
||||
@LicenseKey, |
||||
@PublicKey, |
||||
@PrivateKey, |
||||
@TwoFactorProviders, |
||||
@ExpirationDate, |
||||
@CreationDate, |
||||
@RevisionDate, |
||||
@OwnersNotifiedOfAutoscaling, |
||||
@MaxAutoscaleSeats, |
||||
@UseKeyConnector, |
||||
@UseScim, |
||||
@UseCustomPermissions, |
||||
@UseSecretsManager, |
||||
@Status, |
||||
@UsePasswordManager, |
||||
@SmSeats, |
||||
@SmServiceAccounts, |
||||
@MaxAutoscaleSmSeats, |
||||
@MaxAutoscaleSmServiceAccounts, |
||||
@SecretsManagerBeta, |
||||
@LimitCollectionCreationDeletion, |
||||
@AllowAdminAccessToAllCollectionItems |
||||
) |
||||
END |
||||
GO |
||||
|
||||
|
||||
--Alter `Organization_Update` sproc to include `AllowAdminAccessToAllCollectionItems` column |
||||
CREATE OR ALTER PROCEDURE [dbo].[Organization_Update] |
||||
@Id UNIQUEIDENTIFIER, |
||||
@Identifier NVARCHAR(50), |
||||
@Name NVARCHAR(50), |
||||
@BusinessName NVARCHAR(50), |
||||
@BusinessAddress1 NVARCHAR(50), |
||||
@BusinessAddress2 NVARCHAR(50), |
||||
@BusinessAddress3 NVARCHAR(50), |
||||
@BusinessCountry VARCHAR(2), |
||||
@BusinessTaxNumber NVARCHAR(30), |
||||
@BillingEmail NVARCHAR(256), |
||||
@Plan NVARCHAR(50), |
||||
@PlanType TINYINT, |
||||
@Seats INT, |
||||
@MaxCollections SMALLINT, |
||||
@UsePolicies BIT, |
||||
@UseSso BIT, |
||||
@UseGroups BIT, |
||||
@UseDirectory BIT, |
||||
@UseEvents BIT, |
||||
@UseTotp BIT, |
||||
@Use2fa BIT, |
||||
@UseApi BIT, |
||||
@UseResetPassword BIT, |
||||
@SelfHost BIT, |
||||
@UsersGetPremium BIT, |
||||
@Storage BIGINT, |
||||
@MaxStorageGb SMALLINT, |
||||
@Gateway TINYINT, |
||||
@GatewayCustomerId VARCHAR(50), |
||||
@GatewaySubscriptionId VARCHAR(50), |
||||
@ReferenceData VARCHAR(MAX), |
||||
@Enabled BIT, |
||||
@LicenseKey VARCHAR(100), |
||||
@PublicKey VARCHAR(MAX), |
||||
@PrivateKey VARCHAR(MAX), |
||||
@TwoFactorProviders NVARCHAR(MAX), |
||||
@ExpirationDate DATETIME2(7), |
||||
@CreationDate DATETIME2(7), |
||||
@RevisionDate DATETIME2(7), |
||||
@OwnersNotifiedOfAutoscaling DATETIME2(7), |
||||
@MaxAutoscaleSeats INT, |
||||
@UseKeyConnector BIT = 0, |
||||
@UseScim BIT = 0, |
||||
@UseCustomPermissions BIT = 0, |
||||
@UseSecretsManager BIT = 0, |
||||
@Status TINYINT = 0, |
||||
@UsePasswordManager BIT = 1, |
||||
@SmSeats INT = null, |
||||
@SmServiceAccounts INT = null, |
||||
@MaxAutoscaleSmSeats INT = null, |
||||
@MaxAutoscaleSmServiceAccounts INT = null, |
||||
@SecretsManagerBeta BIT = 0, |
||||
@LimitCollectionCreationDeletion BIT = 1, |
||||
@AllowAdminAccessToAllCollectionItems BIT = 1 |
||||
AS |
||||
BEGIN |
||||
SET NOCOUNT ON |
||||
|
||||
UPDATE |
||||
[dbo].[Organization] |
||||
SET |
||||
[Identifier] = @Identifier, |
||||
[Name] = @Name, |
||||
[BusinessName] = @BusinessName, |
||||
[BusinessAddress1] = @BusinessAddress1, |
||||
[BusinessAddress2] = @BusinessAddress2, |
||||
[BusinessAddress3] = @BusinessAddress3, |
||||
[BusinessCountry] = @BusinessCountry, |
||||
[BusinessTaxNumber] = @BusinessTaxNumber, |
||||
[BillingEmail] = @BillingEmail, |
||||
[Plan] = @Plan, |
||||
[PlanType] = @PlanType, |
||||
[Seats] = @Seats, |
||||
[MaxCollections] = @MaxCollections, |
||||
[UsePolicies] = @UsePolicies, |
||||
[UseSso] = @UseSso, |
||||
[UseGroups] = @UseGroups, |
||||
[UseDirectory] = @UseDirectory, |
||||
[UseEvents] = @UseEvents, |
||||
[UseTotp] = @UseTotp, |
||||
[Use2fa] = @Use2fa, |
||||
[UseApi] = @UseApi, |
||||
[UseResetPassword] = @UseResetPassword, |
||||
[SelfHost] = @SelfHost, |
||||
[UsersGetPremium] = @UsersGetPremium, |
||||
[Storage] = @Storage, |
||||
[MaxStorageGb] = @MaxStorageGb, |
||||
[Gateway] = @Gateway, |
||||
[GatewayCustomerId] = @GatewayCustomerId, |
||||
[GatewaySubscriptionId] = @GatewaySubscriptionId, |
||||
[ReferenceData] = @ReferenceData, |
||||
[Enabled] = @Enabled, |
||||
[LicenseKey] = @LicenseKey, |
||||
[PublicKey] = @PublicKey, |
||||
[PrivateKey] = @PrivateKey, |
||||
[TwoFactorProviders] = @TwoFactorProviders, |
||||
[ExpirationDate] = @ExpirationDate, |
||||
[CreationDate] = @CreationDate, |
||||
[RevisionDate] = @RevisionDate, |
||||
[OwnersNotifiedOfAutoscaling] = @OwnersNotifiedOfAutoscaling, |
||||
[MaxAutoscaleSeats] = @MaxAutoscaleSeats, |
||||
[UseKeyConnector] = @UseKeyConnector, |
||||
[UseScim] = @UseScim, |
||||
[UseCustomPermissions] = @UseCustomPermissions, |
||||
[UseSecretsManager] = @UseSecretsManager, |
||||
[Status] = @Status, |
||||
[UsePasswordManager] = @UsePasswordManager, |
||||
[SmSeats] = @SmSeats, |
||||
[SmServiceAccounts] = @SmServiceAccounts, |
||||
[MaxAutoscaleSmSeats] = @MaxAutoscaleSmSeats, |
||||
[MaxAutoscaleSmServiceAccounts] = @MaxAutoscaleSmServiceAccounts, |
||||
[SecretsManagerBeta] = @SecretsManagerBeta, |
||||
[LimitCollectionCreationDeletion] = @LimitCollectionCreationDeletion, |
||||
[AllowAdminAccessToAllCollectionItems] = @AllowAdminAccessToAllCollectionItems |
||||
WHERE |
||||
[Id] = @Id |
||||
END |
||||
GO |
||||
|
||||
/** |
||||
ORGANIZATION VIEWS |
||||
*/ |
||||
|
||||
--Add 'AllowAdminAccessToAllCollectionItems` to OrganizationUserOrganizationDetailsView |
||||
CREATE OR ALTER VIEW [dbo].[OrganizationUserOrganizationDetailsView] |
||||
AS |
||||
SELECT |
||||
OU.[UserId], |
||||
OU.[OrganizationId], |
||||
O.[Name], |
||||
O.[Enabled], |
||||
O.[PlanType], |
||||
O.[UsePolicies], |
||||
O.[UseSso], |
||||
O.[UseKeyConnector], |
||||
O.[UseScim], |
||||
O.[UseGroups], |
||||
O.[UseDirectory], |
||||
O.[UseEvents], |
||||
O.[UseTotp], |
||||
O.[Use2fa], |
||||
O.[UseApi], |
||||
O.[UseResetPassword], |
||||
O.[SelfHost], |
||||
O.[UsersGetPremium], |
||||
O.[UseCustomPermissions], |
||||
O.[UseSecretsManager], |
||||
O.[Seats], |
||||
O.[MaxCollections], |
||||
O.[MaxStorageGb], |
||||
O.[Identifier], |
||||
OU.[Key], |
||||
OU.[ResetPasswordKey], |
||||
O.[PublicKey], |
||||
O.[PrivateKey], |
||||
OU.[Status], |
||||
OU.[Type], |
||||
SU.[ExternalId] SsoExternalId, |
||||
OU.[Permissions], |
||||
PO.[ProviderId], |
||||
P.[Name] ProviderName, |
||||
P.[Type] ProviderType, |
||||
SS.[Data] SsoConfig, |
||||
OS.[FriendlyName] FamilySponsorshipFriendlyName, |
||||
OS.[LastSyncDate] FamilySponsorshipLastSyncDate, |
||||
OS.[ToDelete] FamilySponsorshipToDelete, |
||||
OS.[ValidUntil] FamilySponsorshipValidUntil, |
||||
OU.[AccessSecretsManager], |
||||
O.[UsePasswordManager], |
||||
O.[SmSeats], |
||||
O.[SmServiceAccounts], |
||||
O.[LimitCollectionCreationDeletion], |
||||
O.[AllowAdminAccessToAllCollectionItems] |
||||
FROM |
||||
[dbo].[OrganizationUser] OU |
||||
LEFT JOIN |
||||
[dbo].[Organization] O ON O.[Id] = OU.[OrganizationId] |
||||
LEFT JOIN |
||||
[dbo].[SsoUser] SU ON SU.[UserId] = OU.[UserId] AND SU.[OrganizationId] = OU.[OrganizationId] |
||||
LEFT JOIN |
||||
[dbo].[ProviderOrganization] PO ON PO.[OrganizationId] = O.[Id] |
||||
LEFT JOIN |
||||
[dbo].[Provider] P ON P.[Id] = PO.[ProviderId] |
||||
LEFT JOIN |
||||
[dbo].[SsoConfig] SS ON SS.[OrganizationId] = OU.[OrganizationId] |
||||
LEFT JOIN |
||||
[dbo].[OrganizationSponsorship] OS ON OS.[SponsoringOrganizationUserID] = OU.[Id] |
||||
GO |
||||
|
||||
--Manually refresh OrganizationView |
||||
IF OBJECT_ID('[dbo].[OrganizationView]') IS NOT NULL |
||||
BEGIN |
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[OrganizationView]'; |
||||
END |
||||
GO |
||||
|
||||
/** |
||||
PROVIDER VIEWS - not directly modified, but access Organization table |
||||
*/ |
||||
|
||||
--Manually refresh ProviderOrganizationOrganizationDetailsView |
||||
IF OBJECT_ID('[dbo].[ProviderOrganizationOrganizationDetailsView]') IS NOT NULL |
||||
BEGIN |
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[ProviderOrganizationOrganizationDetailsView]'; |
||||
END |
||||
GO |
||||
|
||||
--Manually refresh ProviderUserProviderOrganizationDetailsView |
||||
IF OBJECT_ID('[dbo].[ProviderUserProviderOrganizationDetailsView]') IS NOT NULL |
||||
BEGIN |
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[ProviderUserProviderOrganizationDetailsView]'; |
||||
END |
||||
GO |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,28 @@
@@ -0,0 +1,28 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations; |
||||
|
||||
#nullable disable |
||||
|
||||
namespace Bit.MySqlMigrations.Migrations; |
||||
|
||||
/// <inheritdoc /> |
||||
public partial class AdminCollectionItemAccess : Migration |
||||
{ |
||||
/// <inheritdoc /> |
||||
protected override void Up(MigrationBuilder migrationBuilder) |
||||
{ |
||||
migrationBuilder.AddColumn<bool>( |
||||
name: "AllowAdminAccessToAllCollectionItems", |
||||
table: "Organization", |
||||
type: "tinyint(1)", |
||||
nullable: false, |
||||
defaultValue: true); |
||||
} |
||||
|
||||
/// <inheritdoc /> |
||||
protected override void Down(MigrationBuilder migrationBuilder) |
||||
{ |
||||
migrationBuilder.DropColumn( |
||||
name: "AllowAdminAccessToAllCollectionItems", |
||||
table: "Organization"); |
||||
} |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,28 @@
@@ -0,0 +1,28 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations; |
||||
|
||||
#nullable disable |
||||
|
||||
namespace Bit.PostgresMigrations.Migrations; |
||||
|
||||
/// <inheritdoc /> |
||||
public partial class AdminCollectionItemAccess : Migration |
||||
{ |
||||
/// <inheritdoc /> |
||||
protected override void Up(MigrationBuilder migrationBuilder) |
||||
{ |
||||
migrationBuilder.AddColumn<bool>( |
||||
name: "AllowAdminAccessToAllCollectionItems", |
||||
table: "Organization", |
||||
type: "boolean", |
||||
nullable: false, |
||||
defaultValue: true); |
||||
} |
||||
|
||||
/// <inheritdoc /> |
||||
protected override void Down(MigrationBuilder migrationBuilder) |
||||
{ |
||||
migrationBuilder.DropColumn( |
||||
name: "AllowAdminAccessToAllCollectionItems", |
||||
table: "Organization"); |
||||
} |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,28 @@
@@ -0,0 +1,28 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations; |
||||
|
||||
#nullable disable |
||||
|
||||
namespace Bit.SqliteMigrations.Migrations; |
||||
|
||||
/// <inheritdoc /> |
||||
public partial class AdminCollectionItemAccess : Migration |
||||
{ |
||||
/// <inheritdoc /> |
||||
protected override void Up(MigrationBuilder migrationBuilder) |
||||
{ |
||||
migrationBuilder.AddColumn<bool>( |
||||
name: "AllowAdminAccessToAllCollectionItems", |
||||
table: "Organization", |
||||
type: "INTEGER", |
||||
nullable: false, |
||||
defaultValue: true); |
||||
} |
||||
|
||||
/// <inheritdoc /> |
||||
protected override void Down(MigrationBuilder migrationBuilder) |
||||
{ |
||||
migrationBuilder.DropColumn( |
||||
name: "AllowAdminAccessToAllCollectionItems", |
||||
table: "Organization"); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue