fix: data permissions issues

Author: smarcet

app/ModelSerializers/PublicMemberSerializer.php

@@ -18,21 +18,13 @@
  */
 final class PublicMemberSerializer extends AbstractMemberSerializer
 {
+
     /**
-     * @param null $expand
-     * @param array $fields
-     * @param array $relations
-     * @param array $params
+     * @param Member $member
+     * @param array $values
      * @return array
      */
-    public function serialize($expand = null, array $fields = [], array $relations = [], array $params = [])
-    {
-        $member  = $this->object;
-        if(!$member instanceof Member) return [];
-        $values = parent::serialize($expand, $fields, $relations, $params);
-
-        // permissions check
-
+    protected function checkDataPermissions(Member $member, array $values):array{
         if(!$member->isPublicProfileShowBio())
         {
             unset($values['bio']);
@@ -61,6 +53,20 @@ public function serialize($expand = null, array $fields = [], array $relations =
             unset($values['last_name']);
         }
 
-        return $values;
+    }
+    /**
+     * @param null $expand
+     * @param array $fields
+     * @param array $relations
+     * @param array $params
+     * @return array
+     */
+    public function serialize($expand = null, array $fields = [], array $relations = [], array $params = [])
+    {
+        $member  = $this->object;
+        if(!$member instanceof Member) return [];
+        $values = parent::serialize($expand, $fields, $relations, $params);
+
+        return $this->checkDataPermissions($member, $values);
     }
 }

app/ModelSerializers/Summit/Speakers/AdminPresentationSpeakerSerializer.php

@@ -34,6 +34,11 @@ final class AdminPresentationSpeakerSerializer extends PresentationSpeakerSerial
         'summit_assistance',
         'registration_code',
     ];
+    
+    protected function checkDataPermissions(PresentationSpeaker $speaker, array $values):array{
+        return $values;
+    }
+
 
     protected function getMemberSerializerType():string{
         return SerializerRegistry::SerializerType_Admin;

app/ModelSerializers/Summit/Speakers/PresentationSpeakerSerializer.php

@@ -42,6 +42,63 @@ protected function getMemberSerializerType():string {
         return SerializerRegistry::SerializerType_Public;
     }
 
+    /**
+     * @param PresentationSpeaker $speaker
+     * @param array $values
+     * @return array
+     */
+    protected function checkDataPermissions(PresentationSpeaker $speaker, array $values):array{
+        // permissions check
+
+        if(!$speaker->isPublicProfileShowBio())
+        {
+            unset($values['bio']);
+            unset($values['gender']);
+            unset($values['company']);
+            unset($values['state']);
+            unset($values['country']);
+            unset($values['title']);
+            unset($values['affiliations']);
+            unset($values['languages']);
+            unset($values['other_presentation_links']);
+            unset($values['areas_of_expertise']);
+            unset($values['travel_preferences']);
+            unset($values['active_involvements']);
+            unset($values['organizational_roles']);
+            unset($values['badge_features']);
+        }
+
+        if(!$speaker->isPublicProfileShowEmail())
+        {
+            unset($values['email']);
+        }
+
+        if(!$speaker->isPublicProfileShowSocialMediaInfo())
+        {
+            unset($values['irc']);
+            unset($values['twitter']);
+        }
+
+        if(!$speaker->isPublicProfileShowPhoto())
+        {
+            unset($values['pic']);
+            unset($values['big_pic']);
+        }
+
+        if(!$speaker->isPublicProfileShowFullname())
+        {
+            unset($values['first_name']);
+            unset($values['last_name']);
+        }
+
+        if(!$speaker->isPublicProfileShowTelephoneNumber())
+        {
+            unset($values['phone_number']);
+        }
+
+        return $values;
+    }
+
     /**
      * @param null $expand
      * @param array $fields
@@ -318,54 +375,6 @@ public function serialize($expand = null, array $fields = [], array $relations =
             }
         }
 
-        // permissions check
-
-        if(!$speaker->isPublicProfileShowBio())
-        {
-            unset($values['bio']);
-            unset($values['gender']);
-            unset($values['company']);
-            unset($values['state']);
-            unset($values['country']);
-            unset($values['title']);
-            unset($values['affiliations']);
-            unset($values['languages']);
-            unset($values['other_presentation_links']);
-            unset($values['areas_of_expertise']);
-            unset($values['travel_preferences']);
-            unset($values['active_involvements']);
-            unset($values['organizational_roles']);
-            unset($values['badge_features']);
-        }
-
-        if(!$speaker->isPublicProfileShowEmail())
-        {
-            unset($values['email']);
-        }
-
-        if(!$speaker->isPublicProfileShowSocialMediaInfo())
-        {
-            unset($values['irc']);
-            unset($values['twitter']);
-        }
-
-        if(!$speaker->isPublicProfileShowPhoto())
-        {
-            unset($values['pic']);
-            unset($values['big_pic']);
-        }
-
-        if(!$speaker->isPublicProfileShowFullname())
-        {
-            unset($values['first_name']);
-            unset($values['last_name']);
-        }
-
-        if(!$speaker->isPublicProfileShowTelephoneNumber())
-        {
-            unset($values['phone_number']);
-        }
-
-        return $values;
+       return $this->checkDataPermissions($speaker, $values);
     }
 }