mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-24 14:50:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updates after merges

Browse source
This commit is contained in:
Dennis Reimann 2024-06-26 17:23:59 +02:00
parent dfc70e7482
commit f893d8b8e2
No known key found for this signature in database
GPG key ID: 5009E1797F03F8D0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
BTCPayServer/App/API/AppApiController.Account.cs
View file

@ -277,12 +277,14 @@ public partial class AppApiController
Permissions = userStore.StoreRole.Permissions Permissions = userStore.StoreRole.Permissions
}); });
} }
var userBlob = user.GetBlob();
var info = new AppUserInfo var info = new AppUserInfo
{ {
UserId = user.Id, UserId = user.Id,
Name = user.Name, Name = userBlob?.Name,
ImageUrl = !string.IsNullOrEmpty(user.ImageUrl) ImageUrl = !string.IsNullOrEmpty(userBlob?.ImageUrl)
? await uriResolver.Resolve(Request.GetAbsoluteRootUri(), UnresolvedUri.Create(user.ImageUrl)) ? await uriResolver.Resolve(Request.GetAbsoluteRootUri(), UnresolvedUri.Create(userBlob.ImageUrl))
: null, : null,
Email = await userManager.GetEmailAsync(user), Email = await userManager.GetEmailAsync(user),
Roles = await userManager.GetRolesAsync(user), Roles = await userManager.GetRolesAsync(user),

2
BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs
View file

@ -346,8 +346,6 @@ namespace BTCPayServer.Controllers.Greenfield
{ {
UserName = request.Email, UserName = request.Email,
Email = request.Email, Email = request.Email,
Name = request.Name,
ImageUrl = request.ImageUrl,
RequiresEmailConfirmation = policies.RequiresConfirmedEmail, RequiresEmailConfirmation = policies.RequiresConfirmedEmail,
RequiresApproval = policies.RequiresUserApproval, RequiresApproval = policies.RequiresUserApproval,
Created = DateTimeOffset.UtcNow, Created = DateTimeOffset.UtcNow,