Updates to media with crops, rendering component, authorization service and bug fixing

Author: acoumb

src/Umbraco.Cms.Integrations.DAM.Aprimo/App_Plugins/UmbracoCms.Integrations/DAM/Aprimo/Render/AprimoAsset.cshtml

@@ -1,5 +1,6 @@
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Integrations.DAM.Aprimo.Models.ViewModels.AprimoAssetViewModel>
 
+<!-- Thumbnail -->
 <div class="aprimo-asset-row">
     @if (!string.IsNullOrEmpty(Model.Thumbnail))
     {
@@ -9,22 +10,36 @@
         <h3>@Model.Title</h3>
     </div>
 </div>
-@if (Model.Crops.Any())
+<!-- Crops -->
+@if (Model.MediaWithCrops != null)
 {
     <div class="aprimo-asset-row">
-        <h3>Crop Items</h3>
-        <div class="aprimo-crops-row">
-            @foreach (var cropItem in Model.Crops)
+        <h3>Cropped images</h3>
+        @if (Model.MediaWithCrops.Original != null)
+        {
+            <div class="column">
+                <h3>@Model.MediaWithCrops.Original.Name</h3>
+                @if (!string.IsNullOrEmpty(Model.MediaWithCrops.Original.Url))
+                {
+                    <img src="@Model.MediaWithCrops.Original.Url" class="thumbnail" alt="@Model.MediaWithCrops.Original.Name" />
+                }
+            </div>
+        }
+        @if (Model.MediaWithCrops.Crops.Any())
+        {
+            @foreach (var cropItem in Model.MediaWithCrops.Crops)
             {
                 <div class="column">
-                    @if (!string.IsNullOrEmpty(cropItem.PublicLink))
+                    @if (!string.IsNullOrEmpty(cropItem.Url))
                     {
-                        <img src="@cropItem.PublicLink" class="thumbnail" alt="@cropItem.Label" />
+                        <img src="@cropItem.Url" class="thumbnail" alt="@cropItem.Name" />
                     }
-                    <p><b>Label:</b> @cropItem.Label</p>
-                    <p><b>Size:</b> @cropItem.ResizeWidth x @cropItem.ResizeHeight</p>
+                    <h3>@cropItem.Name</h3>
+                    <p>
+                        @cropItem.Extension - @($"{cropItem.ResizeWidth} x {cropItem.ResizeHeight} px")
+                    </p>
                 </div>
             }
-        </div>
+        }
     </div>
 }

src/Umbraco.Cms.Integrations.DAM.Aprimo/Controllers/AprimoAuthorizationController.cs

@@ -29,7 +29,7 @@ public async Task<IActionResult> OAuth(string code)
                 };
             } 
 
-            var response = await _aprimoAuthorizationService.GetAccessToken(code);
+            var response = await _aprimoAuthorizationService.GetAccessTokenAsync(code);
 
             return new ContentResult
             {

src/Umbraco.Cms.Integrations.DAM.Aprimo/Controllers/AssetsController.cs

@@ -57,7 +57,7 @@ public async Task<IActionResult> CheckApiConfiguration()
             var result = await _assetsService.GetRecordByIdAsync(Guid.NewGuid());
             if (!result.IsAuthorized)
             {
-                await _authorizationService.RefreshAccessToken();
+                await _authorizationService.RefreshAccessTokenAsync();
 
                 var updatedResult = await _assetsService.GetRecordByIdAsync(Guid.NewGuid());
 
@@ -105,7 +105,7 @@ public string GetContentSelectorUrl()
 
         [HttpPost]
         public async Task<string> GetAccessToken([FromBody] OAuthRequest request) =>
-            await _authorizationService.GetAccessToken(request.Code);
+            await _authorizationService.GetAccessTokenAsync(request.Code);
 
         [HttpGet]
         public async Task<IActionResult> GetRecordDetails(string id)

src/Umbraco.Cms.Integrations.DAM.Aprimo/Editors/AssetPickerValueConverter.cs

@@ -53,8 +53,7 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
             var response = _assetsService.GetRecordById(Guid.Parse(vm.Id));
             if(!response.IsAuthorized)
             {
-                var tokenResponse = _authorizationService.RefreshAccessToken()
-                    .ConfigureAwait(false).GetAwaiter().GetResult();
+                var tokenResponse = _authorizationService.RefreshAccessToken();
                 if (string.IsNullOrEmpty(tokenResponse))
                 {
                     response = _assetsService.GetRecordById(Guid.Parse(vm.Id));
@@ -81,12 +80,19 @@ private void ToViewModel(Record record, ref AprimoAssetViewModel vm)
             vm.Thumbnail = record.Thumbnail.Uri;
 
             if(record.MasterFileLatestVersion != null 
-                && record.MasterFileLatestVersion.AdditionalFiles!= null
-                && record.MasterFileLatestVersion.AdditionalFiles.Items != null)
+                && record.MasterFileLatestVersion.Renditions!= null
+                && record.MasterFileLatestVersion.Renditions.Items != null)
             {
-                vm.Crops = record.MasterFileLatestVersion.AdditionalFiles.Items
+                var originalItem = record.MasterFileLatestVersion.Renditions.Items
+                    .FirstOrDefault(p => p.Type == "Original");
+                if(originalItem != null)
+                {
+                    vm.MediaWithCrops.Original = originalItem.ToAprimoMediaItemViewModel();
+                }
+
+                vm.MediaWithCrops.Crops = record.MasterFileLatestVersion.Renditions.Items
                     .Where(p => p.Type == "Crop")
-                    .Select(p => p.ToAprimoCropItemViewModel());
+                    .Select(p => p.ToAprimoMediaItemViewModel());
             }
 
             if(record.Fields != null 

src/Umbraco.Cms.Integrations.DAM.Aprimo/Helpers/RecordHelper.cs

@@ -5,10 +5,17 @@ namespace Umbraco.Cms.Integrations.DAM.Aprimo.Helpers
 {
     public static class RecordHelper
     {
-        public static AprimoCropViewModel ToAprimoCropItemViewModel(this RecordFileItem item) => new(item.X, item.Y,
-               item.Width, item.Height,
-               item.ResizeWidth, item.ResizeHeight,
-               item.PresetName, item.Label, item.FileName,
-               item.PublicLink);
+        public static AprimoMediaItemViewModel ToAprimoMediaItemViewModel(this RecordRenditionItem item)
+        {
+            string url = string.Empty;
+
+            if (item.PublicLinks != null && item.PublicLinks.Items != null && item.PublicLinks.Items.Any())
+                url = item.PublicLinks.Items.First().Uri;
+
+            return new(item.ResizeWidth, item.ResizeHeight,
+               item.Name, item.PresetName,
+               item.Label, item.FileName,
+               item.Extension, url);
+        }
     }
 }

src/Umbraco.Cms.Integrations.DAM.Aprimo/Models/Record.cs

@@ -40,17 +40,17 @@ public class RecordThumbnail
 
     public class RecordMasterFile
     {
-        [JsonPropertyName("additionalFiles")]
-        public RecordAdditionalFiles AdditionalFiles { get; set; }
+        [JsonPropertyName("renditions")]
+        public RecordRenditions Renditions { get; set; }
     }
 
-    public class RecordAdditionalFiles
+    public class RecordRenditions
     {
         [JsonPropertyName("items")]
-        public IEnumerable<RecordFileItem> Items { get; set; }
+        public IEnumerable<RecordRenditionItem> Items { get; set; }
     }
 
-    public class RecordFileItem
+    public class RecordRenditionItem
     {
         [JsonPropertyName("x")]
         public int X { get; set; }
@@ -70,6 +70,9 @@ public class RecordFileItem
         [JsonPropertyName("resizeHeight")]
         public int ResizeHeight { get; set; }
 
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
         [JsonPropertyName("presetName")]
         public string PresetName { get; set; }
 
@@ -82,8 +85,11 @@ public class RecordFileItem
         [JsonPropertyName("type")]
         public string Type { get; set; }
 
-        [JsonPropertyName("publicLink")]
-        public string PublicLink { get; set; }
+        [JsonPropertyName("extension")]
+        public string Extension { get; set; }
+
+        [JsonPropertyName("publicLinks")]
+        public RenditionPublicLinks PublicLinks { get; set; } = new RenditionPublicLinks();
     }
 
     public class RecordFields
@@ -113,4 +119,21 @@ public class RecordFieldItemValue
         public string[] Values { get; set; }
     }
 
+    public class RenditionPublicLinks
+    {
+        public RenditionPublicLinks()
+        {
+            Items = Enumerable.Empty<PublicLinkItem>();
+        }
+
+        [JsonPropertyName("items")]
+        public IEnumerable<PublicLinkItem> Items { get; set; }
+    }
+
+    public class PublicLinkItem
+    {
+        [JsonPropertyName("uri")]
+        public string Uri { get; set; }
+    }
+
 }

src/Umbraco.Cms.Integrations.DAM.Aprimo/Models/ViewModels/AprimoAssetViewModel.cs

@@ -9,13 +9,13 @@ public class AprimoAssetViewModel
 
         public string Thumbnail { get; set; } = string.Empty;
 
-        public IEnumerable<AprimoCropViewModel> Crops { get; set; }
+        public AprimoMediaWithCropsViewModel MediaWithCrops { get; set; }
 
         public List<AprimoFieldViewModel> Fields { get; set; }
 
         public AprimoAssetViewModel()
         {
-            Crops = Enumerable.Empty<AprimoCropViewModel>();
+            MediaWithCrops = new AprimoMediaWithCropsViewModel();
             Fields = new List<AprimoFieldViewModel>();
         }
     }

src/Umbraco.Cms.Integrations.DAM.Aprimo/Models/ViewModels/AprimoCropViewModel.cs

@@ -0,0 +1,59 @@
+
+namespace Umbraco.Cms.Integrations.DAM.Aprimo.Models.ViewModels
+{
+    public class AprimoMediaWithCropsViewModel
+    {
+        public AprimoMediaItemViewModel Original { get; set; }
+
+        public IEnumerable<AprimoMediaItemViewModel> Crops { get; set; }
+
+        /// <summary>
+        /// Get image URL by crop name
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>Crop URL</returns>
+        public string GetImageUrl(string name)
+        {
+            var crop = Crops.FirstOrDefault(p => p.Name == name);
+            if (crop != null)
+                return crop.Url;
+
+            return string.Empty;
+        }
+    }
+
+    public class AprimoMediaItemViewModel
+    {
+        public int ResizeWidth { get; set; }
+
+        public int ResizeHeight { get; set; }
+
+        public string Name { get; set; }
+
+        public string PresetName { get; set; }
+
+        public string Label { get; set; }
+
+        public string FileName { get; set; }
+
+        public string Extension { get; set; }
+
+        public string Url { get; set; }
+
+        public AprimoMediaItemViewModel(
+            int resizeWidth, int resizeHeight,
+            string name, string presetName,
+            string label, string fileName,
+            string extension, string url)
+        {
+            ResizeWidth = resizeWidth;
+            ResizeHeight = resizeHeight;
+            Name = name;
+            PresetName = presetName;
+            Label = label;
+            FileName = fileName;
+            Extension = extension;
+            Url = url;
+        }
+    }
+}

src/Umbraco.Cms.Integrations.DAM.Aprimo/Models/ViewModels/AprimoMediaWithCropsViewModel.cs

@@ -51,7 +51,9 @@ public string GetAuthorizationUrl(OAuthCodeExchange oauthCodeExchange)
                 oauthCodeExchange.CodeChallenge);
         }
 
-        public async Task<string> GetAccessToken(string code)
+        public string GetAccessToken(string code) => GetAccessTokenAsync(code).ConfigureAwait(false).GetAwaiter().GetResult();
+
+        public async Task<string> GetAccessTokenAsync(string code)
         {
             var configurationEntity = _storage.Get();
             if (configurationEntity == null) return "Error: " + Constants.ErrorResources.InvalidCodeChallenge;
@@ -88,7 +90,9 @@ public async Task<string> GetAccessToken(string code)
             return "Error: " + content;
         }
 
-        public async Task<string> RefreshAccessToken()
+        public string RefreshAccessToken() => RefreshAccessTokenAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+
+        public async Task<string> RefreshAccessTokenAsync()
         {
             var configurationEntity = _storage.Get();
             if (configurationEntity == null) return Constants.ErrorResources.MissingRefreshToken;
@@ -115,6 +119,8 @@ public async Task<string> RefreshAccessToken()
                 configurationEntity.RefreshToken = data.RefreshToken;
 
                 _storage.AddOrUpdate(configurationEntity);
+
+                return string.Empty;
             }
 
             return "Error: " + content;