Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-16 01:51:21 +01:00
Code Issues Projects Releases Wiki Activity

added a status check to the read by minimum role proc (#1498)

Browse Source
This commit is contained in:
Addison Beck 2021-08-10 06:59:54 -04:00 committed by GitHub
parent 53a93ffcea
commit b726b08ea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,7 +397,9 @@ namespace Bit.Core.Repositories.EntityFramework
var dbContext = GetDatabaseContext(scope); var dbContext = GetDatabaseContext(scope);
var query = dbContext.OrganizationUsers var query = dbContext.OrganizationUsers
.Include(e => e.User) .Include(e => e.User)
.Where(e => e.OrganizationId.Equals(organizationId) && e.Type <= minRole) .Where(e => e.OrganizationId.Equals(organizationId) &&
e.Type <= minRole &&
e.Status == OrganizationUserStatusType.Confirmed)
.Select(e => new OrganizationUserUserDetails() { .Select(e => new OrganizationUserUserDetails() {
Id = e.Id, Id = e.Id,
Email = e.Email ?? e.User.Email Email = e.Email ?? e.User.Email

1
src/Sql/dbo/Stored Procedures/OrganizationUser_ReadByMinimumRole.sql
View File

@ -11,5 +11,6 @@ BEGIN
[dbo].[OrganizationUserUserDetailsView] [dbo].[OrganizationUserUserDetailsView]
WHERE WHERE
OrganizationId = @OrganizationId OrganizationId = @OrganizationId
AND Status = 2 -- 2 = Confirmed
AND [Type] <= @MinRole AND [Type] <= @MinRole
END END

1
util/Migrator/DbScripts/2021-07-15_00_OrganizationUserReadByMinimumRole.sql
View File

@ -17,5 +17,6 @@ BEGIN
[dbo].[OrganizationUserUserDetailsView] [dbo].[OrganizationUserUserDetailsView]
WHERE WHERE
OrganizationId = @OrganizationId OrganizationId = @OrganizationId
AND Status = 2
AND [Type] <= @MinRole AND [Type] <= @MinRole
END END