mirror of
https://github.com/bitwarden/server
synced 2026-01-02 00:23:40 +00:00
* move billing services+tests to billing namespaces * reorganized methods in file and added comment headers * renamed StripeAdapter methods for better clarity * clean up redundant qualifiers * Upgrade Stripe.net to v48.4.0 * Update PreviewTaxAmountCommand * Remove unused UpcomingInvoiceOptionExtensions * Added SubscriptionExtensions with GetCurrentPeriodEnd * Update PremiumUserBillingService * Update OrganizationBillingService * Update GetOrganizationWarningsQuery * Update BillingHistoryInfo * Update SubscriptionInfo * Remove unused Sql Billing folder * Update StripeAdapter * Update StripePaymentService * Update InvoiceCreatedHandler * Update PaymentFailedHandler * Update PaymentSucceededHandler * Update ProviderEventService * Update StripeEventUtilityService * Update SubscriptionDeletedHandler * Update SubscriptionUpdatedHandler * Update UpcomingInvoiceHandler * Update ProviderSubscriptionResponse * Remove unused Stripe Subscriptions Admin Tool * Update RemoveOrganizationFromProviderCommand * Update ProviderBillingService * Update RemoveOrganizatinoFromProviderCommandTests * Update PreviewTaxAmountCommandTests * Update GetCloudOrganizationLicenseQueryTests * Update GetOrganizationWarningsQueryTests * Update StripePaymentServiceTests * Update ProviderBillingControllerTests * Update ProviderEventServiceTests * Update SubscriptionDeletedHandlerTests * Update SubscriptionUpdatedHandlerTests * Resolve Billing test failures I completely removed tests for the StripeEventService as they were using a system I setup a while back that read JSON files of the Stripe event structure. I did not anticipate how frequently these structures would change with each API version and the cost of trying to update these specific JSON files to test a very static data retrieval service far outweigh the benefit. * Resolve Core test failures * Run dotnet format * Remove unused provider migration * Fixed failing tests * Run dotnet format * Replace the old webhook secret key with new one (#6223) * Fix compilation failures in additions * Run dotnet format * Bump Stripe API version * Fix recent addition: CreatePremiumCloudHostedSubscriptionCommand * Fix new code in main according to Stripe update * Fix InvoiceExtensions * Bump SDK version to match API Version * cleanup * fixing items missed after the merge * use expression body for all simple returns * forgot fixes, format, and pr feedback * claude pr feedback * pr feedback and cleanup * more claude feedback --------- Co-authored-by: Alex Morask <amorask@bitwarden.com> Co-authored-by: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
182 lines
6.2 KiB
C#
182 lines
6.2 KiB
C#
#nullable enable
|
|
|
|
using Bit.Admin.Enums;
|
|
using Bit.Admin.Models;
|
|
using Bit.Admin.Services;
|
|
using Bit.Admin.Utilities;
|
|
using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces;
|
|
using Bit.Core.Billing.Services;
|
|
using Bit.Core.Repositories;
|
|
using Bit.Core.Services;
|
|
using Bit.Core.Settings;
|
|
using Bit.Core.Utilities;
|
|
using Bit.Core.Vault.Repositories;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
namespace Bit.Admin.Controllers;
|
|
|
|
[Authorize]
|
|
public class UsersController : Controller
|
|
{
|
|
private readonly IUserRepository _userRepository;
|
|
private readonly ICipherRepository _cipherRepository;
|
|
private readonly IStripePaymentService _paymentService;
|
|
private readonly GlobalSettings _globalSettings;
|
|
private readonly IAccessControlService _accessControlService;
|
|
private readonly ITwoFactorIsEnabledQuery _twoFactorIsEnabledQuery;
|
|
private readonly IUserService _userService;
|
|
private readonly IFeatureService _featureService;
|
|
|
|
public UsersController(
|
|
IUserRepository userRepository,
|
|
ICipherRepository cipherRepository,
|
|
IStripePaymentService paymentService,
|
|
GlobalSettings globalSettings,
|
|
IAccessControlService accessControlService,
|
|
ITwoFactorIsEnabledQuery twoFactorIsEnabledQuery,
|
|
IUserService userService,
|
|
IFeatureService featureService)
|
|
{
|
|
_userRepository = userRepository;
|
|
_cipherRepository = cipherRepository;
|
|
_paymentService = paymentService;
|
|
_globalSettings = globalSettings;
|
|
_accessControlService = accessControlService;
|
|
_twoFactorIsEnabledQuery = twoFactorIsEnabledQuery;
|
|
_userService = userService;
|
|
_featureService = featureService;
|
|
}
|
|
|
|
[RequirePermission(Permission.User_List_View)]
|
|
public async Task<IActionResult> Index(string email, int page = 1, int count = 25)
|
|
{
|
|
if (page < 1)
|
|
{
|
|
page = 1;
|
|
}
|
|
|
|
if (count < 1)
|
|
{
|
|
count = 1;
|
|
}
|
|
|
|
var skip = (page - 1) * count;
|
|
var users = await _userRepository.SearchAsync(email, skip, count);
|
|
|
|
var twoFactorAuthLookup = (await _twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(users.Select(u => u.Id))).ToList();
|
|
var userModels = UserViewModel.MapViewModels(users, twoFactorAuthLookup).ToList();
|
|
|
|
return View(new UsersModel
|
|
{
|
|
Items = userModels,
|
|
Email = string.IsNullOrWhiteSpace(email) ? null : email,
|
|
Page = page,
|
|
Count = count,
|
|
Action = _globalSettings.SelfHosted ? "View" : "Edit"
|
|
});
|
|
}
|
|
|
|
public async Task<IActionResult> View(Guid id)
|
|
{
|
|
var user = await _userRepository.GetByIdAsync(id);
|
|
|
|
if (user == null)
|
|
{
|
|
return RedirectToAction("Index");
|
|
}
|
|
|
|
var ciphers = await _cipherRepository.GetManyByUserIdAsync(id);
|
|
|
|
var isTwoFactorEnabled = await _twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(user);
|
|
var verifiedDomain = await _userService.IsClaimedByAnyOrganizationAsync(user.Id);
|
|
return View(UserViewModel.MapViewModel(user, isTwoFactorEnabled, ciphers, verifiedDomain));
|
|
}
|
|
|
|
[SelfHosted(NotSelfHostedOnly = true)]
|
|
public async Task<IActionResult> Edit(Guid id)
|
|
{
|
|
var user = await _userRepository.GetByIdAsync(id);
|
|
if (user == null)
|
|
{
|
|
return RedirectToAction("Index");
|
|
}
|
|
|
|
var ciphers = await _cipherRepository.GetManyByUserIdAsync(id, withOrganizations: false);
|
|
var billingInfo = await _paymentService.GetBillingAsync(user);
|
|
var billingHistoryInfo = await _paymentService.GetBillingHistoryAsync(user);
|
|
var isTwoFactorEnabled = await _twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(user);
|
|
var verifiedDomain = await _userService.IsClaimedByAnyOrganizationAsync(user.Id);
|
|
var deviceVerificationRequired = await _userService.ActiveNewDeviceVerificationException(user.Id);
|
|
|
|
return View(new UserEditModel(user, isTwoFactorEnabled, ciphers, billingInfo, billingHistoryInfo, _globalSettings, verifiedDomain, deviceVerificationRequired));
|
|
}
|
|
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
[SelfHosted(NotSelfHostedOnly = true)]
|
|
public async Task<IActionResult> Edit(Guid id, UserEditModel model)
|
|
{
|
|
var user = await _userRepository.GetByIdAsync(id);
|
|
if (user == null)
|
|
{
|
|
return RedirectToAction("Index");
|
|
}
|
|
|
|
var canUpgradePremium = _accessControlService.UserHasPermission(Permission.User_UpgradePremium);
|
|
|
|
if (_accessControlService.UserHasPermission(Permission.User_Premium_Edit) ||
|
|
canUpgradePremium)
|
|
{
|
|
user.MaxStorageGb = model.MaxStorageGb;
|
|
user.Premium = model.Premium;
|
|
}
|
|
|
|
if (_accessControlService.UserHasPermission(Permission.User_Billing_Edit))
|
|
{
|
|
user.Gateway = model.Gateway;
|
|
user.GatewayCustomerId = model.GatewayCustomerId;
|
|
user.GatewaySubscriptionId = model.GatewaySubscriptionId;
|
|
}
|
|
|
|
if (_accessControlService.UserHasPermission(Permission.User_Licensing_Edit) ||
|
|
canUpgradePremium)
|
|
{
|
|
user.LicenseKey = model.LicenseKey;
|
|
user.PremiumExpirationDate = model.PremiumExpirationDate;
|
|
}
|
|
|
|
await _userRepository.ReplaceAsync(user);
|
|
return RedirectToAction("Edit", new { id });
|
|
}
|
|
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
[RequirePermission(Permission.User_Delete)]
|
|
public async Task<IActionResult> Delete(Guid id)
|
|
{
|
|
var user = await _userRepository.GetByIdAsync(id);
|
|
if (user != null)
|
|
{
|
|
await _userRepository.DeleteAsync(user);
|
|
}
|
|
|
|
return RedirectToAction("Index");
|
|
}
|
|
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
[RequirePermission(Permission.User_NewDeviceException_Edit)]
|
|
public async Task<IActionResult> ToggleNewDeviceVerification(Guid id)
|
|
{
|
|
var user = await _userRepository.GetByIdAsync(id);
|
|
if (user == null)
|
|
{
|
|
return RedirectToAction("Index");
|
|
}
|
|
|
|
await _userService.ToggleNewDeviceVerificationException(user.Id);
|
|
return RedirectToAction("Edit", new { id });
|
|
}
|
|
}
|