Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-23 17:07:42 +01:00
Code Issues Projects Releases Wiki Activity

Ensure that users are confirmed status (#1033)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-12-09 12:04:14 -05:00 committed by GitHub
parent 7eaf7ab770
commit 01d4d97ef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitwarden_license/src/Portal/EnterprisePortalCurrentContext.cs
View File

@ -52,7 +52,8 @@ namespace Bit.Portal
// TODO: maybe make loading orgs Lazy<T> somehow? // TODO: maybe make loading orgs Lazy<T> somehow?
var orgUserRepo = _serviceProvider.GetRequiredService<IOrganizationUserRepository>(); var orgUserRepo = _serviceProvider.GetRequiredService<IOrganizationUserRepository>();
var userOrgs = await orgUserRepo.GetManyDetailsByUserAsync(UserId.Value); var userOrgs = await orgUserRepo.GetManyDetailsByUserAsync(UserId.Value,
Core.Enums.OrganizationUserStatusType.Confirmed);
OrganizationsDetails = userOrgs.ToList(); OrganizationsDetails = userOrgs.ToList();
Organizations = userOrgs.Select(ou => new CurrentContentOrganization Organizations = userOrgs.Select(ou => new CurrentContentOrganization
{ {

3
src/Api/Controllers/OrganizationsController.cs
View File

@ -139,7 +139,8 @@ namespace Bit.Api.Controllers
public async Task<ListResponseModel<ProfileOrganizationResponseModel>> GetUser() public async Task<ListResponseModel<ProfileOrganizationResponseModel>> GetUser()
{ {
var userId = _userService.GetProperUserId(User).Value; var userId = _userService.GetProperUserId(User).Value;
var organizations = await _organizationUserRepository.GetManyDetailsByUserAsync(userId); var organizations = await _organizationUserRepository.GetManyDetailsByUserAsync(userId,
OrganizationUserStatusType.Confirmed);
var responses = organizations.Select(o => new ProfileOrganizationResponseModel(o)); var responses = organizations.Select(o => new ProfileOrganizationResponseModel(o));
return new ListResponseModel<ProfileOrganizationResponseModel>(responses); return new ListResponseModel<ProfileOrganizationResponseModel>(responses);
} }

3
src/Core/IdentityServer/BaseRequestValidator.cs
View File

@ -301,7 +301,8 @@ namespace Bit.Core.IdentityServer
if (ssoOrgs.Any()) if (ssoOrgs.Any())
{ {
// Parse users orgs and determine if require sso policy is enabled // Parse users orgs and determine if require sso policy is enabled
var userOrgs = await _organizationUserRepository.GetManyDetailsByUserAsync(user.Id); var userOrgs = await _organizationUserRepository.GetManyDetailsByUserAsync(user.Id,
OrganizationUserStatusType.Confirmed);
foreach (var userOrg in userOrgs.Where(o => o.Enabled && o.UseSso)) foreach (var userOrg in userOrgs.Where(o => o.Enabled && o.UseSso))
{ {
var orgPolicy = await _policyRepository.GetByOrganizationIdTypeAsync(userOrg.OrganizationId, var orgPolicy = await _policyRepository.GetByOrganizationIdTypeAsync(userOrg.OrganizationId,