1
0
mirror of https://github.com/bitwarden/server.git synced 2025-04-07 05:58:13 -05:00

subvault service save to check max subvault

This commit is contained in:
Kyle Spearrin 2017-04-08 10:44:13 -04:00
parent 51e8d3f1a7
commit cc7fd61c85
3 changed files with 34 additions and 12 deletions

View File

@ -16,15 +16,18 @@ namespace Bit.Api.Controllers
public class SubvaultsController : Controller public class SubvaultsController : Controller
{ {
private readonly ISubvaultRepository _subvaultRepository; private readonly ISubvaultRepository _subvaultRepository;
private readonly ISubvaultService _subvaultService;
private readonly IUserService _userService; private readonly IUserService _userService;
private readonly CurrentContext _currentContext; private readonly CurrentContext _currentContext;
public SubvaultsController( public SubvaultsController(
ISubvaultRepository subvaultRepository, ISubvaultRepository subvaultRepository,
ISubvaultService subvaultService,
IUserService userService, IUserService userService,
CurrentContext currentContext) CurrentContext currentContext)
{ {
_subvaultRepository = subvaultRepository; _subvaultRepository = subvaultRepository;
_subvaultService = subvaultService;
_userService = userService; _userService = userService;
_currentContext = currentContext; _currentContext = currentContext;
} }
@ -73,7 +76,7 @@ namespace Bit.Api.Controllers
} }
var subvault = model.ToSubvault(orgIdGuid); var subvault = model.ToSubvault(orgIdGuid);
await _subvaultRepository.CreateAsync(subvault); await _subvaultService.SaveAsync(subvault);
return new SubvaultResponseModel(subvault); return new SubvaultResponseModel(subvault);
} }
@ -87,7 +90,7 @@ namespace Bit.Api.Controllers
throw new NotFoundException(); throw new NotFoundException();
} }
await _subvaultRepository.ReplaceAsync(model.ToSubvault(subvault)); await _subvaultService.SaveAsync(model.ToSubvault(subvault));
return new SubvaultResponseModel(subvault); return new SubvaultResponseModel(subvault);
} }

View File

@ -1,13 +1,10 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Bit.Core.Models.Business;
using Bit.Core.Models.Table; using Bit.Core.Models.Table;
using System;
using System.Collections.Generic;
namespace Bit.Core.Services namespace Bit.Core.Services
{ {
public interface ISubvaultService public interface ISubvaultService
{ {
Task SaveAsync(Subvault subvault);
} }
} }

View File

@ -1,12 +1,8 @@
using System; using System;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Bit.Core.Repositories;
using Bit.Core.Models.Business;
using Bit.Core.Models.Table;
using Bit.Core.Utilities;
using Bit.Core.Exceptions; using Bit.Core.Exceptions;
using System.Collections.Generic; using Bit.Core.Models.Table;
using Bit.Core.Repositories;
namespace Bit.Core.Services namespace Bit.Core.Services
{ {
@ -35,6 +31,32 @@ namespace Bit.Core.Services
_mailService = mailService; _mailService = mailService;
} }
public async Task SaveAsync(Subvault subvault)
{
if(subvault.Id == default(Guid))
{
var org = await _organizationRepository.GetByIdAsync(subvault.OrganizationId);
if(org == null)
{
throw new BadRequestException("Org not found");
}
if(org.MaxSubvaults.HasValue)
{
var subvaultCount = await _subvaultRepository.GetCountByOrganizationIdAsync(org.Id);
if(org.MaxSubvaults.Value <= subvaultCount)
{
throw new BadRequestException("You have reached the maximum number of subvaults " +
$"({org.MaxSubvaults.Value}) for this organization.");
}
}
await _subvaultRepository.CreateAsync(subvault);
}
else
{
await _subvaultRepository.ReplaceAsync(subvault);
}
}
} }
} }