Management API updates and client resources

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerConfiguration.cs

@@ -1,33 +1,12 @@
-//using Umbraco.Cms.Core.IO;
-//using Umbraco.Cms.Core.PropertyEditors;
-//using Umbraco.Cms.Core.Services;
-
-//namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
-//{
-//    [DataEditor(
-//        alias: Constants.PropertyEditorAlias,
-//        name: "ActiveCampaign Form Picker",
-//        view: "~/App_Plugins/UmbracoCms.Integrations/Crm/ActiveCampaign/views/formpicker.html",
-//        Group = Cms.Core.Constants.PropertyEditors.Groups.Pickers,
-//        Icon = "icon-activecampaign")]
-//    public class ActiveCampaignFormPickerPropertyEditor : DataEditor
-//    {
-//        private readonly IIOHelper _ioHelper;
-
-//        private readonly IEditorConfigurationParser _editorConfigurationParser;
-
-//        public ActiveCampaignFormPickerPropertyEditor(
-//            IDataValueEditorFactory dataValueEditorFactory,
-//            IIOHelper ioHelper,
-//            IEditorConfigurationParser editorConfigurationParser)
-//            : base(dataValueEditorFactory) 
-//        {
-//            _ioHelper = ioHelper;
-
-//            _editorConfigurationParser = editorConfigurationParser;
-//        }
-
-//        protected override IConfigurationEditor CreateConfigurationEditor() => 
-//            new ActiveCampaignFormPickerConfigurationEditor(_ioHelper, _editorConfigurationParser);
-//    }
-//}
+using Umbraco.Cms.Core.PropertyEditors;
+
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
+{
+    [DataEditor(alias: Constants.PropertyEditorAlias)]
+    public class ActiveCampaignFormPickerPropertyEditor : DataEditor
+    {
+        public ActiveCampaignFormPickerPropertyEditor(IDataValueEditorFactory dataValueEditorFactory) : base(dataValueEditorFactory)
+        {
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerConfigurationEditor.cs

@@ -1,21 +1,18 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Net;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using Umbraco.Cms.Api.Common.Attributes;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
-using Umbraco.Cms.Web.Common.Authorization;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos;
 using Umbraco.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Api.Management.Controllers
 {
     [ApiController]
     [BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}")]
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
+    //[Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
     [MapToApi(Constants.ManagementApi.ApiName)]
     public class ActiveCampaignControllerBase : Controller
     {
@@ -31,5 +28,32 @@ public ActiveCampaignControllerBase(IOptions<ActiveCampaignSettings> options, IH
 
             HttpClientFactory = httpClientFactory;
         }
+
+        protected async Task<IActionResult> HandleResponseAsync(HttpResponseMessage? httpResponse)
+        {
+            if (httpResponse is null)
+            {
+                return new EmptyResult();
+            }
+
+            var content = await httpResponse.Content.ReadAsStringAsync();
+
+            if (httpResponse.IsSuccessStatusCode)
+            {
+                return Ok(new JsonResult(JsonSerializer.Deserialize<FormCollectionResponseDto>(content)));
+            }
+
+            var responseMessage = content.Contains("message") 
+                ? JsonNode.Parse(content)!["message"]!.ToString() 
+                : content;
+
+            var message = httpResponse.StatusCode == HttpStatusCode.Forbidden
+                ? Constants.Resources.AuthorizationFailed
+                : string.IsNullOrEmpty(content)
+                    ? Constants.Resources.ApiAccessFailed
+                    : responseMessage;
+
+            return StatusCode((int)httpResponse.StatusCode, message);
+        }
     }
 }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerPropertyEditor.cs

@@ -2,11 +2,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos;
 
@@ -21,7 +16,7 @@ public CheckApiAccessController(IOptions<ActiveCampaignSettings> options, IHttpC
         }
 
         [HttpGet("api-access")]
-        [ProducesResponseType(typeof(JsonResult), StatusCodes.Status200OK)]
-        public IActionResult CheckApiAccess() => new JsonResult(new ApiAccessDto(Settings.BaseUrl, Settings.ApiKey));
+        [ProducesResponseType(typeof(ApiAccessDto), StatusCodes.Status200OK)]
+        public IActionResult CheckApiAccess() => Ok(new ApiAccessDto(Settings.BaseUrl, Settings.ApiKey));
     }
 }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/ActiveCampaignControllerBase.cs

@@ -0,0 +1,36 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos;
+
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Api.Management.Controllers
+{
+    [ApiVersion("1.0")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
+    public class GetFormByIdController : ActiveCampaignControllerBase
+    {
+        public GetFormByIdController(IOptions<ActiveCampaignSettings> options, IHttpClientFactory httpClientFactory) : base(options, httpClientFactory)
+        {
+        }
+
+        [HttpGet("forms/{id}")]
+        [ProducesResponseType(typeof(FormResponseDto), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetForm(string id)
+        {
+            var client = HttpClientFactory.CreateClient(Constants.FormsHttpClient);
+
+            var response = await client.SendAsync(
+                new HttpRequestMessage
+                {
+                    Method = HttpMethod.Get,
+                    RequestUri = new Uri($"{client.BaseAddress}{ApiPath}/{id}")
+                });
+
+            return await HandleResponseAsync(response);
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/CheckApiAccessController.cs

@@ -2,14 +2,8 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos;
 
@@ -23,9 +17,9 @@ public GetFormsByPageController(IOptions<ActiveCampaignSettings> options, IHttpC
         {
         }
 
-        [HttpGet("forms/{page:int}")]
-        [ProducesResponseType(typeof(Task<IActionResult>), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetForms(int page = 1)
+        [HttpGet("forms")]
+        [ProducesResponseType(typeof(FormCollectionResponseDto), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetForms([FromQuery]int page = 1)
         {
             var client = HttpClientFactory.CreateClient(Constants.FormsHttpClient);
 
@@ -41,22 +35,7 @@ public async Task<IActionResult> GetForms(int page = 1)
 
             var response = await client.SendAsync(requestMessage);
 
-            var content = await response.Content.ReadAsStringAsync();
-
-            if (!response.IsSuccessStatusCode)
-            {
-                var result = new JsonResult(new FormCollectionResponseDto
-                {
-                    Message = string.IsNullOrEmpty(content)
-                        ? response.StatusCode == System.Net.HttpStatusCode.Forbidden
-                            ? Constants.Resources.AuthorizationFailed : Constants.Resources.ApiAccessFailed
-                        : JsonNode.Parse(content)["message"].ToString()
-                });
-
-                return Ok(result);
-            }
-                
-            return Ok(new JsonResult(JsonSerializer.Deserialize<FormCollectionResponseDto>(content)));
+            return await HandleResponseAsync(response);
         }
     }
 }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/GetFormByIdController.cs

@@ -3,8 +3,8 @@ namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration
 {
     public class ActiveCampaignSettings
     {
-        public string BaseUrl { get; set; }
+        public string BaseUrl { get; set; } = string.Empty;
 
-        public string ApiKey { get; set; }
+        public string ApiKey { get; set; } = string.Empty;
     }
 }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/GetFormsByIdController.cs

@@ -3,7 +3,7 @@ namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
 {
     public class Constants
     {
-        public const string PropertyEditorAlias = "Umbraco.Cms.Integrations.Crm.ActiveCampaign.FormPicker";
+        public const string PropertyEditorAlias = "ActiveCampaign.FormPicker";
 
         public const string SettingsPath = "Umbraco:Cms:Integrations:Crm:ActiveCampaign:Settings";
 
@@ -20,13 +20,13 @@ public class Resources
 
         public static class ManagementApi
         {
-            public const string RootPath = "active-campaign/management/api";
+            public const string RootPath = "active-campaign-forms/management/api";
 
-            public const string ApiTitle = "Active Campaign Management API";
+            public const string ApiTitle = "ActiveCampaign Forms Management API";
 
             public const string ApiName = "active-campaign-management";
 
-            public const string GroupName = "Active Campaign";
+            public const string GroupName = "Active Campaign Forms";
         }
     }
 }