bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-10 05:13:48 +00:00
Code Issues Releases Wiki Activity

[AC-1487] Update queries to use [User] table instead of [OrganizationUser] for email address (#3083)

Browse Source
This commit is contained in:
Shane Melton
2023-07-17 11:00:32 -07:00
committed by GitHub
parent 4f87e4e1a4
commit fe570cb6c8
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Sql/Auth/dbo/Stored Procedures/AuthRequest_ReadAdminApprovalsByIds.sql
View File

@@ -6,11 +6,13 @@ BEGIN
SET NOCOUNT ON SET NOCOUNT ON
SELECT SELECT
ar.*, ou.[Email], ou.[Id] AS [OrganizationUserId] ar.*, u.[Email], ou.[Id] AS [OrganizationUserId]
FROM FROM
[dbo].[AuthRequestView] ar [dbo].[AuthRequestView] ar
INNER JOIN INNER JOIN
[dbo].[OrganizationUser] ou ON ou.[UserId] = ar.[UserId] AND ou.[OrganizationId] = ar.[OrganizationId] [dbo].[OrganizationUser] ou ON ou.[UserId] = ar.[UserId] AND ou.[OrganizationId] = ar.[OrganizationId]
INNER JOIN
[dbo].[User] u ON u.[Id] = ar.[UserId]
WHERE WHERE
ar.[OrganizationId] = @OrganizationId ar.[OrganizationId] = @OrganizationId
AND AND

4
src/Sql/Auth/dbo/Stored Procedures/AuthRequest_ReadPendingByOrganizationId.sql
View File

@@ -5,11 +5,13 @@ BEGIN
SET NOCOUNT ON SET NOCOUNT ON
SELECT SELECT
ar.*, ou.[Email], ou.[OrganizationId], ou.[Id] AS [OrganizationUserId] ar.*, u.[Email], ou.[Id] AS [OrganizationUserId]
FROM FROM
[dbo].[AuthRequestView] ar [dbo].[AuthRequestView] ar
INNER JOIN INNER JOIN
[dbo].[OrganizationUser] ou ON ou.[UserId] = ar.[UserId] AND ou.[OrganizationId] = ar.[OrganizationId] [dbo].[OrganizationUser] ou ON ou.[UserId] = ar.[UserId] AND ou.[OrganizationId] = ar.[OrganizationId]
INNER JOIN
[dbo].[User] u ON u.[Id] = ar.[UserId]
WHERE WHERE
ar.[OrganizationId] = @OrganizationId ar.[OrganizationId] = @OrganizationId
AND AND

46
util/Migrator/DbScripts/2023-07-10_00_FixTdeAdminApprovalEmail.sql Normal file
View File

@@ -0,0 +1,46 @@
CREATE OR ALTER PROCEDURE [dbo].[AuthRequest_ReadAdminApprovalsByIds]
@OrganizationId UNIQUEIDENTIFIER,
@Ids AS [dbo].[GuidIdArray] READONLY
AS
BEGIN
SET NOCOUNT ON
SELECT
ar.*, u.[Email], ou.[Id] AS [OrganizationUserId]
FROM
[dbo].[AuthRequestView] ar
INNER JOIN
[dbo].[OrganizationUser] ou ON ou.[UserId] = ar.[UserId] AND ou.[OrganizationId] = ar.[OrganizationId]
INNER JOIN
[dbo].[User] u ON u.[Id] = ar.[UserId]
WHERE
ar.[OrganizationId] = @OrganizationId
AND
ar.[Type] = 2 -- AdminApproval
AND
ar.[Id] IN (SELECT [Id] FROM @Ids)
END
GO
CREATE OR ALTER PROCEDURE [dbo].[AuthRequest_ReadPendingByOrganizationId]
@OrganizationId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
SELECT
ar.*, u.[Email], ou.[Id] AS [OrganizationUserId]
FROM
[dbo].[AuthRequestView] ar
INNER JOIN
[dbo].[OrganizationUser] ou ON ou.[UserId] = ar.[UserId] AND ou.[OrganizationId] = ar.[OrganizationId]
INNER JOIN
[dbo].[User] u ON u.[Id] = ar.[UserId]
WHERE
ar.[OrganizationId] = @OrganizationId
AND
ar.[ResponseDate] IS NULL
AND
ar.[Type] = 2 -- AdminApproval
END
GO