From d0f41afa89031a0093b8ea1ab4c40e330574eb8c Mon Sep 17 00:00:00 2001
From: Dmitrii Korolev <dmkorolev@microsoft.com>
Date: Fri, 8 Apr 2022 20:00:43 +0200
Subject: [PATCH] resolve local file reference with Schema type properly

---
 .../V3/OpenApiV3VersionService.cs             | 20 ++++++++-----------
 .../ConvertToOpenApiReferenceV3Tests.cs       | 16 +++++++++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs
index 65acbc4e0..c967cde55 100644
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs
+++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs
@@ -75,18 +75,6 @@ public OpenApiReference ConvertToOpenApiReference(
                 var segments = reference.Split('#');
                 if (segments.Length == 1)
                 {
-                    // Either this is an external reference as an entire file
-                    // or a simple string-style reference for tag and security scheme.
-                    if (type == null)
-                    {
-                        // "$ref": "Pet.json"
-                        return new OpenApiReference
-                        {
-                            Type = type,
-                            ExternalResource = segments[0]
-                        };
-                    }
-
                     if (type == ReferenceType.Tag || type == ReferenceType.SecurityScheme)
                     {
                         return new OpenApiReference
@@ -95,6 +83,14 @@ public OpenApiReference ConvertToOpenApiReference(
                             Id = reference
                         };
                     }
+
+                    // Either this is an external reference as an entire file
+                    // or a simple string-style reference for tag and security scheme.
+                    return new OpenApiReference
+                    {
+                        Type = type,
+                        ExternalResource = segments[0]
+                    };
                 }
                 else if (segments.Length == 2)
                 {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs
index c4e88998e..f7368b09b 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs
@@ -108,5 +108,21 @@ public void ParseSecuritySchemeReference()
             reference.ExternalResource.Should().BeNull();
             reference.Id.Should().Be(id);
         }
+
+        [Fact]
+        public void ParseLocalFileReference()
+        {
+            // Arrange
+            var versionService = new OpenApiV3VersionService(Diagnostic);
+            var referenceType = ReferenceType.Schema;
+            var input = $"../schemas/collection.json";
+
+            // Act
+            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
+
+            // Assert
+            reference.Type.Should().Be(referenceType);
+            reference.ExternalResource.Should().Be(input);
+        }
     }
 }