nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 16:12:49 -05:00
Code Activity

fix: sync ef query with view by joining also on UserId and making the expiration time check inclusive.

Browse Source
This commit is contained in:
Ike Kottlowski
2025-06-26 18:01:28 -04:00
parent eeeaefe220
commit 52df8f6583
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Infrastructure.EntityFramework/Auth/Repositories/AuthRequestRepository.cs
View File

@ -72,11 +72,12 @@ public class AuthRequestRepository : Repository<Core.Auth.Entities.AuthRequest,
where authRequest.Type == AuthRequestType.AuthenticateAndUnlock where authRequest.Type == AuthRequestType.AuthenticateAndUnlock
|| authRequest.Type == AuthRequestType.Unlock || authRequest.Type == AuthRequestType.Unlock
where authRequest.UserId == userId where authRequest.UserId == userId
where authRequest.CreationDate.AddMinutes(expirationMinutes) > DateTime.UtcNow where authRequest.CreationDate.AddMinutes(expirationMinutes) >= DateTime.UtcNow
group authRequest by authRequest.RequestDeviceIdentifier into groupedAuthRequests group authRequest by authRequest.RequestDeviceIdentifier into groupedAuthRequests
select select
(from r in groupedAuthRequests (from r in groupedAuthRequests
join d in dbContext.Devices on r.RequestDeviceIdentifier equals d.Identifier into deviceJoin join d in dbContext.Devices on new { r.RequestDeviceIdentifier, r.UserId }
equals new { RequestDeviceIdentifier = d.Identifier, d.UserId } into deviceJoin
from dj in deviceJoin.DefaultIfEmpty() // This creates a left join allowing null for devices from dj in deviceJoin.DefaultIfEmpty() // This creates a left join allowing null for devices
orderby r.CreationDate descending orderby r.CreationDate descending
select new PendingAuthRequestDetails(r, dj.Id)).First() select new PendingAuthRequestDetails(r, dj.Id)).First()