Skip to content

Prevented scalar JSON:API includes from causing server errors. #810

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

Draft
vincent-gao wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Prevented scalar JSON:API includes from causing server errors. #810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions modules/tide_api/src/IncludeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,21 @@ protected function resolveIncludeTree(array $include_tree, Data $data, Data $inc
$includes = IncludedData::merge($includes, new IncludedData([$exception]));
continue;
}
$target_type = $field_list->getFieldDefinition()->getFieldStorageDefinition()->getSetting('target_type');
assert(!empty($target_type));
foreach ($field_list as $field_item) {
assert($field_item instanceof EntityReferenceItem);
// JSON:API includes are relationships. Ignore scalar attributes that
// were supplied as include paths instead of treating them as entity
// references with an empty target type.
if (!$field_item instanceof EntityReferenceItem) {
continue;
}

// Include the target_revision_id in the references of paragraphs.
$target_type = $field_item->getDataDefinition()->getSetting('target_type');
if ($field_item instanceof EntityReferenceRevisionsItem && $target_type == 'paragraph') {
if (!is_string($target_type) || $target_type === '' || !$this->entityTypeManager->hasDefinition($target_type)) {
continue;
}

if ($field_item instanceof EntityReferenceRevisionsItem && $target_type === 'paragraph') {
$references[$target_type][$field_item->get($field_item::mainPropertyName())->getValue()] = $field_item->get('target_revision_id')->getValue();
}
else {
Expand Down
Loading