Merge pull request #215 from contentful/feature/rich-text-fixes

Feature/rich text fixes

Author: Roblinde

Contentful.AspNetCore/Contentful.AspNetCore.csproj

@@ -13,8 +13,8 @@
     <PackageProjectUrl>https://github.com/contentful/contentful.net</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
-    <Version>5.0.2</Version>
-    <AssemblyVersion>5.0.2.0</AssemblyVersion>
+    <Version>5.0.3</Version>
+    <AssemblyVersion>5.0.3.0</AssemblyVersion>
     <RepositoryUrl>https://github.com/contentful/contentful.net</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -24,7 +24,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="contentful.csharp" Version="5.0.2" />
+    <PackageReference Include="contentful.csharp" Version="5.0.3" />
     <PackageReference Include="gitlink" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

Contentful.Core/Contentful.Core.csproj

@@ -18,9 +18,9 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <AssemblyVersion>5.0.2.0</AssemblyVersion>
-    <FileVersion>5.0.2.0</FileVersion>
-    <Version>5.0.2</Version>
+    <AssemblyVersion>5.0.3.0</AssemblyVersion>
+    <FileVersion>5.0.3.0</FileVersion>
+    <Version>5.0.3</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="gitlink" Version="3.1.0">

Contentful.Core/ContentfulClient.cs

@@ -279,7 +279,7 @@ private void ResolveLinks(JObject json, JObject entryToken, ISet<string> process
             foreach (var linkToken in links)
             {
                 var propName = (linkToken.Parent.Parent.Ancestors().FirstOrDefault(a => a is JProperty) as JProperty)?.Name;
-
+                var isRichTextPath = linkToken.Path.EndsWith("data.target.sys");
                 var linkId = ((JValue)linkToken["id"]).Value.ToString();
                 JToken replacementToken = null;
                 if (processedIds.Contains(linkId))
@@ -314,7 +314,7 @@ private void ResolveLinks(JObject json, JObject entryToken, ISet<string> process
                     {
                         prop = type?.GetRuntimeProperties().FirstOrDefault(p => (p.Name.Equals(propName, StringComparison.OrdinalIgnoreCase) ||
                         p.GetCustomAttribute<JsonPropertyAttribute>()?.PropertyName == propName));
-                        if (prop == null && linkToken["linkType"]?.ToString() != "Asset")
+                        if (prop == null && linkToken["linkType"]?.ToString() != "Asset" && !isRichTextPath)
                         {
                             //the property does not exist in the entry. Skip it in resolving references.
                             continue;

Contentful.Core/Models/Management/SystemFieldTypes.cs

@@ -59,5 +59,10 @@ public class SystemFieldTypes
         /// </summary>
         public const string Object = "Object";
 
+        /// <summary>
+        /// An rich text document.
+        /// </summary>
+        public const string RichText = "RichText";
+
     }
 }