fix(Services.IO): Fixes the way the WorkflowReader resolves URIs

cdavernas · cdavernas · commit 5bb8c43df5c4 · 2022-05-20T14:54:39.000+02:00
diff --git a/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj b/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj
@@ -4,9 +4,9 @@
     <TargetFramework>net6.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <NeutralLanguage>en</NeutralLanguage>
-    <AssemblyVersion>0.8.1.5</AssemblyVersion>
-    <FileVersion>0.8.1.5</FileVersion>
-    <Version>0.8.1.5</Version>
+    <AssemblyVersion>0.8.1.6</AssemblyVersion>
+    <FileVersion>0.8.1.6</FileVersion>
+    <Version>0.8.1.6</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
diff --git a/src/ServerlessWorkflow.Sdk/Services/IO/WorkflowReader.cs b/src/ServerlessWorkflow.Sdk/Services/IO/WorkflowReader.cs
@@ -148,10 +148,9 @@ protected virtual async Task<DataInputSchemaDefinition> LoadDataInputSchemaAsync
             if (uri == null)
                 throw new ArgumentNullException(nameof(uri));
             string? content;
-            if (!uri.IsAbsoluteUri)
-            {
-                
-            }
+            if (!uri.IsAbsoluteUri
+                 || (uri.IsFile && Path.IsPathRooted(uri.LocalPath)))
+                uri = this.ResolveRelativeUri(uri, options);
             if (uri.IsFile)
             {
                 string filePath = uri.LocalPath;
@@ -183,6 +182,9 @@ protected virtual async Task<DynamicObject> LoadExternalDefinitionAsync(Uri uri,
             if (uri == null)
                 throw new ArgumentNullException(nameof(uri));
             string? content;
+            if (!uri.IsAbsoluteUri
+                || (uri.IsFile && Path.IsPathRooted(uri.LocalPath)))
+                uri = this.ResolveRelativeUri(uri, options);
             if (uri.IsFile)
             {
                 string filePath = uri.LocalPath;
@@ -216,6 +218,9 @@ protected virtual async Task<List<T>> LoadExternalDefinitionCollectionAsync<T>(U
             if (uri == null)
                 throw new ArgumentNullException(nameof(uri));
             string? content;
+            if (!uri.IsAbsoluteUri
+                || (uri.IsFile && Path.IsPathRooted(uri.LocalPath)))
+                uri = this.ResolveRelativeUri(uri, options);
             if (uri.IsFile)
             {
                 string filePath = uri.LocalPath;
@@ -253,7 +258,7 @@ protected virtual Uri ResolveRelativeUri(Uri uri, WorkflowReaderOptions options)
                         throw new NullReferenceException($"The '{nameof(WorkflowReaderOptions.BaseUri)}' property must be set when using the specified {nameof(RelativeUriReferenceResolutionMode)} '{RelativeUriReferenceResolutionMode.ConvertToAbsolute}'");
                     return new(options.BaseUri, uri.ToString());
                 case RelativeUriReferenceResolutionMode.ConvertToRelativeFilePath:
-                    return new(Path.Combine(options.BaseDirectory, uri.LocalPath));
+                    return new(Path.Combine(options.BaseDirectory, uri.ToString()));
                 case RelativeUriReferenceResolutionMode.None:
                     throw new NotSupportedException($"Relative uris are not supported when using the specified {nameof(RelativeUriReferenceResolutionMode)} '{RelativeUriReferenceResolutionMode.ConvertToAbsolute}'");
                 default:
