Skip to content

[5.x] Only apply the published filter when not in preview mode #11652

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.

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

Open
wants to merge 5 commits into
base: 5.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/GraphQL/Queries/EntriesQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function resolve($root, $args)

private function filterQuery($query, $filters)
{
if (! isset($filters['status']) && ! isset($filters['published'])) {
if (! request()->isLivePreview() && (! isset($filters['status']) && ! isset($filters['published']))) {
$filters['status'] = 'published';
}

Expand Down
4 changes: 2 additions & 2 deletions src/GraphQL/Queries/EntryQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function resolve($root, $args)
$query->where('site', $site);
}

$filters = $args['filter'] ?? null;
$filters = $args['filter'] ?? [];

$this->filterQuery($query, $filters);

Expand Down Expand Up @@ -107,7 +107,7 @@ public function resolve($root, $args)

private function filterQuery($query, $filters)
{
if (! isset($filters['status']) && ! isset($filters['published'])) {
if (! request()->isLivePreview() && (! isset($filters['status']) && ! isset($filters['published']))) {
$filters['status'] = 'published';
}

Expand Down
40 changes: 40 additions & 0 deletions tests/Feature/GraphQL/EntryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Facades\Statamic\API\FilterAuthorizer;
use Facades\Statamic\API\ResourceAuthorizer;
use Facades\Statamic\CP\LivePreview;
use Facades\Statamic\Fields\BlueprintRepository;
use Facades\Tests\Factories\EntryFactory;
use PHPUnit\Framework\Attributes\DataProvider;
Expand Down Expand Up @@ -755,4 +756,43 @@ public function it_only_shows_published_entries_by_default()
'title' => 'That will be so rad!',
]]]);
}

#[Test]
public function it_only_shows_unpublished_entries_with_token()
{
FilterAuthorizer::shouldReceive('allowedForSubResources')
->andReturn(['published', 'status']);

$entry = EntryFactory::collection('blog')
->id('6')
->slug('that-was-so-rad')
->data(['title' => 'That was so rad!'])
->published(false)
->create();

$query = <<<'GQL'
{
entry(id: "6") {
id
title
}
}
GQL;

$this
->withoutExceptionHandling()
->post('/graphql', ['query' => $query])
->assertGqlOk()
->assertExactJson(['data' => ['entry' => null]]);

$token = LivePreview::tokenize('test-token', $entry);
$this
->withoutExceptionHandling()
->post('/graphql?token=test-token', ['query' => $query])
->assertGqlOk()
->assertExactJson(['data' => ['entry' => [
'id' => '6',
'title' => 'That was so rad!',
]]]);
}
}