Content Controller - get content types

Author: acoumb

src/Umbraco.Cms.Integrations.Automation.Zapier/Controllers/ContentController.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 using System.Linq;
 
@@ -24,14 +25,14 @@ public class ContentController : UmbracoApiController
     {
         private readonly ZapierSettings Options;
 
-        private IContentService _contentService;
+        private IContentTypeService _contentTypeService;
 
         private readonly IUserValidationService _userValidationService;
 
 #if NETCOREAPP
-        public ContentController(IOptions<ZapierSettings> options, IContentService contentService, IUserValidationService userValidationService)
+        public ContentController(IOptions<ZapierSettings> options, IContentTypeService contentTypeService, IUserValidationService userValidationService)
 #else
-        public ContentController(IContentService contentService, IUserValidationService userValidationService)
+        public ContentController(IContentTypeService contentTypeService, IUserValidationService userValidationService)
 #endif
         {
 #if NETCOREAPP
@@ -40,44 +41,45 @@ public ContentController(IContentService contentService, IUserValidationService
             Options = new ZapierSettings(ConfigurationManager.AppSettings);
 #endif
 
-            _contentService = contentService;
+            _contentTypeService = contentTypeService;
 
             _userValidationService = userValidationService;
         }
 
-        public List<ContentTypeDto> Get()
+        public IEnumerable<ContentTypeDto> GetContentTypes()
         {
-//            string username = string.Empty;
-//            string password = string.Empty;
-
-//#if NETCOREAPP
-//            if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.UsernameHeaderKey,
-//                    out var usernameValues))
-//                username = usernameValues.First();
-//            if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.PasswordHeaderKey,
-//                    out var passwordValues))
-//                password = passwordValues.First();
-//#else
-//            if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.UsernameHeaderKey,
-//                    out var usernameValues))
-//                username = usernameValues.First();
-//            if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.PasswordHeaderKey,
-//                    out var passwordValues))
-//                password = passwordValues.First();
-//#endif
-
-//            if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password)) return null;
-
-//            var isAuthorized = _userValidationService.Validate(username, password, Options.UserGroup).GetAwaiter().GetResult();
-//            if (!isAuthorized) return null;
-
-            var root = _contentService.GetRootContent().Where(p => p.Published)
-                .OrderByDescending(p => p.PublishDate).FirstOrDefault();
-
-            return new List<ContentTypeDto>
+            string username = string.Empty;
+            string password = string.Empty;
+
+#if NETCOREAPP
+            if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.UsernameHeaderKey,
+                    out var usernameValues))
+                username = usernameValues.First();
+            if (Request.Headers.TryGetValue(Constants.ZapierAppConfiguration.PasswordHeaderKey,
+                    out var passwordValues))
+                password = passwordValues.First();
+#else
+            if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.UsernameHeaderKey,
+                    out var usernameValues))
+                username = usernameValues.First();
+            if (Request.Headers.TryGetValues(Constants.ZapierAppConfiguration.PasswordHeaderKey,
+                    out var passwordValues))
+                password = passwordValues.First();
+#endif
+
+            if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password)) return Enumerable.Empty<ContentTypeDto>();
+
+            var isAuthorized = _userValidationService.Validate(username, password, Options.UserGroup).GetAwaiter().GetResult();
+            if (!isAuthorized) return Enumerable.Empty<ContentTypeDto>();
+
+            var contentTypes = _contentTypeService.GetAll();
+
+            return contentTypes.Select(p => new ContentTypeDto
             {
-                new ContentTypeDto { Id = root.Id, Name = root.Name} 
-            };
+                Id = p.Id,
+                Alias = p.Alias,
+                Name = p.Name
+            });
         }
 
     }

src/Umbraco.Cms.Integrations.Automation.Zapier/Models/Dtos/ContentTypeDto.cs

@@ -7,6 +7,9 @@ public class ContentTypeDto
         [JsonProperty("id")]
         public int Id { get; set; }
 
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
         [JsonProperty("name")]
         public string Name { get; set; }
     }