update for rich text content converter

kontent-ai · Dec 16, 2024 · 6b13c44 · 6b13c44
1 parent 3a1eef7
commit 6b13c44
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/Kontent.Ai.Delivery/ContentItems/ModelProvider.cs b/Kontent.Ai.Delivery/ContentItems/ModelProvider.cs
@@ -377,7 +377,7 @@ private IPropertyValueConverter GetValueConverter(PropertyInfo property)
             // Specific type converters
             if (typeof(IRichTextContent).IsAssignableFrom(property.PropertyType))
             {
-                return new RichTextContentConverter(HtmlParser);
+                return new RichTextContentConverter(HtmlParser, DeliveryOptions);
             }
 
             if (typeof(IDateTimeContent).IsAssignableFrom(property.PropertyType))
@@ -389,7 +389,7 @@ private IPropertyValueConverter GetValueConverter(PropertyInfo property)
             {
                 return new AssetElementValueConverter(DeliveryOptions);
             }
-            
+
             return null;
         }
 

diff --git a/Kontent.Ai.Delivery/ContentItems/RichTextContentConverter.cs b/Kontent.Ai.Delivery/ContentItems/RichTextContentConverter.cs
@@ -8,16 +8,19 @@
 using Kontent.Ai.Delivery.ContentItems.ContentLinks;
 using Kontent.Ai.Delivery.ContentItems.RichText;
 using Kontent.Ai.Delivery.ContentItems.RichText.Blocks;
+using Microsoft.Extensions.Options;
 
 namespace Kontent.Ai.Delivery.ContentItems
 {
     internal class RichTextContentConverter : IPropertyValueConverter<string>
     {
         public IHtmlParser Parser { get; }
+        public IOptionsMonitor<DeliveryOptions> Options { get; }
 
-        public RichTextContentConverter(IHtmlParser parser)
+        public RichTextContentConverter(IHtmlParser parser, IOptionsMonitor<DeliveryOptions> options)
         {
             Parser = parser;
+            Options = options;
         }
 
         public async Task<object> GetPropertyValueAsync<TElement>(PropertyInfo property, TElement contentElement, ResolvingContext context) where TElement : IContentElementValue<string>
@@ -56,7 +59,21 @@ public async Task<object> GetPropertyValueAsync<TElement>(PropertyInfo property,
                     if (img != null)
                     {
                         var assetId = Guid.Parse(img.GetAttribute("data-asset-id"));
-                        blocks.Add(element.Images[assetId]);
+                        if (!string.IsNullOrEmpty(Options.CurrentValue.AssetUrlReplacement))
+                        {
+                            var assetToReplace = element.Images[assetId];
+                            var replacedAsset = new InlineImage()
+                            {
+                                Url = ReplaceAssetUrlWIthCustomAssetUrl(assetToReplace.Url),
+                                Description = assetToReplace.Description,
+                                Height = assetToReplace.Height,
+                                Width = assetToReplace.Width,
+                                ImageId = assetToReplace.ImageId
+                            };
+                            blocks.Add(replacedAsset);
+                        }
+                        else
+                            blocks.Add(element.Images[assetId]);
                     }
                 }
                 else
@@ -67,5 +84,21 @@ public async Task<object> GetPropertyValueAsync<TElement>(PropertyInfo property,
 
             return blocks;
         }
+
+        /// <summary>
+        /// Replace the beginning part of the asset URL with the AssetUrlReplacement value.
+        /// </summary>
+        /// <param name="url">Original Asset Url</param>
+        /// <returns>New URL with the CDN URL replaces with AssetUrlReplacement</returns>
+        private string ReplaceAssetUrlWIthCustomAssetUrl(string url)
+        {
+            // Replace the beginning part of the asset URL with the AssetUrlReplacement value by taking the third forward slash as the ending point for the string replacement
+            var endOfUrlIndex = url.IndexOf("/", url.IndexOf("/", url.IndexOf("/", 0) + 1) + 1);
+            if (endOfUrlIndex > 0)
+            {
+                return Options.CurrentValue.AssetUrlReplacement + url.Substring(endOfUrlIndex);
+            }
+            return url;
+        }
     }
 }