[AC-2184] Fix push sync notification on opt-in to Flexible Collections (#3794)

* Fix push sync notification on opt-in to Flexible Collections

* Fix tests

* Fix tests more

src/Api/AdminConsole/Controllers/OrganizationsController.cs

@@ -899,8 +899,9 @@ public class OrganizationsController : Controller
         var orgUsers = await _organizationUserRepository.GetManyByOrganizationAsync(id, null);
         await Task.WhenAll(orgUsers
             .Where(ou => ou.UserId.HasValue &&
+                         ou.Status == OrganizationUserStatusType.Confirmed &&
                          ou.Type is OrganizationUserType.Admin or OrganizationUserType.Owner)
-            .Select(ou => _pushNotificationService.PushSyncVaultAsync(ou.UserId.Value)));
+            .Select(ou => _pushNotificationService.PushSyncOrganizationsAsync(ou.UserId.Value)));
     }
 
     private async Task TryGrantOwnerAccessToSecretsManagerAsync(Guid organizationId, Guid userId)

src/Core/Enums/PushType.cs

@@ -23,4 +23,6 @@ public enum PushType : byte
 
     AuthRequest = 15,
     AuthRequestResponse = 16,
+
+    SyncOrganizations = 17,
 }

src/Core/Services/IPushNotificationService.cs

@@ -15,6 +15,7 @@ public interface IPushNotificationService
     Task PushSyncFolderDeleteAsync(Folder folder);
     Task PushSyncCiphersAsync(Guid userId);
     Task PushSyncVaultAsync(Guid userId);
+    Task PushSyncOrganizationsAsync(Guid userId);
     Task PushSyncOrgKeysAsync(Guid userId);
     Task PushSyncSettingsAsync(Guid userId);
     Task PushLogOutAsync(Guid userId, bool excludeCurrentContextFromPush = false);

src/Core/Services/Implementations/AzureQueuePushNotificationService.cs

@@ -106,6 +106,11 @@ public class AzureQueuePushNotificationService : IPushNotificationService
         await PushUserAsync(userId, PushType.SyncVault);
     }
 
+    public async Task PushSyncOrganizationsAsync(Guid userId)
+    {
+        await PushUserAsync(userId, PushType.SyncOrganizations);
+    }
+
     public async Task PushSyncOrgKeysAsync(Guid userId)
     {
         await PushUserAsync(userId, PushType.SyncOrgKeys);

src/Core/Services/Implementations/MultiServicePushNotificationService.cs

@@ -105,6 +105,12 @@ public class MultiServicePushNotificationService : IPushNotificationService
         return Task.FromResult(0);
     }
 
+    public Task PushSyncOrganizationsAsync(Guid userId)
+    {
+        PushToServices((s) => s.PushSyncOrganizationsAsync(userId));
+        return Task.FromResult(0);
+    }
+
     public Task PushSyncOrgKeysAsync(Guid userId)
     {
         PushToServices((s) => s.PushSyncOrgKeysAsync(userId));

src/Core/Services/Implementations/NotificationHubPushNotificationService.cs

@@ -117,6 +117,11 @@ public class NotificationHubPushNotificationService : IPushNotificationService
         await PushUserAsync(userId, PushType.SyncVault);
     }
 
+    public async Task PushSyncOrganizationsAsync(Guid userId)
+    {
+        await PushUserAsync(userId, PushType.SyncOrganizations);
+    }
+
     public async Task PushSyncOrgKeysAsync(Guid userId)
     {
         await PushUserAsync(userId, PushType.SyncOrgKeys);

src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs

@@ -113,6 +113,11 @@ public class NotificationsApiPushNotificationService : BaseIdentityClientService
         await PushUserAsync(userId, PushType.SyncVault);
     }
 
+    public async Task PushSyncOrganizationsAsync(Guid userId)
+    {
+        await PushUserAsync(userId, PushType.SyncOrganizations);
+    }
+
     public async Task PushSyncOrgKeysAsync(Guid userId)
     {
         await PushUserAsync(userId, PushType.SyncOrgKeys);

src/Core/Services/Implementations/RelayPushNotificationService.cs

@@ -114,6 +114,11 @@ public class RelayPushNotificationService : BaseIdentityClientService, IPushNoti
         await PushUserAsync(userId, PushType.SyncVault);
     }
 
+    public async Task PushSyncOrganizationsAsync(Guid userId)
+    {
+        await PushUserAsync(userId, PushType.SyncOrganizations);
+    }
+
     public async Task PushSyncOrgKeysAsync(Guid userId)
     {
         await PushUserAsync(userId, PushType.SyncOrgKeys);

src/Core/Services/NoopImplementations/NoopPushNotificationService.cs

@@ -42,6 +42,11 @@ public class NoopPushNotificationService : IPushNotificationService
         return Task.FromResult(0);
     }
 
+    public Task PushSyncOrganizationsAsync(Guid userId)
+    {
+        return Task.FromResult(0);
+    }
+
     public Task PushSyncOrgKeysAsync(Guid userId)
     {
         return Task.FromResult(0);

src/Notifications/HubHelpers.cs

@@ -50,6 +50,7 @@ public static class HubHelpers
                 break;
             case PushType.SyncCiphers:
             case PushType.SyncVault:
+            case PushType.SyncOrganizations:
             case PushType.SyncOrgKeys:
             case PushType.SyncSettings:
             case PushType.LogOut:

test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs

@@ -377,14 +377,15 @@ public class OrganizationsControllerTests : IDisposable
     public async Task EnableCollectionEnhancements_Success(Organization organization)
     {
         organization.FlexibleCollections = false;
-        var admin = new OrganizationUser { UserId = Guid.NewGuid(), Type = OrganizationUserType.Admin };
-        var owner = new OrganizationUser { UserId = Guid.NewGuid(), Type = OrganizationUserType.Owner };
-        var user = new OrganizationUser { UserId = Guid.NewGuid(), Type = OrganizationUserType.User };
+        var admin = new OrganizationUser { UserId = Guid.NewGuid(), Type = OrganizationUserType.Admin, Status = OrganizationUserStatusType.Confirmed };
+        var owner = new OrganizationUser { UserId = Guid.NewGuid(), Type = OrganizationUserType.Owner, Status = OrganizationUserStatusType.Confirmed };
+        var user = new OrganizationUser { UserId = Guid.NewGuid(), Type = OrganizationUserType.User, Status = OrganizationUserStatusType.Confirmed };
         var invited = new OrganizationUser
         {
             UserId = null,
             Type = OrganizationUserType.Admin,
-            Email = "invited@example.com"
+            Email = "invited@example.com",
+            Status = OrganizationUserStatusType.Invited
         };
         var orgUsers = new List<OrganizationUser> { admin, owner, user, invited };
 
@@ -395,9 +396,10 @@ public class OrganizationsControllerTests : IDisposable
         await _sut.EnableCollectionEnhancements(organization.Id);
 
         await _organizationEnableCollectionEnhancementsCommand.Received(1).EnableCollectionEnhancements(organization);
-        await _pushNotificationService.Received(1).PushSyncVaultAsync(admin.UserId.Value);
-        await _pushNotificationService.Received(1).PushSyncVaultAsync(owner.UserId.Value);
-        await _pushNotificationService.DidNotReceive().PushSyncVaultAsync(user.UserId.Value);
+        await _pushNotificationService.Received(1).PushSyncOrganizationsAsync(admin.UserId.Value);
+        await _pushNotificationService.Received(1).PushSyncOrganizationsAsync(owner.UserId.Value);
+        await _pushNotificationService.DidNotReceive().PushSyncOrganizationsAsync(user.UserId.Value);
+        // Invited orgUser does not have a UserId we can use to assert here, but sut will throw if that null isn't handled
     }
 
     [Theory, AutoData]
@@ -410,6 +412,6 @@ public class OrganizationsControllerTests : IDisposable
         await Assert.ThrowsAsync<NotFoundException>(async () => await _sut.EnableCollectionEnhancements(organization.Id));
 
         await _organizationEnableCollectionEnhancementsCommand.DidNotReceiveWithAnyArgs().EnableCollectionEnhancements(Arg.Any<Organization>());
-        await _pushNotificationService.DidNotReceiveWithAnyArgs().PushSyncVaultAsync(Arg.Any<Guid>());
+        await _pushNotificationService.DidNotReceiveWithAnyArgs().PushSyncOrganizationsAsync(Arg.Any<Guid>());
     }
 }