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

refactor policy apis

Browse Source
This commit is contained in:
Kyle Spearrin
2020-01-20 08:53:09 -05:00
parent c5ae1b8283
commit f3f1ac57d2
11 changed files with 112 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/Api/Controllers/PoliciesController.cs
View File

@ -8,6 +8,7 @@ using Bit.Core.Models.Api;
using Bit.Core.Exceptions;
using Bit.Core.Services;
using Bit.Core;
using Bit.Core.Enums;
namespace Bit.Api.Controllers
{
@ -29,11 +30,16 @@ namespace Bit.Api.Controllers
_currentContext = currentContext;
}
[HttpGet("{id}")]
public async Task<PolicyResponseModel> Get(string orgId, string id)
[HttpGet("{type}")]
public async Task<PolicyResponseModel> Get(string orgId, int type)
{
var policy = await _policyRepository.GetByIdAsync(new Guid(id));
if(policy == null || !_currentContext.OrganizationAdmin(policy.OrganizationId))
var orgIdGuid = new Guid(orgId);
if(!_currentContext.OrganizationAdmin(orgIdGuid))
{
throw new NotFoundException();
}
var policy = await _policyRepository.GetByOrganizationIdTypeAsync(orgIdGuid, (PolicyType)type);
if(policy == null)
{
throw new NotFoundException();
}
@ -55,45 +61,26 @@ namespace Bit.Api.Controllers
return new ListResponseModel<PolicyResponseModel>(responses);
}
[HttpPost("")]
public async Task<PolicyResponseModel> Post(string orgId, [FromBody]PolicyRequestModel model)
[HttpPut("{type}")]
public async Task<PolicyResponseModel> Put(string orgId, int type, [FromBody]PolicyRequestModel model)
{
var orgIdGuid = new Guid(orgId);
if(!_currentContext.OrganizationAdmin(orgIdGuid))
{
throw new NotFoundException();
}
var policy = await _policyRepository.GetByOrganizationIdTypeAsync(new Guid(orgId), (PolicyType)type);
if(policy == null)
{
policy = model.ToPolicy(orgIdGuid);
}
else
{
policy = model.ToPolicy(policy);
}
var policy = model.ToPolicy(orgIdGuid);
await _policyService.SaveAsync(policy);
return new PolicyResponseModel(policy);
}
[HttpPut("{id}")]
[HttpPost("{id}")]
public async Task<PolicyResponseModel> Put(string orgId, string id, [FromBody]PolicyRequestModel model)
{
var policy = await _policyRepository.GetByIdAsync(new Guid(id));
if(policy == null || !_currentContext.OrganizationAdmin(policy.OrganizationId))
{
throw new NotFoundException();
}
await _policyService.SaveAsync(model.ToPolicy(policy));
return new PolicyResponseModel(policy);
}
[HttpDelete("{id}")]
[HttpPost("{id}/delete")]
public async Task Delete(string orgId, string id)
{
var policy = await _policyRepository.GetByIdAsync(new Guid(id));
if(policy == null || !_currentContext.OrganizationAdmin(policy.OrganizationId))
{
throw new NotFoundException();
}
await _policyService.DeleteAsync(policy);
}
}
}

76
src/Api/Public/Controllers/PoliciesController.cs
View File

@ -3,6 +3,7 @@ using System.Linq;
using System.Net;
using System.Threading.Tasks;
using Bit.Core;
using Bit.Core.Enums;
using Bit.Core.Models.Api.Public;
using Bit.Core.Repositories;
using Bit.Core.Services;
@ -33,17 +34,17 @@ namespace Bit.Api.Public.Controllers
/// Retrieve a policy.
/// </summary>
/// <remarks>
/// Retrieves the details of an existing policy. You need only supply the unique group identifier
/// that was returned upon policy creation.
/// Retrieves the details of a policy.
/// </remarks>
/// <param name="id">The identifier of the policy to be retrieved.</param>
[HttpGet("{id}")]
/// <param name="type">The type of policy to be retrieved.</param>
[HttpGet("{type}")]
[ProducesResponseType(typeof(GroupResponseModel), (int)HttpStatusCode.OK)]
[ProducesResponseType((int)HttpStatusCode.NotFound)]
public async Task<IActionResult> Get(Guid id)
public async Task<IActionResult> Get(PolicyType type)
{
var policy = await _policyRepository.GetByIdAsync(id);
if(policy == null || policy.OrganizationId != _currentContext.OrganizationId)
var policy = await _policyRepository.GetByOrganizationIdTypeAsync(
_currentContext.OrganizationId.Value, type);
if(policy == null)
{
return new NotFoundResult();
}
@ -67,69 +68,34 @@ namespace Bit.Api.Public.Controllers
return new JsonResult(response);
}
/// <summary>
/// Create a policy.
/// </summary>
/// <remarks>
/// Creates a new policy object.
/// </remarks>
/// <param name="model">The request model.</param>
[HttpPost]
[ProducesResponseType(typeof(PolicyResponseModel), (int)HttpStatusCode.OK)]
[ProducesResponseType(typeof(ErrorResponseModel), (int)HttpStatusCode.BadRequest)]
public async Task<IActionResult> Post([FromBody]PolicyCreateRequestModel model)
{
var policy = model.ToPolicy(_currentContext.OrganizationId.Value);
await _policyService.SaveAsync(policy);
var response = new PolicyResponseModel(policy);
return new JsonResult(response);
}
/// <summary>
/// Update a policy.
/// </summary>
/// <remarks>
/// Updates the specified policy object. If a property is not provided,
/// Updates the specified policy. If a property is not provided,
/// the value of the existing property will be reset.
/// </remarks>
/// <param name="id">The identifier of the policy to be updated.</param>
/// <param name="type">The type of policy to be updated.</param>
/// <param name="model">The request model.</param>
[HttpPut("{id}")]
[ProducesResponseType(typeof(PolicyResponseModel), (int)HttpStatusCode.OK)]
[ProducesResponseType(typeof(ErrorResponseModel), (int)HttpStatusCode.BadRequest)]
[ProducesResponseType((int)HttpStatusCode.NotFound)]
public async Task<IActionResult> Put(Guid id, [FromBody]PolicyUpdateRequestModel model)
public async Task<IActionResult> Put(PolicyType type, [FromBody]PolicyUpdateRequestModel model)
{
var existingPolicy = await _policyRepository.GetByIdAsync(id);
if(existingPolicy == null || existingPolicy.OrganizationId != _currentContext.OrganizationId)
var policy = await _policyRepository.GetByOrganizationIdTypeAsync(
_currentContext.OrganizationId.Value, type);
if(policy == null)
{
return new NotFoundResult();
policy = model.ToPolicy(_currentContext.OrganizationId.Value);
}
var updatedPolicy = model.ToPolicy(existingPolicy);
await _policyService.SaveAsync(updatedPolicy);
var response = new PolicyResponseModel(updatedPolicy);
else
{
policy = model.ToPolicy(policy);
}
await _policyService.SaveAsync(policy);
var response = new PolicyResponseModel(policy);
return new JsonResult(response);
}
/// <summary>
/// Delete a policy.
/// </summary>
/// <remarks>
/// Permanently deletes a policy. This cannot be undone.
/// </remarks>
/// <param name="id">The identifier of the policy to be deleted.</param>
[HttpDelete("{id}")]
[ProducesResponseType((int)HttpStatusCode.OK)]
[ProducesResponseType((int)HttpStatusCode.NotFound)]
public async Task<IActionResult> Delete(Guid id)
{
var policy = await _policyRepository.GetByIdAsync(id);
if(policy == null || policy.OrganizationId != _currentContext.OrganizationId)
{
return new NotFoundResult();
}
await _policyRepository.DeleteAsync(policy);
return new OkResult();
}
}
}