mirror of
https://github.com/bitwarden/server.git
synced 2025-06-30 15:42:48 -05:00
feat: change stored procedure to create a view that stores the previous query so it can be accessed through a more simple parameterized stored procedure.
This commit is contained in:
@ -1,46 +1,13 @@
|
||||
CREATE PROCEDURE [dbo].[AuthRequest_ReadPendingByUserId]
|
||||
|
||||
CREATE OR ALTER PROCEDURE [dbo].[AuthRequest_ReadPendingByUserId]
|
||||
@UserId UNIQUEIDENTIFIER,
|
||||
@ExpirationMinutes INT
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON;
|
||||
SET NOCOUNT ON
|
||||
|
||||
;
|
||||
WITH
|
||||
PendingRequests
|
||||
AS
|
||||
(
|
||||
SELECT
|
||||
AR.*,
|
||||
D.Id AS DeviceId,
|
||||
ROW_NUMBER() OVER (PARTITION BY AR.RequestDeviceIdentifier ORDER BY AR.CreationDate DESC) AS rn
|
||||
FROM dbo.AuthRequestView AR
|
||||
LEFT JOIN Device D ON AR.RequestDeviceIdentifier = D.Identifier
|
||||
AND D.UserId = AR.UserId
|
||||
WHERE AR.Type IN (0, 1) -- 0 = AuthenticateAndUnlock, 1 = Unlock
|
||||
AND AR.CreationDate >= DATEADD(MINUTE, -@ExpirationMinutes, GETUTCDATE())
|
||||
AND AR.UserId = @UserId
|
||||
)
|
||||
SELECT
|
||||
PR.Id,
|
||||
PR.UserId,
|
||||
PR.OrganizationId,
|
||||
PR.Type,
|
||||
PR.RequestDeviceIdentifier,
|
||||
PR.RequestDeviceType,
|
||||
PR.RequestIpAddress,
|
||||
PR.RequestCountryName,
|
||||
PR.ResponseDeviceId,
|
||||
PR.AccessCode,
|
||||
PR.PublicKey,
|
||||
PR.[Key],
|
||||
PR.MasterPasswordHash,
|
||||
PR.Approved,
|
||||
PR.CreationDate,
|
||||
PR.ResponseDate,
|
||||
PR.AuthenticationDate,
|
||||
PR.DeviceId
|
||||
FROM PendingRequests PR
|
||||
WHERE rn = 1
|
||||
AND PR.Approved IS NULL;
|
||||
END;
|
||||
SELECT *
|
||||
FROM [dbo].[AuthRequestPendingDetailsView]
|
||||
WHERE [UserId] = @UserId
|
||||
AND [CreationDate] >= DATEADD(MINUTE, -@ExpirationMinutes, GETUTCDATE())
|
||||
END
|
@ -1,47 +1,53 @@
|
||||
-- Adds a stored procedure to read pending authentication requests by user ID.
|
||||
CREATE OR ALTER PROCEDURE [dbo].[AuthRequest_ReadPendingByUserId]
|
||||
@UserId UNIQUEIDENTIFIER,
|
||||
@ExpirationMinutes INT
|
||||
CREATE OR ALTER VIEW [dbo].[AuthRequestPendingDetailsView]
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON;
|
||||
|
||||
;
|
||||
WITH
|
||||
PendingRequests
|
||||
AS
|
||||
(
|
||||
SELECT
|
||||
AR.*,
|
||||
D.Id AS DeviceId,
|
||||
ROW_NUMBER() OVER (PARTITION BY AR.RequestDeviceIdentifier ORDER BY AR.CreationDate DESC) AS rn
|
||||
FROM dbo.AuthRequestView AR
|
||||
LEFT JOIN Device D ON AR.RequestDeviceIdentifier = D.Identifier
|
||||
AND D.UserId = AR.UserId
|
||||
WHERE AR.Type IN (0, 1) -- 0 = AuthenticateAndUnlock, 1 = Unlock
|
||||
AND AR.CreationDate >= DATEADD(MINUTE, -@ExpirationMinutes, GETUTCDATE())
|
||||
AND AR.UserId = @UserId
|
||||
[AR].*,
|
||||
[D].[Id] AS [DeviceId],
|
||||
ROW_NUMBER() OVER (PARTITION BY [AR].[RequestDeviceIdentifier] ORDER BY [AR].[CreationDate] DESC) AS [rn]
|
||||
FROM [dbo].[AuthRequest] [AR]
|
||||
LEFT JOIN [dbo].[Device] [D]
|
||||
ON [AR].[RequestDeviceIdentifier] = [D].[Identifier]
|
||||
AND [D].[UserId] = [AR].[UserId]
|
||||
WHERE [AR].[Type] IN (0, 1) -- 0 = AuthenticateAndUnlock, 1 = Unlock
|
||||
)
|
||||
SELECT
|
||||
PR.Id,
|
||||
PR.UserId,
|
||||
PR.OrganizationId,
|
||||
PR.Type,
|
||||
PR.RequestDeviceIdentifier,
|
||||
PR.RequestDeviceType,
|
||||
PR.RequestIpAddress,
|
||||
PR.RequestCountryName,
|
||||
PR.ResponseDeviceId,
|
||||
PR.AccessCode,
|
||||
PR.PublicKey,
|
||||
PR.[Key],
|
||||
PR.MasterPasswordHash,
|
||||
PR.Approved,
|
||||
PR.CreationDate,
|
||||
PR.ResponseDate,
|
||||
PR.AuthenticationDate,
|
||||
PR.DeviceId
|
||||
FROM PendingRequests PR
|
||||
WHERE rn = 1
|
||||
AND PR.Approved IS NULL;
|
||||
END;
|
||||
[PR].[Id],
|
||||
[PR].[UserId],
|
||||
[PR].[OrganizationId],
|
||||
[PR].[Type],
|
||||
[PR].[RequestDeviceIdentifier],
|
||||
[PR].[RequestDeviceType],
|
||||
[PR].[RequestIpAddress],
|
||||
[PR].[RequestCountryName],
|
||||
[PR].[ResponseDeviceId],
|
||||
[PR].[AccessCode],
|
||||
[PR].[PublicKey],
|
||||
[PR].[Key],
|
||||
[PR].[MasterPasswordHash],
|
||||
[PR].[Approved],
|
||||
[PR].[CreationDate],
|
||||
[PR].[ResponseDate],
|
||||
[PR].[AuthenticationDate],
|
||||
[PR].[DeviceId]
|
||||
FROM [PendingRequests] [PR]
|
||||
WHERE [PR].[rn] = 1
|
||||
AND [PR].[Approved] IS NULL -- since we only want pending requests we only want the most recent that is also approved = null
|
||||
GO
|
||||
|
||||
CREATE OR ALTER PROCEDURE [dbo].[AuthRequest_ReadPendingByUserId]
|
||||
@UserId UNIQUEIDENTIFIER,
|
||||
@ExpirationMinutes INT
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
SELECT *
|
||||
FROM [dbo].[AuthRequestPendingDetailsView]
|
||||
WHERE [UserId] = @UserId
|
||||
AND [CreationDate] >= DATEADD(MINUTE, -@ExpirationMinutes, GETUTCDATE())
|
||||
END
|
||||
GO
|
Reference in New Issue
Block a user