Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add avatarUrls to the userItem responsemodel #16190

Merged
merged 1 commit into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Asp.Versioning;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Api.Management.Factories;
using Umbraco.Cms.Api.Management.ViewModels.User.Item;
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models.Membership;
Expand All @@ -12,12 +13,12 @@ namespace Umbraco.Cms.Api.Management.Controllers.User.Item;
public class ItemUserItemController : UserItemControllerBase
{
private readonly IUserService _userService;
private readonly IUmbracoMapper _mapper;
private readonly IUserPresentationFactory _userPresentationFactory;

public ItemUserItemController(IUserService userService, IUmbracoMapper mapper)
public ItemUserItemController(IUserService userService, IUserPresentationFactory userPresentationFactory)
{
_userService = userService;
_mapper = mapper;
_userPresentationFactory = userPresentationFactory;
}

[HttpGet]
Expand All @@ -31,7 +32,7 @@ public async Task<IActionResult> Item(CancellationToken cancellationToken, [From
}

IEnumerable<IUser> users = await _userService.GetAsync(ids.ToArray());
List<UserItemResponseModel> responseModels = _mapper.MapEnumerable<IUser, UserItemResponseModel>(users);
var responseModels = users.Select(_userPresentationFactory.CreateItemResponseModel).ToList();
return Ok(responseModels);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Umbraco.Cms.Api.Management.ViewModels.User;
using Umbraco.Cms.Api.Management.ViewModels.User.Current;
using Umbraco.Cms.Api.Management.ViewModels.User.Item;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Membership;

Expand All @@ -22,4 +23,6 @@ public interface IUserPresentationFactory
Task<UserConfigurationResponseModel> CreateUserConfigurationModelAsync();

Task<CurrenUserConfigurationResponseModel> CreateCurrentUserConfigurationModelAsync();

UserItemResponseModel CreateItemResponseModel(IUser user);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Umbraco.Cms.Api.Management.Security;
using Umbraco.Cms.Api.Management.ViewModels.User;
using Umbraco.Cms.Api.Management.ViewModels.User.Current;
using Umbraco.Cms.Api.Management.ViewModels.User.Item;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.IO;
Expand Down Expand Up @@ -80,6 +81,15 @@ public UserResponseModel CreateResponseModel(IUser user)
return responseModel;
}

public UserItemResponseModel CreateItemResponseModel(IUser user) =>
new()
{
Id = user.Key,
Name = user.Name ?? user.Username,
AvatarUrls = user.GetUserAvatarUrls(_appCaches.RuntimeCache, _mediaFileManager, _imageUrlGenerator)
.Select(url => _absoluteUrlBuilder.ToAbsoluteUrl(url).ToString()),
};

public async Task<UserCreateModel> CreateCreationModelAsync(CreateUserRequestModel requestModel)
{
var createModel = new UserCreateModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public void DefineMaps(IUmbracoMapper mapper)
mapper.Define<ITemplate, TemplateItemResponseModel>((_, _) => new TemplateItemResponseModel { Alias = string.Empty }, Map);
mapper.Define<IMemberType, MemberTypeItemResponseModel>((_, _) => new MemberTypeItemResponseModel(), Map);
mapper.Define<IRelationType, RelationTypeItemResponseModel>((_, _) => new RelationTypeItemResponseModel(), Map);
mapper.Define<IUser, UserItemResponseModel>((_, _) => new UserItemResponseModel(), Map);
mapper.Define<IUserGroup, UserGroupItemResponseModel>((_, _) => new UserGroupItemResponseModel(), Map);
mapper.Define<IWebhook, WebhookItemResponseModel>((_, _) => new WebhookItemResponseModel(), Map);
}
Expand Down Expand Up @@ -107,13 +106,6 @@ private static void Map(IRelationType source, RelationTypeItemResponseModel targ
target.IsDeletable = source.IsDeletableRelationType();
}

// Umbraco.Code.MapAll
private static void Map(IUser source, UserItemResponseModel target, MapperContext context)
{
target.Id = source.Key;
target.Name = source.Name ?? source.Username;
}

// Umbraco.Code.MapAll
private static void Map(IUserGroup source, UserGroupItemResponseModel target, MapperContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ namespace Umbraco.Cms.Api.Management.ViewModels.User.Item;

public class UserItemResponseModel : NamedItemResponseModelBase
{
public IEnumerable<string> AvatarUrls { get; set; } = Enumerable.Empty<string>();
}
Loading