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

Remove GetManyDetailsByUserAsync & ReplaceAsync DB Calls (#6012)

Browse Source
This commit is contained in:
Justin Baur
2025-06-30 08:08:01 -04:00
committed by GitHub
parent 69b7600eab
commit 386b391dd7
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Controllers/DevicesController.cs
View File

@ -206,7 +206,11 @@ public class DevicesController : Controller
throw new NotFoundException(); throw new NotFoundException();
} }
await _deviceService.SaveAsync(model.ToData(), device); await _deviceService.SaveAsync(
model.ToData(),
device,
_currentContext.Organizations.Select(org => org.Id.ToString())
);
} }
[AllowAnonymous] [AllowAnonymous]

2
src/Core/Services/IDeviceService.cs
View File

@ -6,7 +6,7 @@ namespace Bit.Core.Services;
public interface IDeviceService public interface IDeviceService
{ {
Task SaveAsync(WebPushRegistrationData webPush, Device device); Task SaveAsync(WebPushRegistrationData webPush, Device device, IEnumerable<string> organizationIds);
Task SaveAsync(Device device); Task SaveAsync(Device device);
Task ClearTokenAsync(Device device); Task ClearTokenAsync(Device device);
Task DeactivateAsync(Device device); Task DeactivateAsync(Device device);

12
src/Core/Services/Implementations/DeviceService.cs
View File

@ -29,9 +29,17 @@ public class DeviceService : IDeviceService
_globalSettings = globalSettings; _globalSettings = globalSettings;
} }
public async Task SaveAsync(WebPushRegistrationData webPush, Device device) public async Task SaveAsync(WebPushRegistrationData webPush, Device device, IEnumerable<string> organizationIds)
{ {
await SaveAsync(new PushRegistrationData(webPush.Endpoint, webPush.P256dh, webPush.Auth), device); await _pushRegistrationService.CreateOrUpdateRegistrationAsync(
new PushRegistrationData(webPush.Endpoint, webPush.P256dh, webPush.Auth),
device.Id.ToString(),
device.UserId.ToString(),
device.Identifier,
device.Type,
organizationIds,
_globalSettings.Installation.Id
);
} }
public async Task SaveAsync(Device device) public async Task SaveAsync(Device device)