Adapt ACL to combined isPublic column

carlobeltrame · carlobeltrame · commit 4bad327f039c · 2025-10-04T12:52:38.000+02:00
Refs #8004
diff --git a/api/src/Entity/Activity.php b/api/src/Entity/Activity.php
@@ -33,8 +33,7 @@
         new Get(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
@@ -56,8 +55,7 @@
                     toProperty: 'camp',
                     fromClass: Camp::class,
                     security: 'is_granted("CAMP_COLLABORATOR", camp) or
-                               is_granted("CAMP_IS_SHARED", camp) or
-                               is_granted("CAMP_IS_PROTOTYPE", camp)'
+                               is_granted("CAMP_IS_PUBLIC", camp)'
                 ),
             ],
             normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
diff --git a/api/src/Entity/ActivityProgressLabel.php b/api/src/Entity/ActivityProgressLabel.php
@@ -30,8 +30,7 @@
         new Get(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
@@ -53,8 +52,7 @@
                     toProperty: 'camp',
                     fromClass: Camp::class,
                     security: 'is_granted("CAMP_COLLABORATOR", camp) or
-                               is_granted("CAMP_IS_SHARED", camp) or
-                               is_granted("CAMP_IS_PROTOTYPE", camp)'
+                               is_granted("CAMP_IS_PUBLIC", camp)'
                 ),
             ],
             security: 'is_fully_authenticated()',
diff --git a/api/src/Entity/ActivityResponsible.php b/api/src/Entity/ActivityResponsible.php
@@ -23,7 +23,7 @@
 #[ApiResource(
     operations: [
         new Get(
-            security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_SHARED", object) or is_granted("CAMP_IS_PROTOTYPE", object)'
+            security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Delete(
             security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
diff --git a/api/src/Entity/Camp.php b/api/src/Entity/Camp.php
@@ -35,8 +35,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)',
+                       is_granted("CAMP_IS_PUBLIC", object)',
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
         ),
         new Patch(
diff --git a/api/src/Entity/CampCollaboration.php b/api/src/Entity/CampCollaboration.php
@@ -35,7 +35,7 @@
     operations: [
         new Get(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
-            security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_SHARED", object) or is_granted("CAMP_IS_PROTOTYPE", object)'
+            security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             processor: CampCollaborationUpdateProcessor::class,
@@ -68,8 +68,7 @@
                     toProperty: 'camp',
                     fromClass: Camp::class,
                     security: 'is_granted("CAMP_COLLABORATOR", camp) or
-                               is_granted("CAMP_IS_SHARED", camp) or
-                               is_granted("CAMP_IS_PROTOTYPE", camp)'
+                               is_granted("CAMP_IS_PUBLIC", camp)'
                 ),
             ],
             security: 'is_fully_authenticated()',
diff --git a/api/src/Entity/Category.php b/api/src/Entity/Category.php
@@ -36,8 +36,7 @@
         new Get(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             denormalizationContext: ['groups' => ['write', 'update']],
@@ -66,8 +65,7 @@
                     fromClass: Camp::class,
                     toProperty: 'camp',
                     security: 'is_granted("CAMP_COLLABORATOR", camp) or
-                               is_granted("CAMP_IS_SHARED", camp) or
-                               is_granted("CAMP_IS_PROTOTYPE", camp)'
+                               is_granted("CAMP_IS_PUBLIC", camp)'
                 ),
             ],
             extraProperties: [
diff --git a/api/src/Entity/Checklist.php b/api/src/Entity/Checklist.php
@@ -30,8 +30,7 @@
     operations: [
         new Get(
             security: 'is_granted("CHECKLIST_IS_PROTOTYPE", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
+                       is_granted("CAMP_IS_PUBLIC", object) or
                        is_granted("CAMP_COLLABORATOR", object)
                       '
         ),
@@ -64,8 +63,7 @@
                     toProperty: 'camp',
                     fromClass: Camp::class,
                     security: 'is_granted("CAMP_COLLABORATOR", camp) or
-                               is_granted("CAMP_IS_SHARED", camp) or
-                               is_granted("CAMP_IS_PROTOTYPE", camp)'
+                               is_granted("CAMP_IS_PUBLIC", camp)'
                 ),
             ],
             extraProperties: [
diff --git a/api/src/Entity/ChecklistItem.php b/api/src/Entity/ChecklistItem.php
@@ -33,8 +33,7 @@
     operations: [
         new Get(
             security: 'is_granted("CHECKLIST_IS_PROTOTYPE", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
+                       is_granted("CAMP_IS_PUBLIC", object) or
                        is_granted("CAMP_COLLABORATOR", object)
                       '
         ),
@@ -65,8 +64,7 @@
                     fromClass: Checklist::class,
                     toProperty: 'checklist',
                     security: 'is_granted("CHECKLIST_IS_PROTOTYPE", checklist) or
-                               is_granted("CAMP_IS_PROTOTYPE", checklist) or
-                               is_granted("CAMP_IS_SHARED", checklist) or
+                               is_granted("CAMP_IS_PUBLIC", checklist) or
                                is_granted("CAMP_COLLABORATOR", checklist)'
                 ),
             ],
diff --git a/api/src/Entity/Comment.php b/api/src/Entity/Comment.php
@@ -27,8 +27,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object) or
+                       is_granted("CAMP_IS_PUBLIC", object) or
                        object.author === user',
         ),
         new Delete(
@@ -49,8 +48,7 @@
                     toProperty: 'activity',
                     fromClass: Activity::class,
                     security: 'is_granted("CAMP_COLLABORATOR", activity) or
-                               is_granted("CAMP_IS_SHARED", activity) or
-                               is_granted("CAMP_IS_PROTOTYPE", activity)',
+                               is_granted("CAMP_IS_PUBLIC", activity)',
                 ),
             ],
             security: 'is_fully_authenticated()',
diff --git a/api/src/Entity/ContentNode/ChecklistNode.php b/api/src/Entity/ContentNode/ChecklistNode.php
@@ -24,8 +24,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             processor: ChecklistNodePersistProcessor::class,
diff --git a/api/src/Entity/ContentNode/ColumnLayout.php b/api/src/Entity/ContentNode/ColumnLayout.php
@@ -26,8 +26,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             processor: ContentNodePersistProcessor::class,
diff --git a/api/src/Entity/ContentNode/MaterialNode.php b/api/src/Entity/ContentNode/MaterialNode.php
@@ -24,8 +24,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             processor: ContentNodePersistProcessor::class,
diff --git a/api/src/Entity/ContentNode/MultiSelect.php b/api/src/Entity/ContentNode/MultiSelect.php
@@ -22,8 +22,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             processor: ContentNodePersistProcessor::class,
diff --git a/api/src/Entity/ContentNode/ResponsiveLayout.php b/api/src/Entity/ContentNode/ResponsiveLayout.php
@@ -25,8 +25,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             processor: ContentNodePersistProcessor::class,
diff --git a/api/src/Entity/ContentNode/SingleText.php b/api/src/Entity/ContentNode/SingleText.php
@@ -21,8 +21,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             processor: SingleTextPersistProcessor::class,
diff --git a/api/src/Entity/ContentNode/Storyboard.php b/api/src/Entity/ContentNode/Storyboard.php
@@ -21,8 +21,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             processor: StoryboardPersistProcessor::class,
diff --git a/api/src/Entity/Day.php b/api/src/Entity/Day.php
@@ -29,8 +29,7 @@
         new Get(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new GetCollection(
             normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
@@ -43,8 +42,7 @@
                     toProperty: 'period',
                     fromClass: Period::class,
                     security: 'is_granted("CAMP_COLLABORATOR", period) or
-                               is_granted("CAMP_IS_SHARED", period) or
-                               is_granted("CAMP_IS_PROTOTYPE", period)'
+                               is_granted("CAMP_IS_PUBLIC", period)'
                 ),
             ],
             normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
diff --git a/api/src/Entity/DayResponsible.php b/api/src/Entity/DayResponsible.php
@@ -25,8 +25,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Delete(
             security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
@@ -41,8 +40,7 @@
                     toProperty: 'day',
                     fromClass: Day::class,
                     security: 'is_granted("CAMP_COLLABORATOR", day) or
-                               is_granted("CAMP_IS_SHARED", day) or
-                               is_granted("CAMP_IS_PROTOTYPE", day)'
+                               is_granted("CAMP_IS_PUBLIC", day)'
                 ),
             ],
             extraProperties: [
diff --git a/api/src/Entity/MaterialItem.php b/api/src/Entity/MaterialItem.php
@@ -33,8 +33,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             validationContext: ['groups' => MaterialItemUpdateGroupSequence::class],
diff --git a/api/src/Entity/MaterialList.php b/api/src/Entity/MaterialList.php
@@ -29,8 +29,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
diff --git a/api/src/Entity/Period.php b/api/src/Entity/Period.php
@@ -36,8 +36,7 @@
     operations: [
         new Get(
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)',
+                       is_granted("CAMP_IS_PUBLIC", object)',
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
         ),
         new Patch(
diff --git a/api/src/Entity/ScheduleEntry.php b/api/src/Entity/ScheduleEntry.php
@@ -32,8 +32,7 @@
         new Get(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
             security: 'is_granted("CAMP_COLLABORATOR", object) or
-                       is_granted("CAMP_IS_SHARED", object) or
-                       is_granted("CAMP_IS_PROTOTYPE", object)'
+                       is_granted("CAMP_IS_PUBLIC", object)'
         ),
         new Patch(
             normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
@@ -54,8 +53,7 @@
                     toProperty: 'period',
                     fromClass: Period::class,
                     security: 'is_granted("CAMP_COLLABORATOR", period) or
-                               is_granted("CAMP_IS_SHARED", period) or
-                               is_granted("CAMP_IS_PROTOTYPE", period)'
+                               is_granted("CAMP_IS_PUBLIC", period)'
                 ),
             ],
             security: 'is_fully_authenticated()',
diff --git a/api/src/Security/Voter/CampIsPrototypeVoter.php b/api/src/Security/Voter/CampIsPrototypeVoter.php
diff --git a/api/src/Security/Voter/CampIsPublicVoter.php b/api/src/Security/Voter/CampIsPublicVoter.php
@@ -13,7 +13,7 @@
 /**
  * @extends Voter<string,BelongsToCampInterface | BelongsToContentNodeTreeInterface>
  */
-class CampIsSharedVoter extends Voter {
+class CampIsPublicVoter extends Voter {
     use GetCampFromContentNodeTrait;
 
     public function __construct(
@@ -22,7 +22,7 @@ public function __construct(
     ) {}
 
     protected function supports($attribute, $subject): bool {
-        return 'CAMP_IS_SHARED' === $attribute
+        return 'CAMP_IS_PUBLIC' === $attribute
         && ($subject instanceof BelongsToCampInterface || $subject instanceof BelongsToContentNodeTreeInterface);
     }
 
@@ -33,7 +33,7 @@ protected function voteOnAttribute(string $attribute, mixed $subject, TokenInter
             return false;
         }
 
-        if ($camp->isShared) {
+        if ($camp->isPublic) {
             $this->responseTagger->addTags([$camp->getId()]);
 
             return true;
diff --git a/api/tests/Security/Voter/CampIsPrototypeVoterTest.php b/api/tests/Security/Voter/CampIsPrototypeVoterTest.php
diff --git a/api/tests/Security/Voter/CampIsPublicVoterTest.php b/api/tests/Security/Voter/CampIsPublicVoterTest.php
