Merge pull request #1491 from dldl-cmd/openapiwalker_references

Fix unresolved references in OpenApiWalker
microsoft · Dec 5, 2023 · 2b1d082 · 2b1d082
2 parents f6777e4 + 5b40826
commit 2b1d082
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs
@@ -1091,7 +1091,8 @@ private void Walk(string context, Action walk)
         /// </summary>
         private bool ProcessAsReference(IOpenApiReferenceable referenceable, bool isComponent = false)
         {
-            var isReference = referenceable.Reference != null && !isComponent;
+            var isReference = referenceable.Reference != null && 
+                              (!isComponent || referenceable.UnresolvedReference);
             if (isReference)
             {
                 Walk(referenceable);

diff --git a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs
@@ -233,6 +233,18 @@ public void LocateReferences()
                     Headers = new Dictionary<string, OpenApiHeader>
                     {
                         ["test-header"] = testHeader
+                    },
+                    SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>
+                    {
+                        ["test-secScheme"] = new OpenApiSecurityScheme
+                        {
+                            Reference = new OpenApiReference
+                            {
+                                Id = "reference-to-scheme",
+                                Type = ReferenceType.SecurityScheme
+                            },
+                            UnresolvedReference = true
+                        }
                     }
                 }
             };
@@ -245,6 +257,7 @@ public void LocateReferences()
                 "referenceAt: #/paths/~1/get/responses/200/content/application~1json/schema",
                 "referenceAt: #/paths/~1/get/responses/200/headers/test-header",
                 "referenceAt: #/components/schemas/derived/anyOf/0",
+                "referenceAt: #/components/securitySchemes/test-secScheme",
                 "referenceAt: #/components/headers/test-header/schema"
             });
         }