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

PM-10600: Required attribute, organization group for push notification fix

Browse Source
This commit is contained in:
Maciej Zieniuk
2024-10-24 13:05:11 +01:00
parent 07ed1e947a
commit 491789bd5a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Models/Api/Request/PushSendRequestModel.cs
View File

@ -10,8 +10,8 @@ public class PushSendRequestModel : IValidatableObject
public string? OrganizationId { get; set; } public string? OrganizationId { get; set; }
public string? DeviceId { get; set; } public string? DeviceId { get; set; }
public string? Identifier { get; set; } public string? Identifier { get; set; }
[Required] public PushType Type { get; set; } public required PushType Type { get; set; }
[Required] public object Payload { get; set; } = null!; public required object Payload { get; set; }
public ClientType? ClientType { get; set; } public ClientType? ClientType { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext) public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)

2
src/Notifications/NotificationsHub.cs
View File

@ -80,7 +80,7 @@ public class NotificationsHub : Microsoft.AspNetCore.SignalR.Hub
public static string GetOrganizationGroup(Guid organizationId, ClientType? clientType = null) public static string GetOrganizationGroup(Guid organizationId, ClientType? clientType = null)
{ {
return clientType is not ClientType.All return clientType is null or ClientType.All
? $"Organization_{organizationId}" ? $"Organization_{organizationId}"
: $"OrganizationClientType_{organizationId}_{clientType}"; : $"OrganizationClientType_{organizationId}_{clientType}";
} }