diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/ByKeyUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/ByKeyUsersController.cs similarity index 85% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/ByKeyUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/ByKeyUsersController.cs index 29432dbe6c..f43abe833b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/ByKeyUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/ByKeyUsersController.cs @@ -1,19 +1,19 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class ByKeyUsersController : UsersControllerBase +public class ByKeyUserController : UserControllerBase { private readonly IUserService _userService; private readonly IUserPresentationFactory _userPresentationFactory; - public ByKeyUsersController( + public ByKeyUserController( IUserService userService, IUserPresentationFactory userPresentationFactory) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/ChangePasswordUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/ChangePasswordUsersController.cs similarity index 87% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/ChangePasswordUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/ChangePasswordUsersController.cs index f273b7cfef..8b09f81881 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/ChangePasswordUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/ChangePasswordUsersController.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -8,15 +8,15 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class ChangePasswordUsersController : UsersControllerBase +public class ChangePasswordUserController : UserControllerBase { private readonly IUserService _userService; private readonly IUmbracoMapper _mapper; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; - public ChangePasswordUsersController( + public ChangePasswordUserController( IUserService userService, IUmbracoMapper mapper, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/ClearAvatarUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/ClearAvatarUsersController.cs similarity index 69% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/ClearAvatarUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/ClearAvatarUsersController.cs index c313d43c31..d3c1fb94f0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/ClearAvatarUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/ClearAvatarUsersController.cs @@ -2,13 +2,13 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class ClearAvatarUsersController : UsersControllerBase +public class ClearAvatarUserController : UserControllerBase { private readonly IUserService _userService; - public ClearAvatarUsersController(IUserService userService) => _userService = userService; + public ClearAvatarUserController(IUserService userService) => _userService = userService; [HttpDelete("avatar/{id:guid}")] public async Task ClearAvatar(Guid id) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/CreateUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/CreateUsersController.cs similarity index 89% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/CreateUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/CreateUsersController.cs index 618f6c1ea4..839f6e1fb3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/CreateUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/CreateUsersController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -10,16 +10,16 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class CreateUsersController : UsersControllerBase +public class CreateUserController : UserControllerBase { private readonly IUserService _userService; private readonly IUserPresentationFactory _presentationFactory; private readonly IUmbracoMapper _mapper; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; - public CreateUsersController( + public CreateUserController( IUserService userService, IUserPresentationFactory presentationFactory, IUmbracoMapper mapper, diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/DeleteUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/DeleteUsersController.cs similarity index 69% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/DeleteUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/DeleteUsersController.cs index 3348211de8..258830da03 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/DeleteUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/DeleteUsersController.cs @@ -2,11 +2,11 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class DeleteUsersController : UsersControllerBase +public class DeleteUserController : UserControllerBase { - public DeleteUsersController(IUserService userService) => _userService = userService; + public DeleteUserController(IUserService userService) => _userService = userService; private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/DisableUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/DisableUsersController.cs similarity index 76% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/DisableUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/DisableUsersController.cs index f44d43c567..6a72d99f95 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/DisableUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/DisableUsersController.cs @@ -1,19 +1,18 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Users; -using Umbraco.Cms.Core; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class DisableUsersController : UsersControllerBase +public class DisableUserController : UserControllerBase { private readonly IUserService _userService; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; - public DisableUsersController(IUserService userService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) + public DisableUserController(IUserService userService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) { _userService = userService; _backOfficeSecurityAccessor = backOfficeSecurityAccessor; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/EnableUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/EnableUsersController.cs similarity index 76% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/EnableUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/EnableUsersController.cs index aed2c1baa8..a19b3e3fad 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/EnableUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/EnableUsersController.cs @@ -1,19 +1,18 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Users; -using Umbraco.Cms.Core; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class EnableUsersController : UsersControllerBase +public class EnableUserController : UserControllerBase { private readonly IUserService _userService; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; - public EnableUsersController(IUserService userService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) + public EnableUserController(IUserService userService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) { _userService = userService; _backOfficeSecurityAccessor = backOfficeSecurityAccessor; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/FilterUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/FilterUsersController.cs similarity index 93% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/FilterUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/FilterUsersController.cs index 1b3fff5e5c..53df39bc6e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/FilterUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/FilterUsersController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; @@ -9,15 +9,15 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; using Umbraco.New.Cms.Core.Models; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class FilterUsersController : UsersControllerBase +public class FilterUserController : UserControllerBase { private readonly IUserService _userService; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; private readonly IUserPresentationFactory _userPresentationFactory; - public FilterUsersController( + public FilterUserController( IUserService userService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor, IUserPresentationFactory userPresentationFactory) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/GetAllUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/GetAllUsersController.cs similarity index 90% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/GetAllUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/GetAllUsersController.cs index fcd353a47a..807b510ebd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/GetAllUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/GetAllUsersController.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Models.Membership; @@ -11,15 +11,15 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; using Umbraco.New.Cms.Core.Models; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class GetAllUsersController : UsersControllerBase +public class GetAllUserController : UserControllerBase { private readonly IUserService _userService; private readonly IUserPresentationFactory _userPresentationFactory; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; - public GetAllUsersController( + public GetAllUserController( IUserService userService, IUserPresentationFactory userPresentationFactory, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/InviteUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/InviteUsersController.cs similarity index 87% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/InviteUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/InviteUsersController.cs index 5b20b7d961..3f9b0cc36b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/InviteUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/InviteUsersController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; @@ -9,15 +9,15 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class InviteUsersController : UsersControllerBase +public class InviteUserController : UserControllerBase { private readonly IUserService _userService; private readonly IUserPresentationFactory _userPresentationFactory; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; - public InviteUsersController( + public InviteUserController( IUserService userService, IUserPresentationFactory userPresentationFactory, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/Item/ItemUserItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/Item/ItemUserItemController.cs similarity index 89% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/Item/ItemUserItemController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/Item/ItemUserItemController.cs index 58b6a3368e..e5a1687d1c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/Item/ItemUserItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/Item/ItemUserItemController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Users.Item; +using Umbraco.Cms.Api.Management.ViewModels.User.Item; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; -namespace Umbraco.Cms.Api.Management.Controllers.Users.Item; +namespace Umbraco.Cms.Api.Management.Controllers.User.Item; public class ItemUserItemController : UserItemControllerBase { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/Item/UserItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/Item/UserItemControllerBase.cs similarity index 81% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/Item/UserItemControllerBase.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/Item/UserItemControllerBase.cs index 02f8df9c57..c18bcb2034 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/Item/UserItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/Item/UserItemControllerBase.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; -namespace Umbraco.Cms.Api.Management.Controllers.Users.Item; +namespace Umbraco.Cms.Api.Management.Controllers.User.Item; [ApiController] [VersionedApiBackOfficeRoute("users")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/SetAvatarUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/SetAvatarUsersController.cs similarity index 73% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/SetAvatarUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/SetAvatarUsersController.cs index e35867a8d4..455bfa1396 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/SetAvatarUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/SetAvatarUsersController.cs @@ -1,17 +1,16 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Users; -using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class SetAvatarUsersController : UsersControllerBase +public class SetAvatarUserController : UserControllerBase { private readonly IUserService _userService; - public SetAvatarUsersController(IUserService userService) + public SetAvatarUserController(IUserService userService) { _userService = userService; } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/UnlockUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/UnlockUsersController.cs similarity index 79% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/UnlockUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/UnlockUsersController.cs index be189c6866..84499c05f0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/UnlockUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/UnlockUsersController.cs @@ -1,20 +1,20 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class UnlockUsersController : UsersControllerBase +public class UnlockUserController : UserControllerBase { private readonly IUserService _userService; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; - public UnlockUsersController(IUserService userService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) + public UnlockUserController(IUserService userService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) { _userService = userService; _backOfficeSecurityAccessor = backOfficeSecurityAccessor; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/UpdateUserGroupsUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUserGroupsUsersController.cs similarity index 69% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/UpdateUserGroupsUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUserGroupsUsersController.cs index b0776aa6f9..2aaf7596ce 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/UpdateUserGroupsUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUserGroupsUsersController.cs @@ -1,15 +1,15 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Services; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class UpdateUserGroupsUsersController : UsersControllerBase +public class UpdateUserGroupsUserController : UserControllerBase { private readonly IUserGroupService _userGroupService; - public UpdateUserGroupsUsersController(IUserGroupService userGroupService) + public UpdateUserGroupsUserController(IUserGroupService userGroupService) { _userGroupService = userGroupService; } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/UpdateUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUsersController.cs similarity index 88% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/UpdateUsersController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUsersController.cs index cff5556388..0b15664461 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/UpdateUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUsersController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; @@ -8,15 +8,15 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; -public class UpdateUsersController : UsersControllerBase +public class UpdateUserController : UserControllerBase { private readonly IUserService _userService; private readonly IUserPresentationFactory _userPresentationFactory; private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; - public UpdateUsersController( + public UpdateUserController( IUserService userService, IUserPresentationFactory userPresentationFactory, IBackOfficeSecurityAccessor backOfficeSecurityAccessor) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/UsersControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/UsersControllerBase.cs similarity index 96% rename from src/Umbraco.Cms.Api.Management/Controllers/Users/UsersControllerBase.cs rename to src/Umbraco.Cms.Api.Management/Controllers/User/UsersControllerBase.cs index 12b4173f0e..74b359bf20 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/UsersControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/UsersControllerBase.cs @@ -5,13 +5,13 @@ using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.Users; +namespace Umbraco.Cms.Api.Management.Controllers.User; [ApiController] -[VersionedApiBackOfficeRoute("users")] -[ApiExplorerSettings(GroupName = "Users")] +[VersionedApiBackOfficeRoute("user")] +[ApiExplorerSettings(GroupName = "User")] [ApiVersion("1.0")] -public abstract class UsersControllerBase : ManagementApiControllerBase +public abstract class UserControllerBase : ManagementApiControllerBase { protected IActionResult UserOperationStatusResult(UserOperationStatus status, ErrorMessageResult? errorMessageResult = null) => status switch diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/ByKeyUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs similarity index 86% rename from src/Umbraco.Cms.Api.Management/Controllers/UserGroups/ByKeyUserGroupController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs index 737697a8ee..ed168d3b62 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/ByKeyUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs @@ -1,14 +1,14 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.UserGroups; +using Umbraco.Cms.Api.Management.ViewModels.UserGroup; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; -namespace Umbraco.Cms.Api.Management.Controllers.UserGroups; +namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; -public class ByKeyUserGroupController : UserGroupsControllerBase +public class ByKeyUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; private readonly IUserGroupPresentationFactory _userGroupPresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/CreateUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/CreateUserGroupController.cs similarity index 92% rename from src/Umbraco.Cms.Api.Management/Controllers/UserGroups/CreateUserGroupController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/UserGroup/CreateUserGroupController.cs index 0c1644bcf5..48965a3c3b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/CreateUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/CreateUserGroupController.cs @@ -1,16 +1,16 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.UserGroups; +using Umbraco.Cms.Api.Management.ViewModels.UserGroup; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.UserGroups; +namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; -public class CreateUserGroupController : UserGroupsControllerBase +public class CreateUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; private readonly IUserGroupPresentationFactory _userGroupPresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/DeleteUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/DeleteUserGroupController.cs similarity index 86% rename from src/Umbraco.Cms.Api.Management/Controllers/UserGroups/DeleteUserGroupController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/UserGroup/DeleteUserGroupController.cs index bc96fcd722..944e1a5157 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/DeleteUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/DeleteUserGroupController.cs @@ -4,9 +4,9 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.UserGroups; +namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; -public class DeleteUserGroupController : UserGroupsControllerBase +public class DeleteUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/GetAllUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs similarity index 90% rename from src/Umbraco.Cms.Api.Management/Controllers/UserGroups/GetAllUserGroupController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs index f94693eab0..073ace49ea 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/GetAllUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs @@ -2,14 +2,14 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.UserGroups; +using Umbraco.Cms.Api.Management.ViewModels.UserGroup; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; using Umbraco.New.Cms.Core.Models; -namespace Umbraco.Cms.Api.Management.Controllers.UserGroups; +namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; -public class GetAllUserGroupController : UserGroupsControllerBase +public class GetAllUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; private readonly IUserGroupPresentationFactory _userPresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/Item/ItemUserGroupItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/ItemUserGroupItemController.cs similarity index 89% rename from src/Umbraco.Cms.Api.Management/Controllers/UserGroups/Item/ItemUserGroupItemController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/ItemUserGroupItemController.cs index ee60082755..c2ce07d2c6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/Item/ItemUserGroupItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/ItemUserGroupItemController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.UserGroups.Item; +using Umbraco.Cms.Api.Management.ViewModels.UserGroup.Item; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; -namespace Umbraco.Cms.Api.Management.Controllers.UserGroups.Item; +namespace Umbraco.Cms.Api.Management.Controllers.UserGroup.Item; public class ItemUserGroupItemController : UserGroupItemControllerBase { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/Item/UserGroupItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/UserGroupItemControllerBase.cs similarity index 81% rename from src/Umbraco.Cms.Api.Management/Controllers/UserGroups/Item/UserGroupItemControllerBase.cs rename to src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/UserGroupItemControllerBase.cs index d5623c655f..72fa2b504f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/Item/UserGroupItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/UserGroupItemControllerBase.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; -namespace Umbraco.Cms.Api.Management.Controllers.UserGroups.Item; +namespace Umbraco.Cms.Api.Management.Controllers.UserGroup.Item; [ApiController] [VersionedApiBackOfficeRoute("user-groups")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UpdateUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UpdateUserGroupController.cs similarity index 90% rename from src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UpdateUserGroupController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UpdateUserGroupController.cs index 5b2117d50c..32cf279040 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UpdateUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UpdateUserGroupController.cs @@ -1,15 +1,15 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.UserGroups; +using Umbraco.Cms.Api.Management.ViewModels.UserGroup; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.UserGroups; +namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; -public class UpdateUserGroupController : UserGroupsControllerBase +public class UpdateUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; private readonly IUserGroupPresentationFactory _userGroupPresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UserGroupsControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UserGroupsControllerBase.cs similarity index 95% rename from src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UserGroupsControllerBase.cs rename to src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UserGroupsControllerBase.cs index a24edfd973..f18985164e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UserGroupsControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UserGroupsControllerBase.cs @@ -4,15 +4,15 @@ using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core.Services.OperationStatus; -namespace Umbraco.Cms.Api.Management.Controllers.UserGroups; +namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; // TODO: This needs to be an authorized controller. [ApiController] -[VersionedApiBackOfficeRoute("user-groups")] -[ApiExplorerSettings(GroupName = "User Groups")] +[VersionedApiBackOfficeRoute("user-group")] +[ApiExplorerSettings(GroupName = "User Group")] [ApiVersion("1.0")] -public class UserGroupsControllerBase : ManagementApiControllerBase +public class UserGroupControllerBase : ManagementApiControllerBase { protected IActionResult UserGroupOperationStatusResult(UserGroupOperationStatus status) => status switch diff --git a/src/Umbraco.Cms.Api.Management/Factories/IUserGroupPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/IUserGroupPresentationFactory.cs index c32f52a8e6..5632d233d3 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/IUserGroupPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/IUserGroupPresentationFactory.cs @@ -1,4 +1,4 @@ -using Umbraco.Cms.Api.Management.ViewModels.UserGroups; +using Umbraco.Cms.Api.Management.ViewModels.UserGroup; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services.OperationStatus; diff --git a/src/Umbraco.Cms.Api.Management/Factories/IUserPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/IUserPresentationFactory.cs index 22d28d25d8..bff6218318 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/IUserPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/IUserPresentationFactory.cs @@ -1,4 +1,4 @@ -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; diff --git a/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs index 3f7877a62e..137a4a1fc6 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs @@ -1,5 +1,5 @@ using Umbraco.Cms.Api.Management.Mapping; -using Umbraco.Cms.Api.Management.ViewModels.UserGroups; +using Umbraco.Cms.Api.Management.ViewModels.UserGroup; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; diff --git a/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs index 8371df7604..7bb17ce5ef 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs @@ -1,4 +1,4 @@ -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Media; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs index 6530403cda..197ef7ca4f 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs @@ -9,8 +9,8 @@ using Umbraco.Cms.Api.Management.ViewModels.MemberGroup.Item; using Umbraco.Cms.Api.Management.ViewModels.MemberType.Items; using Umbraco.Cms.Api.Management.ViewModels.RelationType.Item; using Umbraco.Cms.Api.Management.ViewModels.Template.Item; -using Umbraco.Cms.Api.Management.ViewModels.UserGroups.Item; -using Umbraco.Cms.Api.Management.ViewModels.Users.Item; +using Umbraco.Cms.Api.Management.ViewModels.User.Item; +using Umbraco.Cms.Api.Management.ViewModels.UserGroup.Item; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Users/UsersViewModelsMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Users/UsersViewModelsMapDefinition.cs index f0561551c4..f68e9c9988 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Users/UsersViewModelsMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Users/UsersViewModelsMapDefinition.cs @@ -1,4 +1,4 @@ -using Umbraco.Cms.Api.Management.ViewModels.Users; +using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json index af546f191a..758e73dcf2 100644 --- a/src/Umbraco.Cms.Api.Management/OpenApi.json +++ b/src/Umbraco.Cms.Api.Management/OpenApi.json @@ -909,6 +909,9 @@ } } }, + "404": { + "description": "Not Found" + }, "400": { "description": "Bad Request", "content": { @@ -919,9 +922,6 @@ } } }, - "404": { - "description": "Not Found" - }, "409": { "description": "Conflict", "content": { @@ -2065,6 +2065,9 @@ } ], "responses": { + "401": { + "description": "Unauthorized" + }, "200": { "description": "Success", "content": { @@ -2074,9 +2077,6 @@ } } } - }, - "401": { - "description": "Unauthorized" } } } @@ -2108,6 +2108,9 @@ } ], "responses": { + "401": { + "description": "Unauthorized" + }, "200": { "description": "Success", "content": { @@ -2117,9 +2120,6 @@ } } } - }, - "401": { - "description": "Unauthorized" } } } @@ -2299,6 +2299,9 @@ } ], "responses": { + "404": { + "description": "Not Found" + }, "200": { "description": "Success", "content": { @@ -2312,9 +2315,6 @@ } } } - }, - "404": { - "description": "Not Found" } } } @@ -2336,6 +2336,9 @@ } ], "responses": { + "404": { + "description": "Not Found" + }, "200": { "description": "Success", "content": { @@ -2349,9 +2352,6 @@ } } } - }, - "404": { - "description": "Not Found" } } } @@ -2376,6 +2376,16 @@ } }, "responses": { + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "200": { "description": "Success", "content": { @@ -2389,16 +2399,6 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } } } } @@ -2450,16 +2450,6 @@ } ], "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PagedHelpPageResponseModel" - } - } - } - }, "400": { "description": "Bad Request", "content": { @@ -2469,6 +2459,16 @@ } } } + }, + "200": { + "description": "Success", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PagedHelpPageResponseModel" + } + } + } } } } @@ -2528,6 +2528,16 @@ } ], "responses": { + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "200": { "description": "Success", "content": { @@ -2541,16 +2551,6 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } } } } @@ -2572,16 +2572,6 @@ } ], "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/OkResultModel" - } - } - } - }, "400": { "description": "Bad Request", "content": { @@ -2591,6 +2581,16 @@ } } } + }, + "200": { + "description": "Success", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/OkResultModel" + } + } + } } } } @@ -2602,20 +2602,6 @@ ], "operationId": "GetInstallSettings", "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { - "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/InstallSettingsResponseModel" - } - ] - } - } - } - }, "400": { "description": "Bad Request", "content": { @@ -2635,6 +2621,20 @@ } } } + }, + "200": { + "description": "Success", + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/InstallSettingsResponseModel" + } + ] + } + } + } } } } @@ -2659,9 +2659,6 @@ } }, "responses": { - "200": { - "description": "Success" - }, "400": { "description": "Bad Request", "content": { @@ -2681,6 +2678,9 @@ } } } + }, + "200": { + "description": "Success" } } } @@ -2705,9 +2705,6 @@ } }, "responses": { - "200": { - "description": "Success" - }, "400": { "description": "Bad Request", "content": { @@ -2717,6 +2714,9 @@ } } } + }, + "200": { + "description": "Success" } } } @@ -2779,6 +2779,19 @@ } }, "responses": { + "404": { + "description": "Not Found" + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "201": { "description": "Created", "headers": { @@ -2791,19 +2804,6 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } - }, - "404": { - "description": "Not Found" } } } @@ -2825,6 +2825,9 @@ } ], "responses": { + "404": { + "description": "Not Found" + }, "200": { "description": "Success", "content": { @@ -2838,9 +2841,6 @@ } } } - }, - "404": { - "description": "Not Found" } } }, @@ -2860,9 +2860,6 @@ } ], "responses": { - "200": { - "description": "Success" - }, "400": { "description": "Bad Request", "content": { @@ -2882,6 +2879,9 @@ } } } + }, + "200": { + "description": "Success" } } }, @@ -2914,8 +2914,8 @@ } }, "responses": { - "200": { - "description": "Success" + "404": { + "description": "Not Found" }, "400": { "description": "Bad Request", @@ -2927,8 +2927,8 @@ } } }, - "404": { - "description": "Not Found" + "200": { + "description": "Success" } } } @@ -3038,6 +3038,16 @@ } ], "responses": { + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "200": { "description": "Success", "content": { @@ -3051,16 +3061,6 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } } } } @@ -3188,16 +3188,6 @@ } ], "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PagedLogTemplateResponseModel" - } - } - } - }, "400": { "description": "Bad Request", "content": { @@ -3207,6 +3197,16 @@ } } } + }, + "200": { + "description": "Success", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PagedLogTemplateResponseModel" + } + } + } } } } @@ -3269,6 +3269,16 @@ } }, "responses": { + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "201": { "description": "Created", "headers": { @@ -3281,16 +3291,6 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } } } } @@ -3312,6 +3312,9 @@ } ], "responses": { + "404": { + "description": "Not Found" + }, "200": { "description": "Success", "content": { @@ -3325,9 +3328,6 @@ } } } - }, - "404": { - "description": "Not Found" } } }, @@ -3347,11 +3347,11 @@ } ], "responses": { - "200": { - "description": "Success" - }, "404": { "description": "Not Found" + }, + "200": { + "description": "Success" } } } @@ -3381,9 +3381,6 @@ } ], "responses": { - "200": { - "description": "Success" - }, "400": { "description": "Bad Request", "content": { @@ -3393,6 +3390,9 @@ } } } + }, + "200": { + "description": "Success" } } } @@ -3856,6 +3856,9 @@ } ], "responses": { + "401": { + "description": "Unauthorized" + }, "200": { "description": "Success", "content": { @@ -3865,9 +3868,6 @@ } } } - }, - "401": { - "description": "Unauthorized" } } } @@ -3899,6 +3899,9 @@ } ], "responses": { + "401": { + "description": "Unauthorized" + }, "200": { "description": "Success", "content": { @@ -3908,9 +3911,6 @@ } } } - }, - "401": { - "description": "Unauthorized" } } } @@ -4401,9 +4401,6 @@ } ], "responses": { - "200": { - "description": "Success" - }, "404": { "description": "Not Found" }, @@ -4416,6 +4413,9 @@ } } } + }, + "200": { + "description": "Success" } } } @@ -4478,6 +4478,19 @@ } }, "responses": { + "404": { + "description": "Not Found" + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "201": { "description": "Created", "headers": { @@ -4490,19 +4503,6 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } - }, - "404": { - "description": "Not Found" } } } @@ -4525,6 +4525,9 @@ } ], "responses": { + "404": { + "description": "Not Found" + }, "200": { "description": "Success", "content": { @@ -4538,9 +4541,6 @@ } } } - }, - "404": { - "description": "Not Found" } } }, @@ -4561,11 +4561,11 @@ } ], "responses": { - "200": { - "description": "Success" - }, "404": { "description": "Not Found" + }, + "200": { + "description": "Success" } } }, @@ -4599,11 +4599,11 @@ } }, "responses": { - "200": { - "description": "Success" - }, "404": { "description": "Not Found" + }, + "200": { + "description": "Success" } } } @@ -4626,6 +4626,9 @@ } ], "responses": { + "404": { + "description": "Not Found" + }, "200": { "description": "Success", "content": { @@ -4636,9 +4639,6 @@ } } } - }, - "404": { - "description": "Not Found" } } } @@ -4909,16 +4909,6 @@ } ], "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PagedBooleanModel" - } - } - } - }, "400": { "description": "Bad Request", "content": { @@ -4928,6 +4918,16 @@ } } } + }, + "200": { + "description": "Success", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PagedBooleanModel" + } + } + } } } } @@ -5023,16 +5023,6 @@ } ], "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PagedRedirectUrlResponseModel" - } - } - } - }, "400": { "description": "Bad Request", "content": { @@ -5042,6 +5032,16 @@ } } } + }, + "200": { + "description": "Success", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PagedRedirectUrlResponseModel" + } + } + } } } } @@ -5838,6 +5838,16 @@ ], "operationId": "GetServerStatus", "responses": { + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "200": { "description": "Success", "content": { @@ -5851,16 +5861,6 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } } } } @@ -5872,6 +5872,16 @@ ], "operationId": "GetServerVersion", "responses": { + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "200": { "description": "Success", "content": { @@ -5885,16 +5895,6 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } } } } @@ -6294,9 +6294,6 @@ } }, "responses": { - "200": { - "description": "Success" - }, "400": { "description": "Bad Request", "content": { @@ -6306,6 +6303,9 @@ } } } + }, + "200": { + "description": "Success" } } } @@ -6775,20 +6775,6 @@ } ], "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { - "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/TemporaryFileResponseModel" - } - ] - } - } - } - }, "400": { "description": "Bad Request", "content": { @@ -6808,6 +6794,20 @@ } } } + }, + "200": { + "description": "Success", + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/TemporaryFileResponseModel" + } + ] + } + } + } } } }, @@ -6828,9 +6828,6 @@ } ], "responses": { - "200": { - "description": "Success" - }, "400": { "description": "Bad Request", "content": { @@ -6850,6 +6847,9 @@ } } } + }, + "200": { + "description": "Success" } } } @@ -7093,12 +7093,12 @@ } } }, - "/umbraco/management/api/v1/user-groups": { + "/umbraco/management/api/v1/user-group": { "post": { "tags": [ - "User Groups" + "User Group" ], - "operationId": "PostUserGroups", + "operationId": "PostUserGroup", "requestBody": { "content": { "application/json": { @@ -7113,6 +7113,16 @@ } }, "responses": { + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + }, "201": { "description": "Created", "headers": { @@ -7125,24 +7135,14 @@ } } } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } } } }, "get": { "tags": [ - "User Groups" + "User Group" ], - "operationId": "GetUserGroups", + "operationId": "GetUserGroup", "parameters": [ { "name": "skip", @@ -7177,12 +7177,12 @@ } } }, - "/umbraco/management/api/v1/user-groups/{id}": { + "/umbraco/management/api/v1/user-group/{id}": { "get": { "tags": [ - "User Groups" + "User Group" ], - "operationId": "GetUserGroupsById", + "operationId": "GetUserGroupById", "parameters": [ { "name": "id", @@ -7216,9 +7216,9 @@ }, "delete": { "tags": [ - "User Groups" + "User Group" ], - "operationId": "DeleteUserGroupsById", + "operationId": "DeleteUserGroupById", "parameters": [ { "name": "id", @@ -7241,9 +7241,9 @@ }, "put": { "tags": [ - "User Groups" + "User Group" ], - "operationId": "PutUserGroupsById", + "operationId": "PutUserGroupById", "parameters": [ { "name": "id", @@ -7319,12 +7319,12 @@ } } }, - "/umbraco/management/api/v1/users": { + "/umbraco/management/api/v1/user": { "post": { "tags": [ - "Users" + "User" ], - "operationId": "PostUsers", + "operationId": "PostUser", "requestBody": { "content": { "application/json": { @@ -7370,9 +7370,9 @@ }, "get": { "tags": [ - "Users" + "User" ], - "operationId": "GetUsers", + "operationId": "GetUser", "parameters": [ { "name": "skip", @@ -7407,12 +7407,12 @@ } } }, - "/umbraco/management/api/v1/users/{id}": { + "/umbraco/management/api/v1/user/{id}": { "get": { "tags": [ - "Users" + "User" ], - "operationId": "GetUsersById", + "operationId": "GetUserById", "parameters": [ { "name": "id", @@ -7446,9 +7446,9 @@ }, "delete": { "tags": [ - "Users" + "User" ], - "operationId": "DeleteUsersById", + "operationId": "DeleteUserById", "parameters": [ { "name": "id", @@ -7468,9 +7468,9 @@ }, "put": { "tags": [ - "Users" + "User" ], - "operationId": "PutUsersById", + "operationId": "PutUserById", "parameters": [ { "name": "id", @@ -7502,12 +7502,12 @@ } } }, - "/umbraco/management/api/v1/users/avatar/{id}": { + "/umbraco/management/api/v1/user/avatar/{id}": { "delete": { "tags": [ - "Users" + "User" ], - "operationId": "DeleteUsersAvatarById", + "operationId": "DeleteUserAvatarById", "parameters": [ { "name": "id", @@ -7527,9 +7527,9 @@ }, "post": { "tags": [ - "Users" + "User" ], - "operationId": "PostUsersAvatarById", + "operationId": "PostUserAvatarById", "parameters": [ { "name": "id", @@ -7571,12 +7571,12 @@ } } }, - "/umbraco/management/api/v1/users/change-password/{id}": { + "/umbraco/management/api/v1/user/change-password/{id}": { "post": { "tags": [ - "Users" + "User" ], - "operationId": "PostUsersChangePasswordById", + "operationId": "PostUserChangePasswordById", "parameters": [ { "name": "id", @@ -7608,12 +7608,12 @@ } } }, - "/umbraco/management/api/v1/users/disable": { + "/umbraco/management/api/v1/user/disable": { "post": { "tags": [ - "Users" + "User" ], - "operationId": "PostUsersDisable", + "operationId": "PostUserDisable", "requestBody": { "content": { "application/json": { @@ -7644,12 +7644,12 @@ } } }, - "/umbraco/management/api/v1/users/enable": { + "/umbraco/management/api/v1/user/enable": { "post": { "tags": [ - "Users" + "User" ], - "operationId": "PostUsersEnable", + "operationId": "PostUserEnable", "requestBody": { "content": { "application/json": { @@ -7680,12 +7680,12 @@ } } }, - "/umbraco/management/api/v1/users/filter": { + "/umbraco/management/api/v1/user/filter": { "get": { "tags": [ - "Users" + "User" ], - "operationId": "GetUsersFilter", + "operationId": "GetUserFilter", "parameters": [ { "name": "skip", @@ -7758,12 +7758,12 @@ } } }, - "/umbraco/management/api/v1/users/invite": { + "/umbraco/management/api/v1/user/invite": { "post": { "tags": [ - "Users" + "User" ], - "operationId": "PostUsersInvite", + "operationId": "PostUserInvite", "requestBody": { "content": { "application/json": { @@ -7784,6 +7784,68 @@ } } }, + "/umbraco/management/api/v1/user/set-user-groups": { + "post": { + "tags": [ + "User" + ], + "operationId": "PostUserSetUserGroups", + "requestBody": { + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UpdateUserGroupsOnUserRequestModel" + } + ] + } + } + } + }, + "responses": { + "200": { + "description": "Success" + } + } + } + }, + "/umbraco/management/api/v1/user/unlock": { + "post": { + "tags": [ + "User" + ], + "operationId": "PostUserUnlock", + "requestBody": { + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UnlockUsersRequestModel" + } + ] + } + } + } + }, + "responses": { + "200": { + "description": "Success" + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetailsModel" + } + } + } + } + } + } + }, "/umbraco/management/api/v1/users/item": { "get": { "tags": [ @@ -7824,68 +7886,6 @@ } } } - }, - "/umbraco/management/api/v1/users/set-user-groups": { - "post": { - "tags": [ - "Users" - ], - "operationId": "PostUsersSetUserGroups", - "requestBody": { - "content": { - "application/json": { - "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/UpdateUserGroupsOnUserRequestModel" - } - ] - } - } - } - }, - "responses": { - "200": { - "description": "Success" - } - } - } - }, - "/umbraco/management/api/v1/users/unlock": { - "post": { - "tags": [ - "Users" - ], - "operationId": "PostUsersUnlock", - "requestBody": { - "content": { - "application/json": { - "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/UnlockUsersRequestModel" - } - ] - } - } - } - }, - "responses": { - "200": { - "description": "Success" - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemDetailsModel" - } - } - } - } - } - } } }, "components": { @@ -9637,7 +9637,7 @@ }, "providerProperties": { "type": "object", - "additionalProperties": {}, + "additionalProperties": { }, "nullable": true } }, @@ -10225,7 +10225,7 @@ }, "extensions": { "type": "array", - "items": {} + "items": { } } }, "additionalProperties": false @@ -11165,7 +11165,7 @@ "nullable": true } }, - "additionalProperties": {} + "additionalProperties": { } }, "ProfilingStatusRequestModel": { "type": "object", @@ -12660,7 +12660,7 @@ "authorizationCode": { "authorizationUrl": "/umbraco/management/api/v1.0/security/back-office/authorize", "tokenUrl": "/umbraco/management/api/v1.0/security/back-office/token", - "scopes": {} + "scopes": { } } } } @@ -12668,7 +12668,7 @@ }, "security": [ { - "OAuth": [] + "OAuth": [ ] } ] } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/ChangePasswordUserRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/ChangePasswordUserRequestModel.cs similarity index 82% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/ChangePasswordUserRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/ChangePasswordUserRequestModel.cs index b2edfa964a..1e7e638b36 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/ChangePasswordUserRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/ChangePasswordUserRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class ChangePasswordUserRequestModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/ChangePasswordUserResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/ChangePasswordUserResponseModel.cs similarity index 62% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/ChangePasswordUserResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/ChangePasswordUserResponseModel.cs index d7fcc1fe2d..c47c1834a6 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/ChangePasswordUserResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/ChangePasswordUserResponseModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class ChangePasswordUserResponseModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/CreateUserRequestModel.cs similarity index 52% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/CreateUserRequestModel.cs index edfac33824..6867a39655 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/CreateUserRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class CreateUserRequestModel : UserPresentationBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/CreateUserResponseModel.cs similarity index 68% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/CreateUserResponseModel.cs index 0ae336613d..8946447b10 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/CreateUserResponseModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class CreateUserResponseModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/DisableUserRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/DisableUserRequestModel.cs similarity index 63% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/DisableUserRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/DisableUserRequestModel.cs index 9f2f07afb2..449b230254 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/DisableUserRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/DisableUserRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class DisableUserRequestModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/EnableUserRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/EnableUserRequestModel.cs similarity index 63% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/EnableUserRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/EnableUserRequestModel.cs index 74ace4d27b..b06302c19f 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/EnableUserRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/EnableUserRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class EnableUserRequestModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/InviteUserRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/InviteUserRequestModel.cs similarity index 64% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/InviteUserRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/InviteUserRequestModel.cs index c945534d96..9f73d12dea 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/InviteUserRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/InviteUserRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class InviteUserRequestModel : CreateUserRequestModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/Item/UserItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/Item/UserItemResponseModel.cs similarity index 66% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/Item/UserItemResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/Item/UserItemResponseModel.cs index cc4a78fe50..6c9c3884a6 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/Item/UserItemResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/Item/UserItemResponseModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.Item; -namespace Umbraco.Cms.Api.Management.ViewModels.Users.Item; +namespace Umbraco.Cms.Api.Management.ViewModels.User.Item; public class UserItemResponseModel : ItemResponseModelBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/SetAvatarRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/SetAvatarRequestModel.cs similarity index 57% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/SetAvatarRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/SetAvatarRequestModel.cs index 5efe6884d1..98897ab50d 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/SetAvatarRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/SetAvatarRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class SetAvatarRequestModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UnlockUsersRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/UnlockUsersRequestModel.cs similarity index 63% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/UnlockUsersRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/UnlockUsersRequestModel.cs index 6e44b94ef9..709602a480 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UnlockUsersRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/UnlockUsersRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class UnlockUsersRequestModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UpdateUserGroupsOnUserRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/UpdateUserGroupsOnUserRequestModel.cs similarity index 75% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/UpdateUserGroupsOnUserRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/UpdateUserGroupsOnUserRequestModel.cs index c0b56eaa5a..f250ca8ada 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UpdateUserGroupsOnUserRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/UpdateUserGroupsOnUserRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class UpdateUserGroupsOnUserRequestModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UpdateUserRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/UpdateUserRequestModel.cs similarity index 82% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/UpdateUserRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/UpdateUserRequestModel.cs index b8b9eea52e..d719d8091f 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UpdateUserRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/UpdateUserRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class UpdateUserRequestModel : UserPresentationBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UserPresentationBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/UserPresentationBase.cs similarity index 82% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/UserPresentationBase.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/UserPresentationBase.cs index cbd3df0dda..43e81e8162 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UserPresentationBase.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/UserPresentationBase.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class UserPresentationBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UserResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/User/UserResponseModel.cs similarity index 93% rename from src/Umbraco.Cms.Api.Management/ViewModels/Users/UserResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/User/UserResponseModel.cs index 903d4b1d0e..5a54ca81b6 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UserResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/User/UserResponseModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Core.Models.Membership; -namespace Umbraco.Cms.Api.Management.ViewModels.Users; +namespace Umbraco.Cms.Api.Management.ViewModels.User; public class UserResponseModel : UserPresentationBase, INamedEntityPresentationModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/Item/UserGroupItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/Item/UserGroupItemResponseModel.cs similarity index 71% rename from src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/Item/UserGroupItemResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/Item/UserGroupItemResponseModel.cs index b24338c257..78675a0340 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/Item/UserGroupItemResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/Item/UserGroupItemResponseModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.Item; -namespace Umbraco.Cms.Api.Management.ViewModels.UserGroups.Item; +namespace Umbraco.Cms.Api.Management.ViewModels.UserGroup.Item; public class UserGroupItemResponseModel : ItemResponseModelBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/SaveUserGroupRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/SaveUserGroupRequestModel.cs new file mode 100644 index 0000000000..6839b70088 --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/SaveUserGroupRequestModel.cs @@ -0,0 +1,6 @@ +namespace Umbraco.Cms.Api.Management.ViewModels.UserGroup; + +public class SaveUserGroupRequestModel : UserGroupBase +{ + +} diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UpdateUserGroupRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UpdateUserGroupRequestModel.cs similarity index 50% rename from src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UpdateUserGroupRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UpdateUserGroupRequestModel.cs index 70a9f5a141..ffea44fcec 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UpdateUserGroupRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UpdateUserGroupRequestModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.UserGroups; +namespace Umbraco.Cms.Api.Management.ViewModels.UserGroup; public class UpdateUserGroupRequestModel : UserGroupBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupBase.cs similarity index 96% rename from src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupBase.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupBase.cs index 5796b86e13..cc0d58aa5e 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupBase.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupBase.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.UserGroups; +namespace Umbraco.Cms.Api.Management.ViewModels.UserGroup; /// /// diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupPresentationModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupPresentationModel.cs similarity index 77% rename from src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupPresentationModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupPresentationModel.cs index 8786c2a512..178aca4021 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupPresentationModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupPresentationModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.UserGroups; +namespace Umbraco.Cms.Api.Management.ViewModels.UserGroup; public class UserGroupPresentationModel : UserGroupBase, INamedEntityPresentationModel { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/SaveUserGroupRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/SaveUserGroupRequestModel.cs deleted file mode 100644 index 068f756eeb..0000000000 --- a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/SaveUserGroupRequestModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.UserGroups; - -public class SaveUserGroupRequestModel : UserGroupBase -{ - -}