mirror of
https://github.com/bitwarden/server
synced 2026-01-11 13:03:27 +00:00
* update send api models to support new `email` field
* normalize authentication field evaluation order
* document send response converters
* add FIXME to remove unused constructor argument
* add FIXME to remove unused constructor argument
* introduce `tools-send-email-otp-listing` feature flag
* add `ISendOwnerQuery` to dependency graph
* fix broken tests
* added AuthType prop to send related models with test coverage and debt cleanup
* dotnet format
* add migrations
* dotnet format
* make SendsController null safe (tech debt)
* add AuthType col to Sends table, change Emails col length to 4000, and run migrations
* dotnet format
* update SPs to expect AuthType
* include SP updates in migrations
* remove migrations not intended for merge
* Revert "remove migrations not intended for merge"
This reverts commit 7df56e346a.
undo migrations removal
* extract AuthType inference to util method and remove SQLite file
* fix lints
* address review comments
* fix incorrect assignment and adopt SQL conventions
* fix column assignment order in Send_Update.sql
* remove space added to email list
* assign SQL default value of NULL to AuthType
* update SPs to match migration changes
---------
Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Co-authored-by: Alex Dragovich <46065570+itsadrago@users.noreply.github.com>
Co-authored-by: John Harrington <84741727+harr1424@users.noreply.github.com>
79 lines
1.7 KiB
Transact-SQL
79 lines
1.7 KiB
Transact-SQL
CREATE PROCEDURE [dbo].[Send_Create]
|
|
@Id UNIQUEIDENTIFIER OUTPUT,
|
|
@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,
|
|
@HideEmail BIT,
|
|
@CipherId UNIQUEIDENTIFIER = NULL,
|
|
-- FIXME: remove null default value once this argument has been
|
|
-- in 2 server releases
|
|
@Emails NVARCHAR(4000) = NULL,
|
|
@AuthType TINYINT = NULL
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
INSERT INTO [dbo].[Send]
|
|
(
|
|
[Id],
|
|
[UserId],
|
|
[OrganizationId],
|
|
[Type],
|
|
[Data],
|
|
[Key],
|
|
[Password],
|
|
[MaxAccessCount],
|
|
[AccessCount],
|
|
[CreationDate],
|
|
[RevisionDate],
|
|
[ExpirationDate],
|
|
[DeletionDate],
|
|
[Disabled],
|
|
[HideEmail],
|
|
[CipherId],
|
|
[Emails],
|
|
[AuthType]
|
|
)
|
|
VALUES
|
|
(
|
|
@Id,
|
|
@UserId,
|
|
@OrganizationId,
|
|
@Type,
|
|
@Data,
|
|
@Key,
|
|
@Password,
|
|
@MaxAccessCount,
|
|
@AccessCount,
|
|
@CreationDate,
|
|
@RevisionDate,
|
|
@ExpirationDate,
|
|
@DeletionDate,
|
|
@Disabled,
|
|
@HideEmail,
|
|
@CipherId,
|
|
@Emails,
|
|
@AuthType
|
|
)
|
|
|
|
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
|