Skip to content
Merged
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
5 changes: 5 additions & 0 deletions api/src/Doctrine/FilterByCurrentUserExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ public function __construct(Security $security, EntityManagerInterface $entityMa
}

public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, ?string $resourceClass = null, ?Operation $operation = null, array $context = []): void {
$extraProperties = $operation->getExtraProperties();
if (array_key_exists('filter_by_current_user', $extraProperties) && false === $extraProperties['filter_by_current_user']) {
return;
}

$this->addWhere($queryBuilder, $queryNameGenerator, $resourceClass);
}

Expand Down
3 changes: 3 additions & 0 deletions api/src/Entity/Activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
],
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
security: 'is_fully_authenticated()',
extraProperties: [
'filter_by_current_user' => false,
]
),
new Post(
processor: ActivityCreateProcessor::class,
Expand Down
3 changes: 3 additions & 0 deletions api/src/Entity/ActivityProgressLabel.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
),
],
security: 'is_fully_authenticated()',
extraProperties: [
'filter_by_current_user' => false,
]
),
new Post(
validationContext: ['groups' => ['Default', 'create']],
Expand Down
3 changes: 3 additions & 0 deletions api/src/Entity/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
security: 'is_granted("CAMP_COLLABORATOR", camp) or is_granted("CAMP_IS_PROTOTYPE", camp)'
),
],
extraProperties: [
'filter_by_current_user' => false,
]
),
],
denormalizationContext: ['groups' => ['write']],
Expand Down
3 changes: 3 additions & 0 deletions api/src/Entity/Checklist.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
security: 'is_granted("CAMP_COLLABORATOR", camp) or is_granted("CAMP_IS_PROTOTYPE", camp)'
),
],
extraProperties: [
'filter_by_current_user' => false,
]
),
],
denormalizationContext: ['groups' => ['write']],
Expand Down
3 changes: 3 additions & 0 deletions api/src/Entity/ChecklistItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
is_granted("CAMP_COLLABORATOR", checklist)'
),
],
extraProperties: [
'filter_by_current_user' => false,
]
),
],
denormalizationContext: ['groups' => ['write']],
Expand Down
3 changes: 3 additions & 0 deletions api/src/Entity/Day.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
],
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
security: 'is_fully_authenticated()',
extraProperties: [
'filter_by_current_user' => false,
]
),
],
denormalizationContext: ['groups' => ['write']],
Expand Down
3 changes: 3 additions & 0 deletions api/src/Entity/DayResponsible.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
security: 'is_granted("CAMP_COLLABORATOR", day) or is_granted("CAMP_IS_PROTOTYPE", day)'
),
],
extraProperties: [
'filter_by_current_user' => false,
]
),
new Post(
securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.day === null'
Expand Down
3 changes: 3 additions & 0 deletions api/src/Entity/ScheduleEntry.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
),
],
security: 'is_fully_authenticated()',
extraProperties: [
'filter_by_current_user' => false,
]
),
new Post(
denormalizationContext: ['groups' => ['write', 'create']],
Expand Down
8 changes: 7 additions & 1 deletion api/tests/Api/Activities/ListActivitiesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function testListActivitiesFilteredByCampIsAllowedForCollaborator() {
], $response->toArray()['_links']['items']);
}

public function testListActivitiesByCampSubresourceIsAllowedForCollaborator() {
public function testListActivitiesAsCampSubresourceIsAllowedForCollaborator() {
$camp = static::getFixture('camp1');
$response = static::createClientWithCredentials()->request('GET', "/camps/{$camp->getId()}/activities");
$this->assertResponseStatusCodeSame(200);
Expand All @@ -78,6 +78,12 @@ public function testListActivitiesByCampSubresourceIsAllowedForCollaborator() {
], $response->toArray()['_links']['items']);
}

public function testListActivitiesAsCampSubresourceIsDeniedForUnrelatedUser() {
$camp = static::getFixture('camp1');
$response = static::createClientWithCredentials(['email' => static::$fixtures['user4unrelated']->getEmail()])->request('GET', "/camps/{$camp->getId()}/activities");
$this->assertResponseStatusCodeSame(404);
}

public function testListActivitiesFilteredByCampIsDeniedForUnrelatedUser() {
$camp = static::getFixture('camp1');
$response = static::createClientWithCredentials(['email' => static::$fixtures['user4unrelated']->getEmail()])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ public function testListActivityProgressLabelsAsSubresourceOfCampIsAllowedForCol
], $response->toArray()['_links']['items']);
}

public function testListActivityProgressLabelsAsSubresourceOfCampIsDeniedForUnrelatedUser() {
$camp = static::getFixture('camp1');
$response = static::createClientWithCredentials(['email' => static::$fixtures['user4unrelated']->getEmail()])
->request('GET', "/camps/{$camp->getId()}/activity_progress_labels")
;
$this->assertResponseStatusCodeSame(404);
}

public function testListActivityProgressLabelsFilteredByCampIsDeniedForUnrelatedUser() {
$camp = static::getFixture('camp1');
$response = static::createClientWithCredentials(['email' => static::$fixtures['user4unrelated']->getEmail()])
Expand Down