Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
May 26, 2024
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cc1e96
Do not expose unsupported queries in the GraphQL schema.
gvkries May 22, 2024
5f4f65e
Update src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/Luce…
gvkries May 22, 2024
3cb97b6
Update src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQue…
gvkries May 23, 2024
7e6805f
Merge branch 'main' into gvkries/queries-16008
hishamco May 23, 2024
9d3abc5
Merge branch 'main' into gvkries/queries-16008
gvkries May 24, 2024
2748eba
Merge branch 'main' into gvkries/queries-16008
hishamco May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions ...ardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/ElasticQueryFieldTypeProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/LuceneQueryFieldTypeProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down