log event when removing user from group/collection

src/Api/Controllers/CollectionsController.cs

@@ -155,7 +155,7 @@ namespace Bit.Api.Controllers
                 throw new NotFoundException();
             }
 
-            await _collectionRepository.DeleteUserAsync(collection.Id, new Guid(orgUserId));
+            await _collectionService.DeleteUserAsync(collection, new Guid(orgUserId));
         }
     }
 }

src/Api/Controllers/GroupsController.cs

@@ -8,7 +8,6 @@ using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core;
-using System.Collections.Generic;
 
 namespace Bit.Api.Controllers
 {
@@ -98,7 +97,6 @@ namespace Bit.Api.Controllers
         }
 
         [HttpPut("{id}")]
-        [HttpPost("{id}")]
         public async Task<GroupResponseModel> Put(string orgId, string id, [FromBody]GroupRequestModel model)
         {
             var group = await _groupRepository.GetByIdAsync(new Guid(id));
@@ -112,7 +110,6 @@ namespace Bit.Api.Controllers
         }
 
         [HttpDelete("{id}")]
-        [HttpPost("{id}/delete")]
         public async Task Delete(string orgId, string id)
         {
             var group = await _groupRepository.GetByIdAsync(new Guid(id));
@@ -125,7 +122,6 @@ namespace Bit.Api.Controllers
         }
 
         [HttpDelete("{id}/user/{orgUserId}")]
-        [HttpPost("{id}/delete-user/{orgUserId}")]
         public async Task Delete(string orgId, string id, string orgUserId)
         {
             var group = await _groupRepository.GetByIdAsync(new Guid(id));
@@ -134,7 +130,7 @@ namespace Bit.Api.Controllers
                 throw new NotFoundException();
             }
 
-            await _groupRepository.DeleteUserAsync(group.Id, new Guid(orgUserId));
+            await _groupService.DeleteUserAsync(group, new Guid(orgUserId));
         }
     }
 }

src/Core/Models/Api/Response/OrganizationUserResponseModel.cs

@@ -57,6 +57,7 @@ namespace Bit.Core.Models.Api
 
         public IEnumerable<SelectionReadOnlyResponseModel> Collections { get; set; }
     }
+
     public class OrganizationUserUserDetailsResponseModel : OrganizationUserResponseModel
     {
         public OrganizationUserUserDetailsResponseModel(OrganizationUserUserDetails organizationUser,

src/Core/Services/ICollectionService.cs

@@ -2,6 +2,7 @@
 using Bit.Core.Models.Table;
 using System.Collections.Generic;
 using Bit.Core.Models.Data;
+using System;
 
 namespace Bit.Core.Services
 {
@@ -9,5 +10,6 @@ namespace Bit.Core.Services
     {
         Task SaveAsync(Collection collection, IEnumerable<SelectionReadOnly> groups = null);
         Task DeleteAsync(Collection collection);
+        Task DeleteUserAsync(Collection collection, Guid organizationUserId);
     }
 }

src/Core/Services/IGroupService.cs

@@ -2,6 +2,7 @@
 using Bit.Core.Models.Table;
 using System.Collections.Generic;
 using Bit.Core.Models.Data;
+using System;
 
 namespace Bit.Core.Services
 {
@@ -9,5 +10,6 @@ namespace Bit.Core.Services
     {
         Task SaveAsync(Group group, IEnumerable<SelectionReadOnly> collections = null);
         Task DeleteAsync(Group group);
+        Task DeleteUserAsync(Group group, Guid organizationUserId);
     }
 }

src/Core/Services/Implementations/CollectionService.cs

@@ -84,5 +84,16 @@ namespace Bit.Core.Services
             await _collectionRepository.DeleteAsync(collection);
             await _eventService.LogCollectionEventAsync(collection, Enums.EventType.Collection_Deleted);
         }
+
+        public async Task DeleteUserAsync(Collection collection, Guid organizationUserId)
+        {
+            var orgUser = await _organizationUserRepository.GetByIdAsync(organizationUserId);
+            if(orgUser == null || orgUser.OrganizationId != collection.OrganizationId)
+            {
+                throw new NotFoundException();
+            }
+            await _collectionRepository.DeleteUserAsync(collection.Id, organizationUserId);
+            await _eventService.LogOrganizationUserEventAsync(orgUser, Enums.EventType.OrganizationUser_Updated);
+        }
     }
 }

src/Core/Services/Implementations/GroupService.cs

@@ -12,15 +12,18 @@ namespace Bit.Core.Services
     {
         private readonly IEventService _eventService;
         private readonly IOrganizationRepository _organizationRepository;
+        private readonly IOrganizationUserRepository _organizationUserRepository;
         private readonly IGroupRepository _groupRepository;
 
         public GroupService(
             IEventService eventService,
             IOrganizationRepository organizationRepository,
+            IOrganizationUserRepository organizationUserRepository,
             IGroupRepository groupRepository)
         {
             _eventService = eventService;
             _organizationRepository = organizationRepository;
+            _organizationUserRepository = organizationUserRepository;
             _groupRepository = groupRepository;
         }
 
@@ -65,5 +68,16 @@ namespace Bit.Core.Services
             await _groupRepository.DeleteAsync(group);
             await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Deleted);
         }
+
+        public async Task DeleteUserAsync(Group group, Guid organizationUserId)
+        {
+            var orgUser = await _organizationUserRepository.GetByIdAsync(organizationUserId);
+            if(orgUser == null || orgUser.OrganizationId != group.OrganizationId)
+            {
+                throw new NotFoundException();
+            }
+            await _groupRepository.DeleteUserAsync(group.Id, organizationUserId);
+            await _eventService.LogOrganizationUserEventAsync(orgUser, Enums.EventType.OrganizationUser_UpdatedGroups);
+        }
     }
 }

src/Core/Services/Implementations/OrganizationService.cs

@@ -919,7 +919,7 @@ namespace Bit.Core.Services
                     organizationId, email, false);
                 if(existingOrgUserCount > 0)
                 {
-                    throw new BadRequestException("User already invited.");
+                    continue;
                 }
 
                 var orgUser = new OrganizationUser
@@ -946,6 +946,7 @@ namespace Bit.Core.Services
                 }
 
                 await SendInviteAsync(orgUser);
+                await _eventService.LogOrganizationUserEventAsync(orgUser, EventType.OrganizationUser_Invited);
                 orgUsers.Add(orgUser);
             }