leave org apis

src/Api/Controllers/OrganizationsController.cs

@@ -188,6 +188,19 @@ namespace Bit.Api.Controllers
             await _organizationService.ReinstateSubscriptionAsync(orgIdGuid);
         }
 
+        [HttpPost("{id}/leave")]
+        public async Task Leave(string id)
+        {
+            var orgGuidId = new Guid(id);
+            if(!_currentContext.OrganizationUser(orgGuidId))
+            {
+                throw new NotFoundException();
+            }
+
+            var userId = _userService.GetProperUserId(User);
+            await _organizationService.DeleteUserAsync(orgGuidId, userId.Value);
+        }
+
         [HttpDelete("{id}")]
         [HttpPost("{id}/delete")]
         public async Task Delete(string id, [FromBody]OrganizationDeleteRequestModel model)

src/Core/Repositories/IOrganizationUserRepository.cs

@@ -14,6 +14,7 @@ namespace Bit.Core.Repositories
         Task<ICollection<OrganizationUser>> GetManyByUserAsync(Guid userId);
         Task<ICollection<OrganizationUser>> GetManyByOrganizationAsync(Guid organizationId, OrganizationUserType? type);
         Task<OrganizationUser> GetByOrganizationAsync(Guid organizationId, string email);
+        Task<OrganizationUser> GetByOrganizationAsync(Guid organizationId, Guid userId);
         Task<Tuple<OrganizationUserUserDetails, ICollection<SubvaultUserSubvaultDetails>>> GetDetailsByIdAsync(Guid id);
         Task<ICollection<OrganizationUserUserDetails>> GetManyDetailsByOrganizationAsync(Guid organizationId);
         Task<ICollection<OrganizationUserOrganizationDetails>> GetManyDetailsByUserAsync(Guid userId,

src/Core/Repositories/SqlServer/OrganizationUserRepository.cs

@@ -60,6 +60,19 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
+        public async Task<OrganizationUser> GetByOrganizationAsync(Guid organizationId, Guid userId)
+        {
+            using(var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<OrganizationUser>(
+                    "[dbo].[OrganizationUser_ReadByOrganizationIdUserId]",
+                    new { OrganizationId = organizationId, UserId = userId },
+                    commandType: CommandType.StoredProcedure);
+
+                return results.SingleOrDefault();
+            }
+        }
+
         public async Task<ICollection<OrganizationUser>> GetManyByUserAsync(Guid userId)
         {
             using(var connection = new SqlConnection(ConnectionString))

src/Core/Services/IOrganizationService.cs

@@ -25,5 +25,6 @@ namespace Bit.Core.Services
         Task<OrganizationUser> ConfirmUserAsync(Guid organizationId, Guid organizationUserId, string key, Guid confirmingUserId);
         Task SaveUserAsync(OrganizationUser user, Guid savingUserId, IEnumerable<SubvaultUser> subvaults);
         Task DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId);
+        Task DeleteUserAsync(Guid organizationId, Guid userId);
     }
 }

src/Core/Services/Implementations/OrganizationService.cs

@@ -808,6 +808,23 @@ namespace Bit.Core.Services
             await _organizationUserRepository.DeleteAsync(orgUser);
         }
 
+        public async Task DeleteUserAsync(Guid organizationId, Guid userId)
+        {
+            var orgUser = await _organizationUserRepository.GetByOrganizationAsync(organizationId, userId);
+            if(orgUser == null)
+            {
+                throw new NotFoundException();
+            }
+
+            var confirmedOwners = (await GetConfirmedOwnersAsync(organizationId)).ToList();
+            if(confirmedOwners.Count == 1 && confirmedOwners[0].Id == orgUser.Id)
+            {
+                throw new BadRequestException("Organization must have at least one confirmed owner.");
+            }
+
+            await _organizationUserRepository.DeleteAsync(orgUser);
+        }
+
         private async Task<IEnumerable<OrganizationUser>> GetConfirmedOwnersAsync(Guid organizationId)
         {
             var owners = await _organizationUserRepository.GetManyByOrganizationAsync(organizationId,

src/Sql/Sql.sqlproj

@@ -183,5 +183,6 @@
     <Build Include="dbo\User Defined Types\GuidIdArray.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationId.sql" />
     <Build Include="dbo\Stored Procedures\Subvault_ReadCountByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdUserId.sql" />
   </ItemGroup>
 </Project>

src/Sql/dbo/Stored Procedures/OrganizationUser_ReadByOrganizationIdUserId.sql

@@ -0,0 +1,15 @@
+CREATE PROCEDURE [dbo].[OrganizationUser_ReadByOrganizationIdUserId]
+    @OrganizationId UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        *
+    FROM
+        [dbo].[OrganizationUserView]
+    WHERE
+        [OrganizationId] = @OrganizationId
+        AND [UserId] = @UserId
+END