Brian Hatchet · @brianhatchet · 9c3c4a85 · Brian Hatchet · Brian Hatchet
--- a/Api/Exportable.php
+++ b/Api/Exportable.php
 
 $exported = $item->export(...$this->exportArgs); 
 
+ if ($item && Di::_()->get('Features\Manager')->has('permissions')) { 
+ $userGuid = $user ? $user->getGuid() : null; 
--- a/Api/Factory.php
+++ b/Api/Factory.php
 public static function exportable($entities, $exceptions = [], $exportContext = false) 
 { 
+ $permissionsManager = Di::_()->get('Permissions\Manager'); 
 if (!$entities) { 
 return []; 
 } 
+  
 foreach ($entities as $k => $entity) { 
 if ($exportContext && method_exists($entity, 'setExportContext')) { 
 $entity->setExportContext($exportContext); 
 } 
 
 $entities[$k] = $entity->export(); 
+ //Calculate new permissions object with the entities 
+ if ($entity && Di::_()->get('Features\Manager')->has('permissions')) { 
+ $userGuid = $user ? $user->getGuid() : null; 
--- a/Controllers/api/v1/channel.php
+++ b/Controllers/api/v1/channel.php
 
 $block = Core\Security\ACL\Block::_(); 
 $response['channel']['blocked'] = $block->isBlocked($user); 
+  
+ //Calculate new permissions object with the entities 
+ if ($user && Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Controllers/api/v1/groups.php
+++ b/Controllers/api/v1/groups.php
 
 $response['groups'] = Factory::exportable($groups); 
 $response['entities'] = Factory::exportable($groups); 
+  
+ if ($groups && Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Controllers/api/v1/media.php
+++ b/Controllers/api/v1/media.php
 $response['entity']['canEdit'] = $entity->canEdit(); 
 Security\ACL::$ignore = $ignore; 
 } 
+ 
+  
 } 
 } 
 
+ $currentUser = Core\Session::getLoggedinUser(); 
--- a/Controllers/api/v1/media/recommended.php
+++ b/Controllers/api/v1/media/recommended.php
 
 // Trim to correct length 
 $entities = array_slice($entities, 0, $limit); 
+ $permissions = null; 
+ $currentUser = Core\Session::getLoggedinUser(); 
--- a/Controllers/api/v1/newsfeed.php
+++ b/Controllers/api/v1/newsfeed.php
 } 
 } 
 
+ //Calculate new permissions object with the entities 
+ if ($activity && Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Controllers/api/v1/newsfeed/single.php
+++ b/Controllers/api/v1/newsfeed/single.php
+ { 
+ $activity = new Activity($pages[1]); 
+ 
+ if (!Security\ACL::_()->read($activity)) { 
+ return Factory::response([ 
+ 'status' => 'error', 
+ 'message' => 'You do not have permission to view this post' 
+ ]); 
+ } 
+ 
+ if (!$activity->guid || Helpers\Flags::shouldFail($activity)) { 
+ return Factory::response(['status' => 'error']); 
+ } 
+ 
+ $response = [ 
+ 'activtiy' => $activity->export() 
--- a/Controllers/api/v1/newsfeed/single.php
+++ b/Controllers/api/v1/newsfeed/single.php
+ return Factory::response([ 
+ 'status' => 'error', 
+ 'message' => 'You do not have permission to view this post' 
+ ]); 
+ } 
+ 
+ if (!$activity->guid || Helpers\Flags::shouldFail($activity)) { 
+ return Factory::response(['status' => 'error']); 
+ } 
+ 
+ $response = [ 
+ 'activtiy' => $activity->export() 
+ ]; 
+ 
+ //Calculate new permissions object with the entities 
+ if ($activity && Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Controllers/api/v2/boost/feed.php
+++ b/Controllers/api/v2/boost/feed.php
 ]); 
 } 
 
+ $permissions = null; 
+ //Calculate new permissions object with the entities 
+ if ($boosts && Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Controllers/api/v2/entities.php
+++ b/Controllers/api/v2/entities.php
 ->setUser(Session::getLoggedinUser() ?: null) 
 ->setUrns($urns) 
 ->setOpts([ 
- 'asActivities' => $asActivities 
+ 'asActivities' => $asActivities, 
 ]); 
 
 $entities = $resolver->fetch(); 
 
+ $permissions = null; 
+ //Calculate new permissions object with the entities 
+ if (Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Controllers/api/v2/feeds.php
+++ b/Controllers/api/v2/feeds.php
 } 
 } 
 
+ $permissions = null; 
+ //Calculate new permissions object with the entities 
+ if (Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Controllers/api/v2/feeds/container.php
+++ b/Controllers/api/v2/feeds/container.php
 } 
 } 
 
+ $permissions = null; 
+ //Calculate new permissions object with the entities 
+ if (Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Controllers/api/v2/feeds/subscribed.php
+++ b/Controllers/api/v2/feeds/subscribed.php
 } 
 } 
 
+ $permissions = null; 
+ //Calculate new permissions object with the entities 
+ if (Di::_()->get('Features\Manager')->has('permissions')) { 
--- a/Core/Permissions/Permissions.php
+++ b/Core/Permissions/Permissions.php
 /** @var EntitiesBuilder */ 
 private $entitiesBuilder;