Fix file resolve when relative file initial file is added (#887)

* Add (failing) test Using a custom resolver with relative paths fails because an attempt is made to resolve the physical path for this (non-existant) file. * Fix file document resolution
RicoSuter · Jan 25, 2019 · 2f83661 · 2f83661
1 parent 7709863
commit 2f83661
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src/NJsonSchema.Tests/References/LocalReferencesTests.cs b/src/NJsonSchema.Tests/References/LocalReferencesTests.cs
@@ -6,6 +6,8 @@
 
 namespace NJsonSchema.Tests.References
 {
+    using NJsonSchema.Generation;
+
     public class LocalReferencesTests
     {
         [Fact]
@@ -27,7 +29,7 @@ public async Task When_definitions_is_nested_then_refs_work()
 		}
 	}
 }";
-            
+
             //// Act
             var schema = await JsonSchema4.FromJsonAsync(json);
             var j = schema.ToJson();
@@ -81,6 +83,46 @@ public async Task When_document_has_indirect_external_ref_than_it_is_loaded()
             Assert.Equal(1, schema.Definitions.Count);
         }
 
+        [Fact]
+        public async Task When_reference_is_registered_in_custom_resolver_it_should_not_try_to_access_file()
+        {
+            //// Arrange
+            var externalSchema = await JsonSchema4.FromJsonAsync(
+            @"{
+                ""type"": ""object"", 
+                ""properties"": {
+                    ""foo"": {
+                        ""type"": ""string""
+                    }
+                }
+            }");
+
+            Func<JsonSchema4, JsonReferenceResolver> factory = schema4 =>
+            {
+                var schemaResolver = new JsonSchemaResolver(schema4, new JsonSchemaGeneratorSettings());
+                var resolver = new JsonReferenceResolver(schemaResolver);
+                resolver.AddDocumentReference("../dir/external.json", externalSchema);
+                return resolver;
+            };
+
+            string schemaJson =
+            @"{
+                ""$schema"": ""http://json-schema.org/draft-07/schema#"",
+                ""type"": ""object"",
+                ""properties"": {
+                    ""title"": {
+                        ""$ref"": ""../dir/external.json#""
+                    }
+                }
+            }";
+
+            //// Act
+            var schema = await JsonSchema4.FromJsonAsync(schemaJson, ".", factory);
+
+            //// Assert
+            Assert.NotNull(schema);
+        }
+
         private string GetTestDirectory()
         {
             var codeBase = Assembly.GetExecutingAssembly().CodeBase;

diff --git a/src/NJsonSchema/JsonReferenceResolver.cs b/src/NJsonSchema/JsonReferenceResolver.cs
@@ -47,7 +47,7 @@ JsonReferenceResolver ReferenceResolverFactory(JsonSchema4 schema) =>
         /// <param name="schema">The referenced schema.</param>
         public void AddDocumentReference(string documentPath, IJsonReference schema)
         {
-            _resolvedObjects[documentPath] = schema;
+            _resolvedObjects[documentPath.Contains("://") ? documentPath : DynamicApis.GetFullPath(documentPath)] = schema;
         }
 
         /// <summary>Gets the object from the given JSON path.</summary>