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

Remove stale SsoUser objects from database (#1560)

Browse Source 
* Add SsoUser_ReadByUserIdOrganizationId

* Automatically reset stale/duplicate Sso links

* Fix typo

* Check for stale Sso link in existing user flow

* Delete any stale user record before provisioning new user

* Check for existing db query before creating

* PR feedback updates

Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com>
This commit is contained in:
Thomas Rittson
2021-09-04 00:54:41 +10:00
committed by GitHub
parent db0ef226c4
commit 8f27f21ce0
8 changed files with 87 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/Enums/EventType.cs
View File

@ -48,6 +48,7 @@
OrganizationUser_ResetPassword_Enroll = 1506,
OrganizationUser_ResetPassword_Withdraw = 1507,
OrganizationUser_AdminResetPassword = 1508,
OrganizationUser_ResetSsoLink = 1509,
Organization_Updated = 1600,
Organization_PurgedVault = 1601,

11
src/Core/Repositories/EntityFramework/SsoUserRepository.cs
View File

@ -24,5 +24,16 @@ namespace Bit.Core.Repositories.EntityFramework
await dbContext.SaveChangesAsync();
}
}
public async Task<TableModel.SsoUser> GetByUserIdOrganizationIdAsync(Guid organizationId, Guid userId)
{
using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
var entity = await GetDbSet(dbContext)
.FirstOrDefaultAsync(e => e.OrganizationId == organizationId && e.UserId == userId);
return entity;
}
}
}
}

7
src/Core/Repositories/ISsoUserRepository.cs
View File

@ -1,11 +1,12 @@
using Bit.Core.Models.Table;
using System;
using System.Threading.Tasks;
using Bit.Core.Models.Table;
using System;
using System.Threading.Tasks;
namespace Bit.Core.Repositories
{
public interface ISsoUserRepository : IRepository<SsoUser, long>
{
Task DeleteAsync(Guid userId, Guid? organizationId);
Task<SsoUser> GetByUserIdOrganizationIdAsync(Guid organizationId, Guid userId);
}
}

14
src/Core/Repositories/SqlServer/SsoUserRepository.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Threading.Tasks;
using System.Data.SqlClient;
using System.Data;
using System.Linq;
namespace Bit.Core.Repositories.SqlServer
{
@ -28,5 +29,18 @@ namespace Bit.Core.Repositories.SqlServer
commandType: CommandType.StoredProcedure);
}
}
public async Task<SsoUser> GetByUserIdOrganizationIdAsync(Guid organizationId, Guid userId)
{
using (var connection = new SqlConnection(ConnectionString))
{
var results = await connection.QueryAsync<SsoUser>(
$"[{Schema}].[SsoUser_ReadByUserIdOrganizationId]",
new { UserId = userId, OrganizationId = organizationId },
commandType: CommandType.StoredProcedure);
return results.SingleOrDefault();
}
}
}
}