bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-31 00:33:17 +00:00
Code Issues Releases Wiki Activity

Updates usages to reflect new shim model

Browse Source
This commit is contained in:
sven-bitwarden
2026-01-14 16:33:08 -06:00
committed by Sven
parent 8dd13a3697
commit 665e2a7e53
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
View File

@@ -357,7 +357,7 @@ public class OrganizationUsersController : BaseAdminConsoleController
return false;
}
var masterPasswordPolicy = await _policyQuery.GetByOrganizationIdTypeAsync(orgId, PolicyType.ResetPassword);
var masterPasswordPolicy = await _policyQuery.RunAsync(orgId, PolicyType.ResetPassword);
var useMasterPasswordPolicy = masterPasswordPolicy.Enabled &&
masterPasswordPolicy.GetDataModel<ResetPasswordDataModel>().AutoEnrollEnabled;

2
src/Api/AdminConsole/Controllers/PoliciesController.cs
View File

@@ -81,7 +81,7 @@ public class PoliciesController : Controller
throw new NotFoundException();
}
var policy = await _policyQuery.GetByOrganizationIdTypeAsync(orgId, (PolicyType)type);
var policy = await _policyQuery.RunAsync(orgId, (PolicyType)type);
if (policy.Type is PolicyType.SingleOrg)
{
return await policy.GetSingleOrgPolicyDetailResponseAsync(_organizationHasVerifiedDomainsQuery);

5
src/Api/AdminConsole/Models/Response/Helpers/PolicyDetailResponses.cs
View File

@@ -1,13 +1,15 @@
using Bit.Api.AdminConsole.Models.Response.Organizations;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
namespace Bit.Api.AdminConsole.Models.Response.Helpers;
public static class PolicyDetailResponses
{
public static async Task<PolicyDetailResponseModel> GetSingleOrgPolicyDetailResponseAsync(this Policy policy, IOrganizationHasVerifiedDomainsQuery hasVerifiedDomainsQuery)
public static async Task<PolicyDetailResponseModel> GetSingleOrgPolicyDetailResponseAsync(
this PolicyData policy, IOrganizationHasVerifiedDomainsQuery hasVerifiedDomainsQuery)
{
if (policy.Type is not PolicyType.SingleOrg)
{
@@ -25,5 +27,4 @@ public static class PolicyDetailResponses
return !policy.Enabled;
}
}
}

14
src/Api/AdminConsole/Models/Response/Organizations/PolicyDetailResponseModel.cs
View File

@@ -1,14 +1,18 @@
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
namespace Bit.Api.AdminConsole.Models.Response.Organizations;
public class PolicyDetailResponseModel : PolicyResponseModel
{
public PolicyDetailResponseModel(Policy policy, string obj = "policy") : base(policy, obj)
public PolicyDetailResponseModel(PolicyData policy, bool canToggleState = true) : base(new Policy
{
}
public PolicyDetailResponseModel(Policy policy, bool canToggleState) : base(policy)
OrganizationId = policy.OrganizationId,
Data = policy.Data,
Enabled = policy.Enabled,
Type = policy.Type,
Id = Guid.Empty
})
{
CanToggleState = canToggleState;
}
@@ -16,5 +20,5 @@ public class PolicyDetailResponseModel : PolicyResponseModel
/// <summary>
/// Indicates whether the Policy can be enabled/disabled
/// </summary>
public bool CanToggleState { get; set; } = true;
public bool CanToggleState { get; set; }
}

8
test/Api.Test/AdminConsole/Models/Response/Helpers/PolicyDetailResponsesTests.cs
View File

@@ -1,7 +1,7 @@
using AutoFixture;
using Bit.Api.AdminConsole.Models.Response.Helpers;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
using NSubstitute;
using Xunit;
@@ -19,7 +19,7 @@ public class PolicyDetailResponsesTests
{
var fixture = new Fixture();
var policy = fixture.Build<Policy>()
var policy = fixture.Build<PolicyData>()
.Without(p => p.Data)
.With(p => p.Type, PolicyType.SingleOrg)
.With(p => p.Enabled, policyEnabled)
@@ -39,7 +39,7 @@ public class PolicyDetailResponsesTests
{
var fixture = new Fixture();
var policy = fixture.Build<Policy>()
var policy = fixture.Build<PolicyData>()
.Without(p => p.Data)
.With(p => p.Type, PolicyType.TwoFactorAuthentication)
.Create();
@@ -58,7 +58,7 @@ public class PolicyDetailResponsesTests
{
var fixture = new Fixture();
var policy = fixture.Build<Policy>()
var policy = fixture.Build<PolicyData>()
.Without(p => p.Data)
.With(p => p.Type, PolicyType.SingleOrg)
.Create();