1
0
mirror of https://github.com/bitwarden/server.git synced 2025-07-18 08:00:59 -05:00

Send APIs (#979)

* send work

* fix sql proj file

* update

* updates

* access id

* delete job

* fix delete job

* local send storage

* update sprocs for null checks
This commit is contained in:
Kyle Spearrin
2020-11-02 15:55:49 -05:00
committed by GitHub
parent a5db233e51
commit 82dd364e65
39 changed files with 1774 additions and 11 deletions

View File

@ -274,5 +274,18 @@
<Build Include="dbo\Stored Procedures\User_ReadBySsoUserOrganizationIdExternalId.sql" />
<Build Include="dbo\Stored Procedures\SsoUser_Update.sql" />
<Build Include="dbo\Stored Procedures\SsoUser_ReadById.sql" />
<Build Include="dbo\Stored Procedures\Cipher_DeleteByIdsOrganizationId.sql" />
<Build Include="dbo\Stored Procedures\Cipher_SoftDeleteByIdsOrganizationId.sql" />
<Build Include="dbo\Stored Procedures\Organization_ReadByIdentifier.sql" />
<Build Include="dbo\Stored Procedures\Send_Create.sql" />
<Build Include="dbo\Stored Procedures\Send_DeleteById.sql" />
<Build Include="dbo\Stored Procedures\Send_ReadById.sql" />
<Build Include="dbo\Stored Procedures\Send_ReadByUserId.sql" />
<Build Include="dbo\Stored Procedures\Send_Update.sql" />
<Build Include="dbo\Stored Procedures\SsoConfig_ReadManyByNotBeforeRevisionDate.sql" />
<Build Include="dbo\Tables\Send.sql" />
<Build Include="dbo\Views\SendView.sql" />
<Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserIds.sql" />
<Build Include="dbo\Stored Procedures\Send_ReadByDeletionDateBefore.sql" />
</ItemGroup>
</Project>

View File

@ -4,7 +4,8 @@ AS
BEGIN
SET NOCOUNT ON
DECLARE @Storage BIGINT
DECLARE @AttachmentStorage BIGINT
DECLARE @SendStorage BIGINT
CREATE TABLE #OrgStorageUpdateTemp
(
@ -35,16 +36,31 @@ BEGIN
#OrgStorageUpdateTemp
)
SELECT
@Storage = SUM([Size])
@AttachmentStorage = SUM([Size])
FROM
[CTE]
DROP TABLE #OrgStorageUpdateTemp
;WITH [CTE] AS (
SELECT
[Id],
CAST(JSON_VALUE([Data],'$.Size') AS BIGINT) [Size]
FROM
[Send]
WHERE
[UserId] IS NULL
AND [OrganizationId] = @Id
)
SELECT
@SendStorage = SUM([CTE].[Size])
FROM
[CTE]
UPDATE
[dbo].[Organization]
SET
[Storage] = @Storage,
[Storage] = (ISNULL(@AttachmentStorage, 0) + ISNULL(@SendStorage, 0)),
[RevisionDate] = GETUTCDATE()
WHERE
[Id] = @Id

View File

@ -0,0 +1,64 @@
CREATE PROCEDURE [dbo].[Send_Create]
@Id UNIQUEIDENTIFIER,
@UserId UNIQUEIDENTIFIER,
@OrganizationId UNIQUEIDENTIFIER,
@Type TINYINT,
@Data VARCHAR(MAX),
@Key VARCHAR(MAX),
@Password NVARCHAR(300),
@MaxAccessCount INT,
@AccessCount INT,
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@ExpirationDate DATETIME2(7),
@DeletionDate DATETIME2(7),
@Disabled BIT
AS
BEGIN
SET NOCOUNT ON
INSERT INTO [dbo].[Send]
(
[Id],
[UserId],
[OrganizationId],
[Type],
[Data],
[Key],
[Password],
[MaxAccessCount],
[AccessCount],
[CreationDate],
[RevisionDate],
[ExpirationDate],
[DeletionDate],
[Disabled]
)
VALUES
(
@Id,
@UserId,
@OrganizationId,
@Type,
@Data,
@Key,
@Password,
@MaxAccessCount,
@AccessCount,
@CreationDate,
@RevisionDate,
@ExpirationDate,
@DeletionDate,
@Disabled
)
IF @UserId IS NOT NULL
BEGIN
IF @Type = 1 --File
BEGIN
EXEC [dbo].[User_UpdateStorage] @UserId
END
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
END
-- TODO: OrganizationId bump?
END

View File

@ -0,0 +1,35 @@
CREATE PROCEDURE [dbo].[Send_DeleteById]
@Id UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
DECLARE @UserId UNIQUEIDENTIFIER
DECLARE @OrganizationId UNIQUEIDENTIFIER
DECLARE @Type TINYINT
SELECT TOP 1
@UserId = [UserId],
@OrganizationId = [OrganizationId],
@Type = [Type]
FROM
[dbo].[Send]
WHERE
[Id] = @Id
DELETE
FROM
[dbo].[Send]
WHERE
[Id] = @Id
IF @UserId IS NOT NULL
BEGIN
IF @Type = 1 --File
BEGIN
EXEC [dbo].[User_UpdateStorage] @UserId
END
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
END
-- TODO: OrganizationId bump?
END

View File

@ -0,0 +1,13 @@
CREATE PROCEDURE [dbo].[Send_ReadByDeletionDateBefore]
@DeletionDate DATETIME2(7)
AS
BEGIN
SET NOCOUNT ON
SELECT
*
FROM
[dbo].[SendView]
WHERE
[DeletionDate] < @DeletionDate
END

View File

@ -0,0 +1,13 @@
CREATE PROCEDURE [dbo].[Send_ReadById]
@Id UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
SELECT
*
FROM
[dbo].[SendView]
WHERE
[Id] = @Id
END

View File

@ -0,0 +1,14 @@
CREATE PROCEDURE [dbo].[Send_ReadByUserId]
@UserId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
SELECT
*
FROM
[dbo].[SendView]
WHERE
[OrganizationId] IS NULL
AND [UserId] = @UserId
END

View File

@ -0,0 +1,44 @@
CREATE PROCEDURE [dbo].[Send_Update]
@Id UNIQUEIDENTIFIER,
@UserId UNIQUEIDENTIFIER,
@OrganizationId UNIQUEIDENTIFIER,
@Type TINYINT,
@Data VARCHAR(MAX),
@Key VARCHAR(MAX),
@Password NVARCHAR(300),
@MaxAccessCount INT,
@AccessCount INT,
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@ExpirationDate DATETIME2(7),
@DeletionDate DATETIME2(7),
@Disabled BIT
AS
BEGIN
SET NOCOUNT ON
UPDATE
[dbo].[Send]
SET
[UserId] = @UserId,
[OrganizationId] = @OrganizationId,
[Type] = @Type,
[Data] = @Data,
[Key] = @Key,
[Password] = @Password,
[MaxAccessCount] = @MaxAccessCount,
[AccessCount] = @AccessCount,
[CreationDate] = @CreationDate,
[RevisionDate] = @RevisionDate,
[ExpirationDate] = @ExpirationDate,
[DeletionDate] = @DeletionDate,
[Disabled] = @Disabled
WHERE
[Id] = @Id
IF @UserId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
END
-- TODO: OrganizationId bump?
END

View File

@ -4,7 +4,8 @@ AS
BEGIN
SET NOCOUNT ON
DECLARE @Storage BIGINT
DECLARE @AttachmentStorage BIGINT
DECLARE @SendStorage BIGINT
CREATE TABLE #UserStorageUpdateTemp
(
@ -34,16 +35,30 @@ BEGIN
#UserStorageUpdateTemp
)
SELECT
@Storage = SUM([CTE].[Size])
@AttachmentStorage = SUM([CTE].[Size])
FROM
[CTE]
DROP TABLE #UserStorageUpdateTemp
;WITH [CTE] AS (
SELECT
[Id],
CAST(JSON_VALUE([Data],'$.Size') AS BIGINT) [Size]
FROM
[Send]
WHERE
[UserId] = @Id
)
SELECT
@SendStorage = SUM([CTE].[Size])
FROM
[CTE]
UPDATE
[dbo].[User]
SET
[Storage] = @Storage,
[Storage] = (ISNULL(@AttachmentStorage, 0) + ISNULL(@SendStorage, 0)),
[RevisionDate] = GETUTCDATE()
WHERE
[Id] = @Id

View File

@ -0,0 +1,29 @@
CREATE TABLE [dbo].[Send] (
[Id] UNIQUEIDENTIFIER NOT NULL,
[UserId] UNIQUEIDENTIFIER NULL,
[OrganizationId] UNIQUEIDENTIFIER NULL,
[Type] TINYINT NOT NULL,
[Data] VARCHAR(MAX) NOT NULL,
[Key] VARCHAR (MAX) NOT NULL,
[Password] NVARCHAR (300) NULL,
[MaxAccessCount] INT NULL,
[AccessCount] INT NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
[ExpirationDate] DATETIME2 (7) NULL,
[DeletionDate] DATETIME2 (7) NOT NULL,
[Disabled] BIT NOT NULL,
CONSTRAINT [PK_Send] PRIMARY KEY CLUSTERED ([Id] ASC),
CONSTRAINT [FK_Send_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]),
CONSTRAINT [FK_Send_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id])
);
GO
CREATE NONCLUSTERED INDEX [IX_Send_UserId_OrganizationId]
ON [dbo].[Send]([UserId] ASC, [OrganizationId] ASC);
GO
CREATE NONCLUSTERED INDEX [IX_Send_DeletionDate]
ON [dbo].[Send]([DeletionDate] ASC);

View File

@ -0,0 +1,6 @@
CREATE VIEW [dbo].[SendView]
AS
SELECT
*
FROM
[dbo].[Send]