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

ArgumentNullException: Value cannot be null in POST /push/register

Browse Source
This commit is contained in:
Maciej Zieniuk 2025-03-06 15:18:50 +00:00
parent 190dace483
commit d6cd95bfac
No known key found for this signature in database
GPG Key ID: 9CACE59F1272ACD9
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -242,7 +242,7 @@ public class PushControllerTests
PushToken = "test-push-token",
UserId = userId.ToString(),
Type = DeviceType.Android,
Identifier = identifier.ToString()
Identifier = identifier.ToString(),
}));
Assert.Equal("Not correctly configured for push relays.", exception.Message);
@ -253,9 +253,11 @@ public class PushControllerTests
}
[Theory]
[BitAutoData]
public async Task? RegisterAsync_ValidModel_CreatedOrUpdatedRegistration(SutProvider<PushController> sutProvider,
Guid installationId, Guid userId, Guid identifier, Guid deviceId, Guid organizationId)
[BitAutoData(false)]
[BitAutoData(true)]
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<ICurrentContext>().InstallationId.Returns(installationId);
@ -272,7 +274,7 @@ public class PushControllerTests
UserId = userId.ToString(),
Type = DeviceType.Android,
Identifier = identifier.ToString(),
OrganizationIds = [organizationId.ToString()],
OrganizationIds = haveOrganizationId ? [organizationId.ToString()] : null,
InstallationId = installationId
});
@ -280,9 +282,17 @@ public class PushControllerTests
.CreateOrUpdateRegistrationAsync("test-push-token", expectedDeviceId, expectedUserId,
expectedIdentifier, DeviceType.Android, Arg.Do<IEnumerable<string>>(organizationIds =>
{
Assert.NotNull(organizationIds);
var organizationIdsList = organizationIds.ToList();
Assert.Contains(expectedOrganizationId, organizationIdsList);
Assert.Single(organizationIdsList);
if (haveOrganizationId)
{
Assert.Contains(expectedOrganizationId, organizationIdsList);
Assert.Single(organizationIdsList);
}
else
{
Assert.Empty(organizationIdsList);
}
}), installationId);
}
}