1
0
mirror of https://github.com/bitwarden/server synced 2026-01-02 00:23:40 +00:00

Merge remote-tracking branch 'origin/main' into dbops/dbops-31/csv-import

This commit is contained in:
Mark Kincaid
2025-11-10 16:47:03 -08:00
71 changed files with 2153 additions and 573 deletions

View File

@@ -0,0 +1,30 @@
CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_ConfirmById]
@Id UNIQUEIDENTIFIER,
@UserId UNIQUEIDENTIFIER,
@RevisionDate DATETIME2(7),
@Key NVARCHAR(MAX) = NULL
AS
BEGIN
SET NOCOUNT ON
DECLARE @RowCount INT;
UPDATE
[dbo].[OrganizationUser]
SET
[Status] = 2, -- Set to Confirmed
[RevisionDate] = @RevisionDate,
[Key] = @Key
WHERE
[Id] = @Id
AND [Status] = 1 -- Only update if status is Accepted
SET @RowCount = @@ROWCOUNT;
IF @RowCount > 0
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
END
SELECT @RowCount;
END