yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor content updates to shift responsibility downwards (#15807)

Browse Source
This commit is contained in:
Kenn Jacobsen
2024-03-01 10:45:19 +01:00
committed by GitHub
parent 33c1d4e1fb
commit d8659ca53e
18 changed files with 85 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs
View File

@@ -24,7 +24,7 @@ public class UpdateDocumentController : UpdateDocumentControllerBase
IContentEditingService contentEditingService,
IDocumentEditingPresentationFactory documentEditingPresentationFactory,
IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
: base(authorizationService, contentEditingService)
: base(authorizationService)
{
_contentEditingService = contentEditingService;
_documentEditingPresentationFactory = documentEditingPresentationFactory;
@@ -37,11 +37,11 @@ public class UpdateDocumentController : UpdateDocumentControllerBase
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
public async Task<IActionResult> Update(Guid id, UpdateDocumentRequestModel requestModel)
=> await HandleRequest(id, requestModel, async content =>
=> await HandleRequest(id, requestModel, async () =>
{
ContentUpdateModel model = _documentEditingPresentationFactory.MapUpdateModel(requestModel);
Attempt<ContentUpdateResult, ContentEditingOperationStatus> result =
await _contentEditingService.UpdateAsync(content, model, CurrentUserKey(_backOfficeSecurityAccessor));
await _contentEditingService.UpdateAsync(id, model, CurrentUserKey(_backOfficeSecurityAccessor));
return result.Success
? Ok()

21
src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs
View File

@@ -1,11 +1,8 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Api.Management.Security.Authorization.Content;
using Umbraco.Cms.Api.Management.ViewModels.Document;
using Umbraco.Cms.Core.Actions;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Security.Authorization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Web.Common.Authorization;
using Umbraco.Extensions;
@@ -14,15 +11,11 @@ namespace Umbraco.Cms.Api.Management.Controllers.Document;
public abstract class UpdateDocumentControllerBase : DocumentControllerBase
{
private readonly IAuthorizationService _authorizationService;
private readonly IContentEditingService _contentEditingService;
protected UpdateDocumentControllerBase(IAuthorizationService authorizationService, IContentEditingService contentEditingService)
{
_authorizationService = authorizationService;
_contentEditingService = contentEditingService;
}
protected UpdateDocumentControllerBase(IAuthorizationService authorizationService)
=> _authorizationService = authorizationService;
protected async Task<IActionResult> HandleRequest(Guid id, UpdateDocumentRequestModel requestModel, Func<IContent, Task<IActionResult>> authorizedHandler)
protected async Task<IActionResult> HandleRequest(Guid id, UpdateDocumentRequestModel requestModel, Func<Task<IActionResult>> authorizedHandler)
{
IEnumerable<string> cultures = requestModel.Variants
.Where(v => v.Culture is not null)
@@ -37,12 +30,6 @@ public abstract class UpdateDocumentControllerBase : DocumentControllerBase
return Forbidden();
}
IContent? content = await _contentEditingService.GetAsync(id);
if (content is null)
{
return DocumentNotFound();
}
return await authorizedHandler(content);
return await authorizedHandler();
}
}

6
src/Umbraco.Cms.Api.Management/Controllers/Document/ValidateUpdateDocumentController.cs
View File

@@ -21,7 +21,7 @@ public class ValidateUpdateDocumentController : UpdateDocumentControllerBase
IAuthorizationService authorizationService,
IContentEditingService contentEditingService,
IDocumentEditingPresentationFactory documentEditingPresentationFactory)
: base(authorizationService, contentEditingService)
: base(authorizationService)
{
_contentEditingService = contentEditingService;
_documentEditingPresentationFactory = documentEditingPresentationFactory;
@@ -33,10 +33,10 @@ public class ValidateUpdateDocumentController : UpdateDocumentControllerBase
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
public async Task<IActionResult> Validate(Guid id, UpdateDocumentRequestModel requestModel)
=> await HandleRequest(id, requestModel, async content =>
=> await HandleRequest(id, requestModel, async () =>
{
ContentUpdateModel model = _documentEditingPresentationFactory.MapUpdateModel(requestModel);
Attempt<ContentValidationResult, ContentEditingOperationStatus> result = await _contentEditingService.ValidateUpdateAsync(content, model);
Attempt<ContentValidationResult, ContentEditingOperationStatus> result = await _contentEditingService.ValidateUpdateAsync(id, model);
return result.Success
? Ok()

6
src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs
View File

@@ -24,7 +24,7 @@ public class UpdateMediaController : UpdateMediaControllerBase
IMediaEditingService mediaEditingService,
IMediaEditingPresentationFactory mediaEditingPresentationFactory,
IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
: base(authorizationService, mediaEditingService)
: base(authorizationService)
{
_mediaEditingService = mediaEditingService;
_mediaEditingPresentationFactory = mediaEditingPresentationFactory;
@@ -37,11 +37,11 @@ public class UpdateMediaController : UpdateMediaControllerBase
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
public async Task<IActionResult> Update(Guid id, UpdateMediaRequestModel requestModel)
=> await HandleRequest(id, async media =>
=> await HandleRequest(id, async () =>
{
MediaUpdateModel model = _mediaEditingPresentationFactory.MapUpdateModel(requestModel);
Attempt<MediaUpdateResult, ContentEditingOperationStatus> result =
await _mediaEditingService.UpdateAsync(media, model, CurrentUserKey(_backOfficeSecurityAccessor));
await _mediaEditingService.UpdateAsync(id, model, CurrentUserKey(_backOfficeSecurityAccessor));
return result.Success
? Ok()

21
src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaControllerBase.cs
View File

@@ -1,9 +1,6 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Api.Management.Security.Authorization.Media;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Security.Authorization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Web.Common.Authorization;
using Umbraco.Extensions;
@@ -12,15 +9,11 @@ namespace Umbraco.Cms.Api.Management.Controllers.Media;
public abstract class UpdateMediaControllerBase : MediaControllerBase
{
private readonly IAuthorizationService _authorizationService;
private readonly IMediaEditingService _mediaEditingService;
protected UpdateMediaControllerBase(IAuthorizationService authorizationService, IMediaEditingService mediaEditingService)
{
_authorizationService = authorizationService;
_mediaEditingService = mediaEditingService;
}
protected UpdateMediaControllerBase(IAuthorizationService authorizationService)
=> _authorizationService = authorizationService;
protected async Task<IActionResult> HandleRequest(Guid id, Func<IMedia, Task<IActionResult>> authorizedHandler)
protected async Task<IActionResult> HandleRequest(Guid id, Func<Task<IActionResult>> authorizedHandler)
{
AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
User,
@@ -32,12 +25,6 @@ public abstract class UpdateMediaControllerBase : MediaControllerBase
return Forbidden();
}
IMedia? media = await _mediaEditingService.GetAsync(id);
if (media is null)
{
return MediaNotFound();
}
return await authorizedHandler(media);
return await authorizedHandler();
}
}

6
src/Umbraco.Cms.Api.Management/Controllers/Media/ValidateUpdateMediaController.cs
View File

@@ -21,7 +21,7 @@ public class ValidateUpdateMediaController : UpdateMediaControllerBase
IAuthorizationService authorizationService,
IMediaEditingService mediaEditingService,
IMediaEditingPresentationFactory mediaEditingPresentationFactory)
: base(authorizationService, mediaEditingService)
: base(authorizationService)
{
_mediaEditingService = mediaEditingService;
_mediaEditingPresentationFactory = mediaEditingPresentationFactory;
@@ -33,10 +33,10 @@ public class ValidateUpdateMediaController : UpdateMediaControllerBase
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
public async Task<IActionResult> Validate(Guid id, UpdateMediaRequestModel requestModel)
=> await HandleRequest(id, async content =>
=> await HandleRequest(id, async () =>
{
MediaUpdateModel model = _mediaEditingPresentationFactory.MapUpdateModel(requestModel);
Attempt<ContentValidationResult, ContentEditingOperationStatus> result = await _mediaEditingService.ValidateUpdateAsync(content, model);
Attempt<ContentValidationResult, ContentEditingOperationStatus> result = await _mediaEditingService.ValidateUpdateAsync(id, model);
return result.Success
? Ok()

9
src/Umbraco.Cms.Api.Management/Controllers/Member/UpdateMemberController.cs
View File

@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Api.Management.Factories;
using Umbraco.Cms.Api.Management.ViewModels.Member;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
@@ -36,14 +35,8 @@ public class UpdateMemberController : MemberControllerBase
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
public async Task<IActionResult> Update(Guid id, UpdateMemberRequestModel updateRequestModel)
{
IMember? member = await _memberEditingService.GetAsync(id);
if (member == null)
{
return MemberNotFound();
}
MemberUpdateModel model = _memberEditingPresentationFactory.MapUpdateModel(updateRequestModel);
Attempt<MemberUpdateResult, MemberEditingStatus> result = await _memberEditingService.UpdateAsync(member, model, CurrentUser(_backOfficeSecurityAccessor));
Attempt<MemberUpdateResult, MemberEditingStatus> result = await _memberEditingService.UpdateAsync(id, model, CurrentUser(_backOfficeSecurityAccessor));
return result.Success
? Ok()

9
src/Umbraco.Cms.Api.Management/Controllers/Member/ValidateUpdateMemberController.cs
View File

@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Api.Management.Factories;
using Umbraco.Cms.Api.Management.ViewModels.Member;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Services.OperationStatus;
@@ -32,14 +31,8 @@ public class ValidateUpdateMemberController : MemberControllerBase
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
public async Task<IActionResult> Validate(Guid id, UpdateMemberRequestModel requestModel)
{
IMember? member = await _memberEditingService.GetAsync(id);
if (member is null)
{
return MemberNotFound();
}
MemberUpdateModel model = _memberEditingPresentationFactory.MapUpdateModel(requestModel);
Attempt<ContentValidationResult, ContentEditingOperationStatus> result = await _memberEditingService.ValidateUpdateAsync(member, model);
Attempt<ContentValidationResult, ContentEditingOperationStatus> result = await _memberEditingService.ValidateUpdateAsync(id, model);
return result.Success
? Ok()

2
src/Umbraco.Core/Models/ContentEditing/ContentUpdateResultBase.cs
View File

@@ -3,7 +3,7 @@
public abstract class ContentUpdateResultBase<TContent>
where TContent : class, IContentBase
{
public TContent Content { get; init; } = null!;
public TContent? Content { get; init; }
public ContentValidationResult ValidationResult { get; init; } = new();
}

18
src/Umbraco.Core/Services/ContentEditingService.cs
View File

@@ -1,7 +1,6 @@
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.ContentEditing.Validation;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Services.OperationStatus;
@@ -37,8 +36,13 @@ internal sealed class ContentEditingService
return await Task.FromResult(content);
}
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(IContent content, ContentUpdateModel updateModel)
=> await ValidatePropertiesAsync(updateModel, content.ContentType.Key);
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(Guid key, ContentUpdateModel updateModel)
{
IContent? content = ContentService.GetById(key);
return content is not null
? await ValidatePropertiesAsync(updateModel, content.ContentType.Key)
: Attempt.FailWithStatus(ContentEditingOperationStatus.NotFound, new ContentValidationResult());
}
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateCreateAsync(ContentCreateModel createModel)
=> await ValidatePropertiesAsync(createModel, createModel.ContentTypeKey);
@@ -69,8 +73,14 @@ internal sealed class ContentEditingService
: Attempt.FailWithStatus(saveStatus, new ContentCreateResult { Content = content });
}
public async Task<Attempt<ContentUpdateResult, ContentEditingOperationStatus>> UpdateAsync(IContent content, ContentUpdateModel updateModel, Guid userKey)
public async Task<Attempt<ContentUpdateResult, ContentEditingOperationStatus>> UpdateAsync(Guid key, ContentUpdateModel updateModel, Guid userKey)
{
IContent? content = ContentService.GetById(key);
if (content is null)
{
return Attempt.FailWithStatus(ContentEditingOperationStatus.NotFound, new ContentUpdateResult());
}
Attempt<ContentUpdateResult, ContentEditingOperationStatus> result = await MapUpdate<ContentUpdateResult>(content, updateModel);
if (result.Success == false)
{

4
src/Umbraco.Core/Services/IContentEditingService.cs
View File

@@ -11,11 +11,11 @@ public interface IContentEditingService
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateCreateAsync(ContentCreateModel createModel);
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(IContent content, ContentUpdateModel updateModel);
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(Guid key, ContentUpdateModel updateModel);
Task<Attempt<ContentCreateResult, ContentEditingOperationStatus>> CreateAsync(ContentCreateModel createModel, Guid userKey);
Task<Attempt<ContentUpdateResult, ContentEditingOperationStatus>> UpdateAsync(IContent content, ContentUpdateModel updateModel, Guid userKey);
Task<Attempt<ContentUpdateResult, ContentEditingOperationStatus>> UpdateAsync(Guid key, ContentUpdateModel updateModel, Guid userKey);
Task<Attempt<IContent?, ContentEditingOperationStatus>> MoveToRecycleBinAsync(Guid key, Guid userKey);

4
src/Umbraco.Core/Services/IMediaEditingService.cs
View File

@@ -11,11 +11,11 @@ public interface IMediaEditingService
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateCreateAsync(MediaCreateModel createModel);
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(IMedia media, MediaUpdateModel updateModel);
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(Guid key, MediaUpdateModel updateModel);
Task<Attempt<MediaCreateResult, ContentEditingOperationStatus>> CreateAsync(MediaCreateModel createModel, Guid userKey);
Task<Attempt<MediaUpdateResult, ContentEditingOperationStatus>> UpdateAsync(IMedia media, MediaUpdateModel updateModel, Guid userKey);
Task<Attempt<MediaUpdateResult, ContentEditingOperationStatus>> UpdateAsync(Guid key, MediaUpdateModel updateModel, Guid userKey);
Task<Attempt<IMedia?, ContentEditingOperationStatus>> MoveToRecycleBinAsync(Guid key, Guid userKey);

4
src/Umbraco.Core/Services/IMemberEditingService.cs
View File

@@ -11,11 +11,11 @@ public interface IMemberEditingService
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateCreateAsync(MemberCreateModel createModel);
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(IMember member, MemberUpdateModel updateModel);
Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(Guid key, MemberUpdateModel updateModel);
Task<Attempt<MemberCreateResult, MemberEditingStatus>> CreateAsync(MemberCreateModel createModel, IUser user);
Task<Attempt<MemberUpdateResult, MemberEditingStatus>> UpdateAsync(IMember member, MemberUpdateModel updateModel, IUser user);
Task<Attempt<MemberUpdateResult, MemberEditingStatus>> UpdateAsync(Guid key, MemberUpdateModel updateModel, IUser user);
Task<Attempt<IMember?, MemberEditingStatus>> DeleteAsync(Guid key, Guid userKey);
}

18
src/Umbraco.Core/Services/MediaEditingService.cs
View File

@@ -1,7 +1,6 @@
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.ContentEditing.Validation;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Services.OperationStatus;
@@ -32,8 +31,13 @@ internal sealed class MediaEditingService
return await Task.FromResult(media);
}
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(IMedia media, MediaUpdateModel updateModel)
=> await ValidatePropertiesAsync(updateModel, media.ContentType.Key);
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(Guid key, MediaUpdateModel updateModel)
{
IMedia? media = ContentService.GetById(key);
return media is not null
? await ValidatePropertiesAsync(updateModel, media.ContentType.Key)
: Attempt.FailWithStatus(ContentEditingOperationStatus.NotFound, new ContentValidationResult());
}
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateCreateAsync(MediaCreateModel createModel)
=> await ValidatePropertiesAsync(createModel, createModel.ContentTypeKey);
@@ -60,8 +64,14 @@ internal sealed class MediaEditingService
: Attempt.FailWithStatus(operationStatus, new MediaCreateResult { Content = media });
}
public async Task<Attempt<MediaUpdateResult, ContentEditingOperationStatus>> UpdateAsync(IMedia media, MediaUpdateModel updateModel, Guid userKey)
public async Task<Attempt<MediaUpdateResult, ContentEditingOperationStatus>> UpdateAsync(Guid key, MediaUpdateModel updateModel, Guid userKey)
{
IMedia? media = ContentService.GetById(key);
if (media is null)
{
return Attempt.FailWithStatus(ContentEditingOperationStatus.NotFound, new MediaUpdateResult());
}
Attempt<MediaUpdateResult, ContentEditingOperationStatus> result = await MapUpdate<MediaUpdateResult>(media, updateModel);
if (result.Success == false)
{

18
src/Umbraco.Infrastructure/Services/MemberEditingService.cs
View File

@@ -43,8 +43,13 @@ internal sealed class MemberEditingService : IMemberEditingService
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateCreateAsync(MemberCreateModel createModel)
=> await _memberContentEditingService.ValidateAsync(createModel, createModel.ContentTypeKey);
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(IMember member, MemberUpdateModel updateModel)
=> await _memberContentEditingService.ValidateAsync(updateModel, member.ContentType.Key);
public async Task<Attempt<ContentValidationResult, ContentEditingOperationStatus>> ValidateUpdateAsync(Guid key, MemberUpdateModel updateModel)
{
IMember? member = _memberService.GetById(key);
return member is not null
? await _memberContentEditingService.ValidateAsync(updateModel, member.ContentType.Key)
: Attempt.FailWithStatus(ContentEditingOperationStatus.NotFound, new ContentValidationResult());
}
public async Task<Attempt<MemberCreateResult, MemberEditingStatus>> CreateAsync(MemberCreateModel createModel, IUser user)
{
@@ -98,10 +103,17 @@ internal sealed class MemberEditingService : IMemberEditingService
: Attempt.FailWithStatus(status, new MemberCreateResult { Content = member });
}
public async Task<Attempt<MemberUpdateResult, MemberEditingStatus>> UpdateAsync(IMember member, MemberUpdateModel updateModel, IUser user)
public async Task<Attempt<MemberUpdateResult, MemberEditingStatus>> UpdateAsync(Guid key, MemberUpdateModel updateModel, IUser user)
{
var status = new MemberEditingStatus();
IMember? member = _memberService.GetByKey(key);
if (member is null)
{
status.ContentEditingOperationStatus = ContentEditingOperationStatus.NotFound;
return Attempt.FailWithStatus(new MemberEditingStatus(), new MemberUpdateResult());
}
MemberIdentityUser? identityMember = await _memberManager.FindByIdAsync(member.Id.ToString());
if (identityMember is null)
{

2
tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentEditingServiceTests.cs
View File

@@ -86,7 +86,7 @@ public class ContentEditingServiceTests : UmbracoIntegrationTestWithContent
}
};
await ContentTypeEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
await ContentTypeEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
var updatedContent = ContentService.GetById(documentKey)!;

16
tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Update.cs
View File

@@ -25,7 +25,7 @@ public partial class ContentEditingServiceTests
}
};
var result = await ContentEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
Assert.IsTrue(result.Success);
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
VerifyUpdate(result.Result.Content);
@@ -76,7 +76,7 @@ public partial class ContentEditingServiceTests
}
};
var result = await ContentEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
Assert.IsTrue(result.Success);
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
VerifyUpdate(result.Result.Content);
@@ -112,7 +112,7 @@ public partial class ContentEditingServiceTests
TemplateKey = templateTwo.Key
};
var result = await ContentEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
VerifyUpdate(result.Result.Content);
// re-get and re-test
@@ -141,7 +141,7 @@ public partial class ContentEditingServiceTests
TemplateKey = null
};
var result = await ContentEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
VerifyUpdate(result.Result.Content);
// re-get and re-test
@@ -169,7 +169,7 @@ public partial class ContentEditingServiceTests
}
};
var result = await ContentEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
Assert.IsTrue(result.Success);
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
VerifyUpdate(result.Result.Content);
@@ -209,7 +209,7 @@ public partial class ContentEditingServiceTests
}
};
var result = await ContentEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
// success is expected regardless of property level validation - the validation error status is communicated in the attempt status (see below)
Assert.IsTrue(result.Success);
@@ -254,7 +254,7 @@ public partial class ContentEditingServiceTests
}
};
var result = await ContentEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
Assert.IsFalse(result.Success);
Assert.AreEqual(ContentEditingOperationStatus.ContentTypeCultureVarianceMismatch, result.Status);
@@ -281,7 +281,7 @@ public partial class ContentEditingServiceTests
}
};
var result = await ContentEditingService.UpdateAsync(content, updateModel, Constants.Security.SuperUserKey);
var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
Assert.IsFalse(result.Success);
Assert.AreEqual(ContentEditingOperationStatus.PropertyTypeNotFound, result.Status);
Assert.IsNotNull(result.Result.Content);

8
tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberEditingServiceTests.cs
View File

@@ -81,7 +81,7 @@ public class MemberEditingServiceTests : UmbracoIntegrationTest
}
};
var result = await MemberEditingService.UpdateAsync(member, updateModel, SuperUser());
var result = await MemberEditingService.UpdateAsync(member.Key, updateModel, SuperUser());
Assert.IsTrue(result.Success);
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status.ContentEditingOperationStatus);
Assert.AreEqual(MemberEditingOperationStatus.Success, result.Status.MemberEditingOperationStatus);
@@ -112,7 +112,7 @@ public class MemberEditingServiceTests : UmbracoIntegrationTest
NewPassword = "NewSuperSecret123"
};
var result = await MemberEditingService.UpdateAsync(member, updateModel, SuperUser());
var result = await MemberEditingService.UpdateAsync(member.Key, updateModel, SuperUser());
Assert.IsTrue(result.Success);
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status.ContentEditingOperationStatus);
Assert.AreEqual(MemberEditingOperationStatus.Success, result.Status.MemberEditingOperationStatus);
@@ -139,7 +139,7 @@ public class MemberEditingServiceTests : UmbracoIntegrationTest
Roles = new [] { "RoleTwo", "RoleThree" }
};
var result = await MemberEditingService.UpdateAsync(member, updateModel, SuperUser());
var result = await MemberEditingService.UpdateAsync(member.Key, updateModel, SuperUser());
Assert.IsTrue(result.Success);
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status.ContentEditingOperationStatus);
Assert.AreEqual(MemberEditingOperationStatus.Success, result.Status.MemberEditingOperationStatus);
@@ -243,7 +243,7 @@ public class MemberEditingServiceTests : UmbracoIntegrationTest
}
};
var result = await MemberEditingService.UpdateAsync(member, updateModel, SuperUser());
var result = await MemberEditingService.UpdateAsync(member.Key, updateModel, SuperUser());
// success is expected regardless of property level validation - the validation error status is communicated in the attempt status (see below)
Assert.IsTrue(result.Success);