mirror of
https://github.com/bitwarden/server.git
synced 2024-12-27 17:47:37 +01:00
785e788cb6
* Increase organization max seat size from 30k to 2b (#1274) * Increase organization max seat size from 30k to 2b * PR review. Do not modify unless state matches expected * Organization sync simultaneous event reporting (#1275) * Split up azure messages according to max size * Allow simultaneous login of organization user events * Early resolve small event lists * Clarify logic Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com> * Improve readability This comes at the cost of multiple serializations, but the improvement in wire-time should more than make up for this on message where serialization time matters Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com> * Queue emails (#1286) * Extract common Azure queue methods * Do not use internal entity framework namespace * Prefer IEnumerable to IList unless needed All of these implementations were just using `Count == 1`, which is easily replicated. This will be used when abstracting Azure queues * Add model for azure queue message * Abstract Azure queue for reuse * Creat service to enqueue mail messages for later processing Azure queue mail service uses Azure queues. Blocking just blocks until all the work is done -- This is how emailing works today * Provide mail queue service to DI * Queue organization invite emails for later processing All emails can later be added to this queue * Create Admin hosted service to process enqueued mail messages * Prefer constructors to static generators * Mass delete organization users (#1287) * Add delete many to Organization Users * Correct formatting * Remove erroneous migration * Clarify parameter name * Formatting fixes * Simplify bump account revision sproc * Formatting fixes * Match file names to objects * Indicate if large import is expected * Early pull all existing users we were planning on inviting (#1290) * Early pull all existing users we were planning on inviting * Improve sproc name * Batch upsert org users (#1289) * Add UpsertMany sprocs to OrganizationUser * Add method to create TVPs from any object. Uses DbOrder attribute to generate. Sproc will fail unless TVP column order matches that of the db type * Combine migrations * Correct formatting * Include sql objects in sql project * Keep consisten parameter names * Batch deletes for performance * Correct formatting * consolidate migrations * Use batch methods in OrganizationImport * Declare @BatchSize * Transaction names limited to 32 chars Drop sproc before creating it if it exists * Update import tests * Allow for more users in org upgrades * Fix formatting * Improve class hierarchy structure * Use name tuple types * Fix formatting * Front load all reflection * Format constructor * Simplify ToTvp as class-specific extension Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com>
236 lines
5.9 KiB
Transact-SQL
236 lines
5.9 KiB
Transact-SQL
IF EXISTS (
|
|
SELECT *
|
|
FROM INFORMATION_SCHEMA.COLUMNS
|
|
WHERE COLUMN_NAME = 'Seats' AND
|
|
DATA_TYPE = 'smallint' AND
|
|
TABLE_NAME = 'Organization')
|
|
BEGIN
|
|
ALTER TABLE [dbo].[Organization]
|
|
ALTER COLUMN [Seats] INT NULL
|
|
END
|
|
GO
|
|
|
|
IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL
|
|
BEGIN
|
|
DROP PROCEDURE [dbo].[Organization_Create]
|
|
END
|
|
GO
|
|
|
|
CREATE PROCEDURE [dbo].[Organization_Create]
|
|
@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,
|
|
@SelfHost BIT,
|
|
@UsersGetPremium BIT,
|
|
@Storage BIGINT,
|
|
@MaxStorageGb SMALLINT,
|
|
@Gateway TINYINT,
|
|
@GatewayCustomerId VARCHAR(50),
|
|
@GatewaySubscriptionId VARCHAR(50),
|
|
@ReferenceData VARCHAR(MAX),
|
|
@Enabled BIT,
|
|
@LicenseKey VARCHAR(100),
|
|
@ApiKey VARCHAR(30),
|
|
@TwoFactorProviders NVARCHAR(MAX),
|
|
@ExpirationDate DATETIME2(7),
|
|
@CreationDate DATETIME2(7),
|
|
@RevisionDate DATETIME2(7)
|
|
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],
|
|
[SelfHost],
|
|
[UsersGetPremium],
|
|
[Storage],
|
|
[MaxStorageGb],
|
|
[Gateway],
|
|
[GatewayCustomerId],
|
|
[GatewaySubscriptionId],
|
|
[ReferenceData],
|
|
[Enabled],
|
|
[LicenseKey],
|
|
[ApiKey],
|
|
[TwoFactorProviders],
|
|
[ExpirationDate],
|
|
[CreationDate],
|
|
[RevisionDate]
|
|
)
|
|
VALUES
|
|
(
|
|
@Id,
|
|
@Identifier,
|
|
@Name,
|
|
@BusinessName,
|
|
@BusinessAddress1,
|
|
@BusinessAddress2,
|
|
@BusinessAddress3,
|
|
@BusinessCountry,
|
|
@BusinessTaxNumber,
|
|
@BillingEmail,
|
|
@Plan,
|
|
@PlanType,
|
|
@Seats,
|
|
@MaxCollections,
|
|
@UsePolicies,
|
|
@UseSso,
|
|
@UseGroups,
|
|
@UseDirectory,
|
|
@UseEvents,
|
|
@UseTotp,
|
|
@Use2fa,
|
|
@UseApi,
|
|
@SelfHost,
|
|
@UsersGetPremium,
|
|
@Storage,
|
|
@MaxStorageGb,
|
|
@Gateway,
|
|
@GatewayCustomerId,
|
|
@GatewaySubscriptionId,
|
|
@ReferenceData,
|
|
@Enabled,
|
|
@LicenseKey,
|
|
@ApiKey,
|
|
@TwoFactorProviders,
|
|
@ExpirationDate,
|
|
@CreationDate,
|
|
@RevisionDate
|
|
)
|
|
END
|
|
GO
|
|
|
|
-- Recreate procedure Organization_Update
|
|
IF OBJECT_ID('[dbo].[Organization_Update]') IS NOT NULL
|
|
BEGIN
|
|
DROP PROCEDURE [dbo].[Organization_Update]
|
|
END
|
|
GO
|
|
|
|
CREATE 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,
|
|
@SelfHost BIT,
|
|
@UsersGetPremium BIT,
|
|
@Storage BIGINT,
|
|
@MaxStorageGb SMALLINT,
|
|
@Gateway TINYINT,
|
|
@GatewayCustomerId VARCHAR(50),
|
|
@GatewaySubscriptionId VARCHAR(50),
|
|
@ReferenceData VARCHAR(MAX),
|
|
@Enabled BIT,
|
|
@LicenseKey VARCHAR(100),
|
|
@ApiKey VARCHAR(30),
|
|
@TwoFactorProviders NVARCHAR(MAX),
|
|
@ExpirationDate DATETIME2(7),
|
|
@CreationDate DATETIME2(7),
|
|
@RevisionDate DATETIME2(7)
|
|
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,
|
|
[SelfHost] = @SelfHost,
|
|
[UsersGetPremium] = @UsersGetPremium,
|
|
[Storage] = @Storage,
|
|
[MaxStorageGb] = @MaxStorageGb,
|
|
[Gateway] = @Gateway,
|
|
[GatewayCustomerId] = @GatewayCustomerId,
|
|
[GatewaySubscriptionId] = @GatewaySubscriptionId,
|
|
[ReferenceData] = @ReferenceData,
|
|
[Enabled] = @Enabled,
|
|
[LicenseKey] = @LicenseKey,
|
|
[ApiKey] = @ApiKey,
|
|
[TwoFactorProviders] = @TwoFactorProviders,
|
|
[ExpirationDate] = @ExpirationDate,
|
|
[CreationDate] = @CreationDate,
|
|
[RevisionDate] = @RevisionDate
|
|
WHERE
|
|
[Id] = @Id
|
|
END
|
|
GO
|