Publishing in the Management API

src/Umbraco.Cms.Api.Management/Content/ContentControllerBase.cs

@@ -16,7 +16,7 @@
                 .WithDetail("A notification handler prevented the content operation.")
                 .Build()),
             ContentEditingOperationStatus.ContentTypeNotFound => NotFound(new ProblemDetailsBuilder()
-                .WithTitle("Cancelled by notification")
+                .WithTitle("The requested content could not be found")
                 .Build()),
             ContentEditingOperationStatus.ContentTypeCultureVarianceMismatch => BadRequest(new ProblemDetailsBuilder()
                 .WithTitle("Content type culture variance mismatch")
@@ -66,6 +66,67 @@
                 .Build()),
         };
 
+    protected IActionResult ContentPublishingOperationStatusResult(ContentPublishingOperationStatus status) =>
+        status switch
+        {
+            ContentPublishingOperationStatus.ContentNotFound => NotFound(new ProblemDetailsBuilder()
+                .WithTitle("The requested content could not be found")
+                .Build()),
+            ContentPublishingOperationStatus.CancelledByEvent => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Publish cancelled by event")
+                .WithDetail("The publish operation was cancelled by an event.")
+                .Build()),
+            ContentPublishingOperationStatus.ContentInvalid => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Invalid content")
+                .WithDetail("The specified content had an invalid configuration.")
+                .Build()),
+            ContentPublishingOperationStatus.NothingToPublish => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Nothing to publish")
+                .WithDetail("None of the specified cultures needed publishing.")
+                .Build()),
+            ContentPublishingOperationStatus.MandatoryCultureMissing => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Mandatory culture missing")
+                .WithDetail("Must include all mandatory cultures when publishing.")
+                .Build()),
+            ContentPublishingOperationStatus.HasExpired => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Content expired")
+                .WithDetail("Could not publish the content because it was expired.")
+                .Build()),
+            ContentPublishingOperationStatus.CultureHasExpired => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Content culture expired")
+                .WithDetail("Could not publish the content because some of the specified cultures were expired.")
+                .Build()),
+            ContentPublishingOperationStatus.AwaitingRelease => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Content awaiting release")
+                .WithDetail("Could not publish the content because it was awaiting release.")
+                .Build()),
+            ContentPublishingOperationStatus.CultureAwaitingRelease => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Content culture awaiting release")
+                .WithDetail("Could not publish the content because some of the specified cultures were awaiting release.")
+                .Build()),
+            ContentPublishingOperationStatus.InTrash => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Content in the recycle bin")
+                .WithDetail("Could not publish the content because it was in the recycle bin.")
+                .Build()),
+            ContentPublishingOperationStatus.PathNotPublished => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Parent not published")
+                .WithDetail("Could not publish the content because its parent was not published.")
+                .Build()),
+            ContentPublishingOperationStatus.ConcurrencyViolation => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Concurrency violation detected")
+                .WithDetail("An attempt was made to publish a version older than the latest version.")
+                .Build()),
+            ContentPublishingOperationStatus.UnsavedChanges => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Unsaved changes")
+                .WithDetail("Could not publish the content because it had unsaved changes. Make sure to save all changes before attempting a publish.")
+                .Build()),
+            ContentPublishingOperationStatus.Failed => BadRequest(new ProblemDetailsBuilder()
+                .WithTitle("Publish or unpublish failed")
+                .WithDetail("An unspecified error occurred while (un)publishing. Please check the logs for additional information.")
+                .Build()),
+            _ => StatusCode(StatusCodes.Status500InternalServerError, "Unknown content operation status."),
+        };
+
     protected IActionResult ContentCreatingOperationStatusResult(ContentCreatingOperationStatus status) =>
         status switch
         {

src/Umbraco.Cms.Api.Management/Controllers/Document/PublishDocumentController.cs

@@ -0,0 +1,38 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Api.Management.ViewModels.Document;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.OperationStatus;
+
+namespace Umbraco.Cms.Api.Management.Controllers.Document;
+
+public class PublishDocumentController : DocumentControllerBase
+{
+    private readonly IContentPublishingService _contentPublishingService;
+    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
+
+    public PublishDocumentController(IContentPublishingService contentPublishingService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
+    {
+        _contentPublishingService = contentPublishingService;
+        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
+    }
+
+    [HttpPut("{id:guid}/publish")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> Publish(Guid id, PublishDocumentRequestModel requestModel)
+    {
+        Attempt<ContentPublishingOperationStatus> attempt = await _contentPublishingService.PublishAsync(
+            id,
+            requestModel.Cultures,
+            CurrentUserKey(_backOfficeSecurityAccessor));
+        return attempt.Success
+            ? Ok()
+            : ContentPublishingOperationStatusResult(attempt.Result);
+    }
+}

src/Umbraco.Cms.Api.Management/Controllers/Document/PublishDocumentWithDescendantsController.cs

@@ -0,0 +1,43 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Api.Management.ViewModels.Document;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.OperationStatus;
+
+namespace Umbraco.Cms.Api.Management.Controllers.Document;
+
+public class PublishDocumentWithDescendantsController : DocumentControllerBase
+{
+    private readonly IContentPublishingService _contentPublishingService;
+    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
+
+    public PublishDocumentWithDescendantsController(IContentPublishingService contentPublishingService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
+    {
+        _contentPublishingService = contentPublishingService;
+        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
+    }
+
+    [HttpPut("{id:guid}/publish-with-descendants")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> PublishWithDescendants(Guid id, PublishDocumentWithDescendantsRequestModel requestModel)
+    {
+        Attempt<IDictionary<Guid, ContentPublishingOperationStatus>> attempt = await _contentPublishingService.PublishBranchAsync(
+            id,
+            requestModel.Cultures,
+            requestModel.IncludeUnpublishedDescendants,
+            CurrentUserKey(_backOfficeSecurityAccessor));
+
+        // FIXME: when we get to implement proper validation handling, this should return a collection of status codes by key (based on attempt.Result)
+        return attempt.Success
+            ? Ok()
+            : ContentPublishingOperationStatusResult(
+                attempt.Result?.Values.FirstOrDefault(r => r is not ContentPublishingOperationStatus.Success)
+                ?? throw new NotSupportedException("The attempt was not successful - at least one result value should be unsuccessful too"));
+    }
+}

src/Umbraco.Cms.Api.Management/Controllers/Document/UnpublishDocumentController.cs

@@ -0,0 +1,38 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Api.Management.ViewModels.Document;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.OperationStatus;
+
+namespace Umbraco.Cms.Api.Management.Controllers.Document;
+
+public class UnpublishDocumentController : DocumentControllerBase
+{
+    private readonly IContentPublishingService _contentPublishingService;
+    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
+
+    public UnpublishDocumentController(IContentPublishingService contentPublishingService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
+    {
+        _contentPublishingService = contentPublishingService;
+        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
+    }
+
+    [HttpPut("{id:guid}/unpublish")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> Unpublish(Guid id, UnpublishDocumentRequestModel requestModel)
+    {
+        Attempt<ContentPublishingOperationStatus> attempt = await _contentPublishingService.UnpublishAsync(
+            id,
+            requestModel.Culture,
+            CurrentUserKey(_backOfficeSecurityAccessor));
+        return attempt.Success
+            ? Ok()
+            : ContentPublishingOperationStatusResult(attempt.Result);
+    }
+}

src/Umbraco.Cms.Api.Management/ViewModels/Document/PublishDocumentRequestModel.cs

@@ -0,0 +1,6 @@
+namespace Umbraco.Cms.Api.Management.ViewModels.Document;
+
+public class PublishDocumentRequestModel
+{
+    public required IEnumerable<string> Cultures { get; set; }
+}

src/Umbraco.Cms.Api.Management/ViewModels/Document/PublishDocumentWithDescendantsRequestModel.cs

@@ -0,0 +1,6 @@
+namespace Umbraco.Cms.Api.Management.ViewModels.Document;
+
+public class PublishDocumentWithDescendantsRequestModel : PublishDocumentRequestModel
+{
+    public bool IncludeUnpublishedDescendants { get; set; }
+}

src/Umbraco.Cms.Api.Management/ViewModels/Document/UnpublishDocumentRequestModel.cs

@@ -0,0 +1,6 @@
+namespace Umbraco.Cms.Api.Management.ViewModels.Document;
+
+public class UnpublishDocumentRequestModel
+{
+    public string? Culture { get; set; }
+}

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs

@@ -303,6 +303,7 @@
             Services.AddUnique<ITagService, TagService>();
             Services.AddUnique<IContentService, ContentService>();
             Services.AddUnique<IContentEditingService, ContentEditingService>();
+            Services.AddUnique<IContentPublishingService, ContentPublishingService>();
             Services.AddUnique<IContentCreatingService, ContentCreatingService>();
             Services.AddUnique<IContentVersionCleanupPolicy, DefaultContentVersionCleanupPolicy>();
             Services.AddUnique<IMemberService, MemberService>();

src/Umbraco.Core/Services/ContentEditingServiceBase.cs

@@ -18,7 +18,6 @@ internal abstract class ContentEditingServiceBase<TContent, TContentType, TConte
     private readonly PropertyEditorCollection _propertyEditorCollection;
     private readonly IDataTypeService _dataTypeService;
     private readonly ILogger<ContentEditingServiceBase<TContent, TContentType, TContentService, TContentTypeService>> _logger;
-    private readonly ICoreScopeProvider _scopeProvider;
     private readonly ITreeEntitySortingService _treeEntitySortingService;
     private readonly IUserIdKeyResolver _userIdKeyResolver;
 
@@ -35,9 +34,9 @@ protected ContentEditingServiceBase(
         _propertyEditorCollection = propertyEditorCollection;
         _dataTypeService = dataTypeService;
         _logger = logger;
-        _scopeProvider = scopeProvider;
         _userIdKeyResolver = userIdKeyResolver;
         _treeEntitySortingService = treeEntitySortingService;
+        CoreScopeProvider = scopeProvider;
         ContentService = contentService;
         ContentTypeService = contentTypeService;
     }
@@ -56,6 +55,8 @@ protected ContentEditingServiceBase(
 
     protected abstract ContentEditingOperationStatus Sort(IEnumerable<TContent> items, int userId);
 
+    protected ICoreScopeProvider CoreScopeProvider { get; }
+
     protected TContentService ContentService { get; }
 
     protected TContentTypeService ContentTypeService { get; }
@@ -110,7 +111,7 @@ protected async Task<Attempt<ContentEditingOperationStatus>> MapUpdate(TContent
     // helper method to perform move-to-recycle-bin and delete for content as they are very much handled in the same way
     private async Task<Attempt<TContent?, ContentEditingOperationStatus>> HandleDeletionAsync(Guid key, Guid userKey, bool mustBeTrashed, Func<TContent, int, OperationResult?> performDelete)
     {
-        using ICoreScope scope = _scopeProvider.CreateCoreScope();
+        using ICoreScope scope = CoreScopeProvider.CreateCoreScope();
         TContent? content = ContentService.GetById(key);
         if (content == null)
         {
@@ -135,7 +136,7 @@ protected async Task<Attempt<ContentEditingOperationStatus>> MapUpdate(TContent
 
     protected async Task<Attempt<TContent?, ContentEditingOperationStatus>> HandleMoveAsync(Guid key, Guid? parentKey, Guid userKey)
     {
-        using ICoreScope scope = _scopeProvider.CreateCoreScope();
+        using ICoreScope scope = CoreScopeProvider.CreateCoreScope();
         TContent? content = ContentService.GetById(key);
         if (content is null)
         {
@@ -172,7 +173,7 @@ protected async Task<Attempt<ContentEditingOperationStatus>> MapUpdate(TContent
 
     protected async Task<Attempt<TContent?, ContentEditingOperationStatus>> HandleCopyAsync(Guid key, Guid? parentKey, bool relateToOriginal, bool includeDescendants, Guid userKey)
     {
-        using ICoreScope scope = _scopeProvider.CreateCoreScope();
+        using ICoreScope scope = CoreScopeProvider.CreateCoreScope();
         TContent? content = ContentService.GetById(key);
         if (content is null)
         {