nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00
Code Activity

Fix organization delete sponsorship hooks

Browse Source
This commit is contained in:
Matt Gibson
2021-11-11 15:00:16 -05:00
committed by Justin Baur
parent 0fb44eb641
commit 5e20c3ff2d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Repositories/EntityFramework/OrganizationRepository.cs
View File

@ -101,7 +101,7 @@ namespace Bit.Core.Repositories.EntityFramework
using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
var orgUser = dbContext.FindAsync<EFModel.Organization>(organization.Id);
var orgEntity = await dbContext.FindAsync<EFModel.Organization>(organization.Id);
var sponsorships = dbContext.OrganizationSponsorships
.Where(os =>
os.SponsoringOrganizationId == organization.Id ||
@ -115,7 +115,7 @@ namespace Bit.Core.Repositories.EntityFramework
sponsorship.SponsoringOrganizationId = UpdatedOrgId(sponsorship.SponsoringOrganizationId);
}
dbContext.Remove(orgUser);
dbContext.Remove(orgEntity);
await dbContext.SaveChangesAsync();
}
}

2
src/Core/Repositories/EntityFramework/OrganizationUserRepository.cs
View File

@ -73,7 +73,7 @@ namespace Bit.Core.Repositories.EntityFramework
using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
var orgUser = dbContext.FindAsync<EfModel.OrganizationUser>(organizationUserId);
var orgUser = await dbContext.FindAsync<EfModel.OrganizationUser>(organizationUserId);
var sponsorships = dbContext.OrganizationSponsorships
.Where(os => os.SponsoringOrganizationUserId != default &&
os.SponsoringOrganizationUserId.Value == organizationUserId);

2
src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql
View File

@ -34,7 +34,7 @@ BEGIN
WHERE
[OrganizationUserId] = @Id
EXEC [dbo].[OrganizationUser_DeleteById] @Id
EXEC [dbo].[OrganizationSponsorship_OrganizationUserDeleted] @Id
DELETE
FROM

2
util/Migrator/DbScripts/2021-11-02_00_OrganizationSponsorship.sql
View File

@ -512,7 +512,7 @@ BEGIN
WHERE
[OrganizationUserId] = @Id
EXEC [dbo].[OrganizationUser_DeleteById] @Id
EXEC [dbo].[OrganizationSponsorship_OrganizationUserDeleted] @Id
DELETE
FROM