Skip to content

Commit 5df6599

Browse files
gvkrieshishamco
andauthored
Do not expose unsupported queries in the GraphQL schema. (#16134)
Co-authored-by: Hisham Bin Ateya <[email protected]>
1 parent 9f4229b commit 5df6599

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public async Task BuildAsync(ISchema schema)
6262

6363
var fieldTypeName = querySchema["fieldTypeName"]?.ToString() ?? query.Name;
6464

65-
if (type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
65+
if (query.ReturnDocuments && type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
6666
{
6767
var contentType = type.Remove(0, 12);
6868
fieldType = BuildContentTypeFieldType(schema, contentType, query, fieldTypeName);
@@ -86,7 +86,7 @@ public async Task BuildAsync(ISchema schema)
8686

8787
private static FieldType BuildSchemaBasedFieldType(SqlQuery query, JsonNode querySchema, string fieldTypeName)
8888
{
89-
var properties = querySchema["properties"].AsObject();
89+
var properties = querySchema["properties"]?.AsObject();
9090
if (properties == null)
9191
{
9292
return null;

src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/ElasticQueryFieldTypeProvider.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ public async Task BuildAsync(ISchema schema)
8686

8787
private static FieldType BuildSchemaBasedFieldType(ElasticQuery query, JsonNode querySchema, string fieldTypeName)
8888
{
89-
var properties = querySchema["properties"].AsObject();
90-
89+
var properties = querySchema["properties"]?.AsObject();
9190
if (properties == null)
9291
{
9392
return null;

src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/LuceneQueryFieldTypeProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public async Task BuildAsync(ISchema schema)
8585

8686
private static FieldType BuildSchemaBasedFieldType(LuceneQuery query, JsonNode querySchema, string fieldTypeName)
8787
{
88-
var properties = querySchema["properties"].AsObject();
88+
var properties = querySchema["properties"]?.AsObject();
8989
if (properties == null)
9090
{
9191
return null;

0 commit comments

Comments
 (0)