mirror of
https://github.com/bitwarden/server.git
synced 2025-02-21 02:41:21 +01:00
* PM-10600: Notification push notification * PM-10600: Sending to specific client types for relay push notifications * PM-10600: Sending to specific client types for other clients * PM-10600: Send push notification on notification creation * PM-10600: Explicit group names * PM-10600: Id typos * PM-10600: Revert global push notifications * PM-10600: Added DeviceType claim * PM-10600: Sent to organization typo * PM-10600: UT coverage * PM-10600: Small refactor, UTs coverage * PM-10600: UTs coverage * PM-10600: Startup fix * PM-10600: Test fix * PM-10600: Required attribute, organization group for push notification fix * PM-10600: UT coverage * PM-10600: Fix Mobile devices not registering to organization push notifications We only register devices for organization push notifications when the organization is being created. This does not work, since we have a use case (Notification Center) of delivering notifications to all users of organization. This fixes it, by adding the organization id tag when device registers for push notifications. * PM-10600: Unit Test coverage for NotificationHubPushRegistrationService Fixed IFeatureService substitute mocking for Android tests. Added user part of organization test with organizationId tags expectation. * PM-10600: Unit Tests fix to NotificationHubPushRegistrationService after merge conflict * PM-10600: Organization push notifications not sending to mobile device from self-hosted. Self-hosted instance uses relay to register the mobile device against Bitwarden Cloud Api. Only the self-hosted server knows client's organization membership, which means it needs to pass in the organization id's information to the relay. Similarly, for Bitwarden Cloud, the organizaton id will come directly from the server. * PM-10600: Fix self-hosted organization notification not being received by mobile device. When mobile device registers on self-hosted through the relay, every single id, like user id, device id and now organization id needs to be prefixed with the installation id. This have been missing in the PushController that handles this for organization id. * PM-10600: Broken NotificationsController integration test Device type is now part of JWT access token, so the notification center results in the integration test are now scoped to client type web and all. * PM-10600: Merge conflicts fix * merge conflict fix * PM-10600: Push notification with full notification center content. Notification Center push notification now includes all the fields. * PM-10564: Push notification updates to other clients Cherry-picked and squashed commits:d9711b6031
6e69c8a0ce
01c814595e
3885885d5f
1285a7e994
fcf346985f
28ff53c293
57804ae27c
1c9339b686
* null check fix * logging using template formatting
115 lines
4.9 KiB
C#
115 lines
4.9 KiB
C#
#nullable enable
|
|
using System.Security.Claims;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Exceptions;
|
|
using Bit.Core.NotificationCenter.Authorization;
|
|
using Bit.Core.NotificationCenter.Commands;
|
|
using Bit.Core.NotificationCenter.Entities;
|
|
using Bit.Core.NotificationCenter.Enums;
|
|
using Bit.Core.NotificationCenter.Repositories;
|
|
using Bit.Core.Platform.Push;
|
|
using Bit.Core.Test.NotificationCenter.AutoFixture;
|
|
using Bit.Core.Utilities;
|
|
using Bit.Test.Common.AutoFixture;
|
|
using Bit.Test.Common.AutoFixture.Attributes;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
|
|
namespace Bit.Core.Test.NotificationCenter.Commands;
|
|
|
|
[SutProviderCustomize]
|
|
[NotificationCustomize]
|
|
public class UpdateNotificationCommandTest
|
|
{
|
|
private static void Setup(SutProvider<UpdateNotificationCommand> sutProvider,
|
|
Guid notificationId, Notification? notification, bool authorized = false)
|
|
{
|
|
sutProvider.GetDependency<INotificationRepository>()
|
|
.GetByIdAsync(notificationId)
|
|
.Returns(notification);
|
|
sutProvider.GetDependency<IAuthorizationService>()
|
|
.AuthorizeAsync(Arg.Any<ClaimsPrincipal>(), notification ?? Arg.Any<Notification>(),
|
|
Arg.Is<IEnumerable<IAuthorizationRequirement>>(reqs =>
|
|
reqs.Contains(NotificationOperations.Update)))
|
|
.Returns(authorized ? AuthorizationResult.Success() : AuthorizationResult.Failed());
|
|
|
|
sutProvider.GetDependency<INotificationRepository>().ClearReceivedCalls();
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
public async Task UpdateAsync_NotificationNotFound_NotFoundException(
|
|
SutProvider<UpdateNotificationCommand> sutProvider,
|
|
Notification notification)
|
|
{
|
|
Setup(sutProvider, notification.Id, notification: null, true);
|
|
|
|
await Assert.ThrowsAsync<NotFoundException>(() => sutProvider.Sut.UpdateAsync(notification));
|
|
await sutProvider.GetDependency<IPushNotificationService>()
|
|
.Received(0)
|
|
.PushNotificationAsync(Arg.Any<Notification>());
|
|
await sutProvider.GetDependency<IPushNotificationService>()
|
|
.Received(0)
|
|
.PushNotificationStatusAsync(Arg.Any<Notification>(), Arg.Any<NotificationStatus>());
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
public async Task UpdateAsync_AuthorizationFailed_NotFoundException(
|
|
SutProvider<UpdateNotificationCommand> sutProvider,
|
|
Notification notification)
|
|
{
|
|
Setup(sutProvider, notification.Id, notification, authorized: false);
|
|
|
|
await Assert.ThrowsAsync<NotFoundException>(() => sutProvider.Sut.UpdateAsync(notification));
|
|
await sutProvider.GetDependency<IPushNotificationService>()
|
|
.Received(0)
|
|
.PushNotificationAsync(Arg.Any<Notification>());
|
|
await sutProvider.GetDependency<IPushNotificationService>()
|
|
.Received(0)
|
|
.PushNotificationStatusAsync(Arg.Any<Notification>(), Arg.Any<NotificationStatus>());
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
public async Task UpdateAsync_Authorized_NotificationCreated(
|
|
SutProvider<UpdateNotificationCommand> sutProvider,
|
|
Notification notification)
|
|
{
|
|
notification.Priority = Priority.Medium;
|
|
notification.ClientType = ClientType.Web;
|
|
notification.Title = "Title";
|
|
notification.Body = "Body";
|
|
notification.RevisionDate = DateTime.UtcNow.AddMinutes(-60);
|
|
|
|
Setup(sutProvider, notification.Id, notification, true);
|
|
|
|
var notificationToUpdate = CoreHelpers.CloneObject(notification);
|
|
notificationToUpdate.Priority = Priority.High;
|
|
notificationToUpdate.ClientType = ClientType.Mobile;
|
|
notificationToUpdate.Title = "Updated Title";
|
|
notificationToUpdate.Body = "Updated Body";
|
|
notificationToUpdate.RevisionDate = DateTime.UtcNow.AddMinutes(-30);
|
|
|
|
await sutProvider.Sut.UpdateAsync(notificationToUpdate);
|
|
|
|
await sutProvider.GetDependency<INotificationRepository>().Received(1)
|
|
.ReplaceAsync(Arg.Is<Notification>(n =>
|
|
// Not updated fields
|
|
n.Id == notificationToUpdate.Id && n.Global == notificationToUpdate.Global &&
|
|
n.UserId == notificationToUpdate.UserId && n.OrganizationId == notificationToUpdate.OrganizationId &&
|
|
n.CreationDate == notificationToUpdate.CreationDate &&
|
|
// Updated fields
|
|
n.Priority == notificationToUpdate.Priority && n.ClientType == notificationToUpdate.ClientType &&
|
|
n.Title == notificationToUpdate.Title && n.Body == notificationToUpdate.Body &&
|
|
DateTime.UtcNow - n.RevisionDate < TimeSpan.FromMinutes(1)));
|
|
await sutProvider.GetDependency<IPushNotificationService>()
|
|
.Received(1)
|
|
.PushNotificationAsync(notification);
|
|
await sutProvider.GetDependency<IPushNotificationService>()
|
|
.Received(0)
|
|
.PushNotificationStatusAsync(Arg.Any<Notification>(), Arg.Any<NotificationStatus>());
|
|
}
|
|
}
|