Do not expose unsupported queries in the GraphQL schema. (#16134)

Co-authored-by: Hisham Bin Ateya <[email protected]>
OrchardCMS · May 26, 2024 · 5df6599 · 5df6599
1 parent 9f4229b
commit 5df6599
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs
@@ -62,7 +62,7 @@ public async Task BuildAsync(ISchema schema)
 
                     var fieldTypeName = querySchema["fieldTypeName"]?.ToString() ?? query.Name;
 
-                    if (type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
+                    if (query.ReturnDocuments && type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
                     {
                         var contentType = type.Remove(0, 12);
                         fieldType = BuildContentTypeFieldType(schema, contentType, query, fieldTypeName);
@@ -86,7 +86,7 @@ public async Task BuildAsync(ISchema schema)
 
         private static FieldType BuildSchemaBasedFieldType(SqlQuery query, JsonNode querySchema, string fieldTypeName)
         {
-            var properties = querySchema["properties"].AsObject();
+            var properties = querySchema["properties"]?.AsObject();
             if (properties == null)
             {
                 return null;

diff --git a/...ardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/ElasticQueryFieldTypeProvider.cs b/...ardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/ElasticQueryFieldTypeProvider.cs
@@ -86,8 +86,7 @@ public async Task BuildAsync(ISchema schema)
 
         private static FieldType BuildSchemaBasedFieldType(ElasticQuery query, JsonNode querySchema, string fieldTypeName)
         {
-            var properties = querySchema["properties"].AsObject();
-
+            var properties = querySchema["properties"]?.AsObject();
             if (properties == null)
             {
                 return null;

diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/LuceneQueryFieldTypeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/LuceneQueryFieldTypeProvider.cs
@@ -85,7 +85,7 @@ public async Task BuildAsync(ISchema schema)
 
         private static FieldType BuildSchemaBasedFieldType(LuceneQuery query, JsonNode querySchema, string fieldTypeName)
         {
-            var properties = querySchema["properties"].AsObject();
+            var properties = querySchema["properties"]?.AsObject(); 
             if (properties == null)
             {
                 return null;