nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-04 20:50:21 -05:00
Code

ArgumentNullException: Value cannot be null in POST /push/register (#5472)

Browse Source
This commit is contained in:
Maciej Zieniuk 2025-03-06 22:13:02 +01:00 committed by GitHub
parent cb1c12794f
commit 8628206fa9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Api/Platform/Push/Controllers/PushController.cs
View File

@ -43,8 +43,9 @@ public class PushController : Controller
public async Task RegisterAsync([FromBody] PushRegistrationRequestModel model) public async Task RegisterAsync([FromBody] PushRegistrationRequestModel model)
{ {
CheckUsage(); CheckUsage();
await _pushRegistrationService.CreateOrUpdateRegistrationAsync(new PushRegistrationData(model.PushToken), Prefix(model.DeviceId), await _pushRegistrationService.CreateOrUpdateRegistrationAsync(new PushRegistrationData(model.PushToken),
Prefix(model.UserId), Prefix(model.Identifier), model.Type, model.OrganizationIds.Select(Prefix), model.InstallationId); Prefix(model.DeviceId), Prefix(model.UserId), Prefix(model.Identifier), model.Type,
model.OrganizationIds?.Select(Prefix) ?? [], model.InstallationId);
} }
[HttpPost("delete")] [HttpPost("delete")]

32
test/Api.Test/Platform/Push/Controllers/PushControllerTests.cs
View File

@ -243,20 +243,22 @@ public class PushControllerTests
PushToken = "test-push-token", PushToken = "test-push-token",
UserId = userId.ToString(), UserId = userId.ToString(),
Type = DeviceType.Android, Type = DeviceType.Android,
Identifier = identifier.ToString() Identifier = identifier.ToString(),
})); }));
Assert.Equal("Not correctly configured for push relays.", exception.Message); Assert.Equal("Not correctly configured for push relays.", exception.Message);
await sutProvider.GetDependency<IPushRegistrationService>().Received(0) await sutProvider.GetDependency<IPushRegistrationService>().Received(0)
.CreateOrUpdateRegistrationAsync(Arg.Any<PushRegistrationData>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), .CreateOrUpdateRegistrationAsync(Arg.Any<PushRegistrationData>(), Arg.Any<string>(), Arg.Any<string>(),
Arg.Any<DeviceType>(), Arg.Any<IEnumerable<string>>(), Arg.Any<Guid>()); Arg.Any<string>(), Arg.Any<DeviceType>(), Arg.Any<IEnumerable<string>>(), Arg.Any<Guid>());
} }
[Theory] [Theory]
[BitAutoData] [BitAutoData(false)]
public async Task? RegisterAsync_ValidModel_CreatedOrUpdatedRegistration(SutProvider<PushController> sutProvider, [BitAutoData(true)]
Guid installationId, Guid userId, Guid identifier, Guid deviceId, Guid organizationId) public async Task RegisterAsync_ValidModel_CreatedOrUpdatedRegistration(bool haveOrganizationId,
SutProvider<PushController> sutProvider, Guid installationId, Guid userId, Guid identifier, Guid deviceId,
Guid organizationId)
{ {
sutProvider.GetDependency<IGlobalSettings>().SelfHosted = false; sutProvider.GetDependency<IGlobalSettings>().SelfHosted = false;
sutProvider.GetDependency<ICurrentContext>().InstallationId.Returns(installationId); sutProvider.GetDependency<ICurrentContext>().InstallationId.Returns(installationId);
@ -273,19 +275,29 @@ public class PushControllerTests
UserId = userId.ToString(), UserId = userId.ToString(),
Type = DeviceType.Android, Type = DeviceType.Android,
Identifier = identifier.ToString(), Identifier = identifier.ToString(),
OrganizationIds = [organizationId.ToString()], OrganizationIds = haveOrganizationId ? [organizationId.ToString()] : null,
InstallationId = installationId InstallationId = installationId
}; };
await sutProvider.Sut.RegisterAsync(model); await sutProvider.Sut.RegisterAsync(model);
await sutProvider.GetDependency<IPushRegistrationService>().Received(1) await sutProvider.GetDependency<IPushRegistrationService>().Received(1)
.CreateOrUpdateRegistrationAsync(Arg.Is<PushRegistrationData>(data => data == new PushRegistrationData(model.PushToken)), expectedDeviceId, expectedUserId, .CreateOrUpdateRegistrationAsync(
Arg.Is<PushRegistrationData>(data => data == new PushRegistrationData(model.PushToken)),
expectedDeviceId, expectedUserId,
expectedIdentifier, DeviceType.Android, Arg.Do<IEnumerable<string>>(organizationIds => expectedIdentifier, DeviceType.Android, Arg.Do<IEnumerable<string>>(organizationIds =>
{ {
Assert.NotNull(organizationIds);
var organizationIdsList = organizationIds.ToList(); var organizationIdsList = organizationIds.ToList();
Assert.Contains(expectedOrganizationId, organizationIdsList); if (haveOrganizationId)
Assert.Single(organizationIdsList); {
Assert.Contains(expectedOrganizationId, organizationIdsList);
Assert.Single(organizationIdsList);
}
else
{
Assert.Empty(organizationIdsList);
}
}), installationId); }), installationId);
} }
} }