aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 22:44:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Greenfield: Expand user data (#6649)

Browse Source
This commit is contained in:
d11n
2025-04-04 09:15:33 +02:00
committed by GitHub
parent 65629f40b3
commit a916ae81be
11 changed files with 135 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
BTCPayServer/Controllers/GreenField/GreenfieldStoreUsersController.cs
View File

@@ -1,4 +1,7 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection.Metadata;
using System.Threading.Tasks;
using BTCPayServer.Abstractions.Constants;
using BTCPayServer.Abstractions.Extensions;
@@ -11,6 +14,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using NicolasDorier.RateLimits;
using StoreData = BTCPayServer.Data.StoreData;
namespace BTCPayServer.Controllers.Greenfield
@@ -22,15 +26,18 @@ namespace BTCPayServer.Controllers.Greenfield
{
private readonly StoreRepository _storeRepository;
private readonly UserManager<ApplicationUser> _userManager;
private readonly CallbackGenerator _callbackGenerator;
private readonly UriResolver _uriResolver;
public GreenfieldStoreUsersController(
StoreRepository storeRepository,
UserManager<ApplicationUser> userManager,
CallbackGenerator callbackGenerator,
UriResolver uriResolver)
{
_storeRepository = storeRepository;
_userManager = userManager;
_callbackGenerator = callbackGenerator;
_uriResolver = uriResolver;
}
@@ -47,11 +54,13 @@ namespace BTCPayServer.Controllers.Greenfield
public async Task<IActionResult> RemoveStoreUser(string storeId, string idOrEmail)
{
var store = HttpContext.GetStoreData();
if (store == null) return StoreNotFound();
if (store == null)
return StoreNotFound();
var user = await _userManager.FindByIdOrEmail(idOrEmail);
if (user == null) return UserNotFound();
if (user == null)
return UserNotFound();
return await _storeRepository.RemoveStoreUser(storeId, user.Id)
? Ok()
: this.CreateAPIError(409, "store-user-role-orphaned", "Removing this user would result in the store having no owner.");
@@ -63,19 +72,25 @@ namespace BTCPayServer.Controllers.Greenfield
public async Task<IActionResult> AddOrUpdateStoreUser(string storeId, StoreUserData request, string idOrEmail = null)
{
var store = HttpContext.GetStoreData();
if (store == null) return StoreNotFound();
if (store == null)
return StoreNotFound();
#pragma warning disable CS0618 // Type or member is obsolete
request.StoreRole ??= request.Role;
request.Id ??= request.UserId;
#pragma warning restore CS0618 // Type or member is obsolete
var user = await _userManager.FindByIdOrEmail(idOrEmail ?? request.Id);
if (user == null)
return UserNotFound();
var user = await _userManager.FindByIdOrEmail(idOrEmail ?? request.UserId);
if (user == null) return UserNotFound();
StoreRoleId roleId = null;
if (request.Role is not null)
if (request.StoreRole is not null)
{
roleId = await _storeRepository.ResolveStoreRoleId(storeId, request.Role);
roleId = await _storeRepository.ResolveStoreRoleId(storeId, request.StoreRole);
if (roleId is null)
ModelState.AddModelError(nameof(request.Role), "The role id provided does not exist");
ModelState.AddModelError(nameof(request.StoreRole), "The role id provided does not exist");
}
if (!ModelState.IsValid)
return this.CreateValidationError(ModelState);
@@ -87,21 +102,21 @@ namespace BTCPayServer.Controllers.Greenfield
: this.CreateAPIError(409, "duplicate-store-user-role", "The user is already added to the store");
}
private async Task<IEnumerable<StoreUserData>> FromModel(StoreData data)
private async Task<IEnumerable<StoreUserData>> FromModel(StoreData store)
{
var storeUsers = new List<StoreUserData>();
foreach (var storeUser in data.UserStores)
foreach (var storeUser in store.UserStores)
{
var user = await _userManager.FindByIdOrEmail(storeUser.ApplicationUserId);
var blob = user?.GetBlob();
storeUsers.Add(new StoreUserData
{
UserId = storeUser.ApplicationUserId,
Role = storeUser.StoreRoleId,
Email = user?.Email,
Name = blob?.Name,
ImageUrl = blob?.ImageUrl == null ? null : await _uriResolver.Resolve(Request.GetAbsoluteRootUri(), UnresolvedUri.Create(blob.ImageUrl))
});
if (user == null)
continue;
var data = await UserService.ForAPI<StoreUserData>(user, [], _callbackGenerator, _uriResolver, Request);
data.StoreRole = storeUser.StoreRoleId;
#pragma warning disable CS0618 // Type or member is obsolete
data.UserId = storeUser.ApplicationUserId;
data.Role = storeUser.StoreRoleId;
#pragma warning restore CS0618 // Type or member is obsolete
storeUsers.Add(data);
}
return storeUsers;
}