Release/0.19.0

src/Acl/Entity/Access.php

@@ -28,10 +28,10 @@
  * @ApiResource(
  *      attributes={
  *          "normalization_context"={
- *              "groups"={"access_output", "permission_output", "scope_output"}
+ *              "groups"={"access_output", "permission_output"}
  *          },
  *          "denormalization_context"={
- *              "groups"={"access_input", "permission_input", "scope_input"}
+ *              "groups"={"access_input", "permission_input"}
  *          },
  *          "filters"={
  *              "ds_acl.access.search",
@@ -80,8 +80,9 @@ class Access implements Identifiable, Uuidentifiable, Ownable, Assignable, Versi
 
     /**
      * @var \DateTime
-     * @ApiProperty(writable=false)
-     * @Serializer\Groups({"access_output"})
+     * @ApiProperty
+     * @Serializer\Groups({"access_output", "access_input"})
+     * @Assert\DateTime
      */
     protected $createdAt;
 

src/Acl/Entity/Attribute/Accessor/Scope.php

@@ -2,7 +2,7 @@
 
 namespace Ds\Component\Acl\Entity\Attribute\Accessor;
 
-use Ds\Component\Acl\Entity\Scope as ScopeEntity;
+use LogicException;
 
 /**
  * Trait Scope
@@ -14,10 +14,11 @@ trait Scope
     /**
      * Set scope
      *
-     * @param \Ds\Component\Acl\Entity\Scope $scope
+     * @param array $scope
      * @return object
+     * @throws
      */
-    public function setScope(?ScopeEntity $scope)
+    public function setScope(?array $scope)
     {
         $this->scope = $scope;
 
@@ -27,10 +28,52 @@ public function setScope(?ScopeEntity $scope)
     /**
      * Get scope
      *
-     * @return \Ds\Component\Acl\Entity\Scope
+     * @return array
      */
-    public function getScope(): ?ScopeEntity
+    public function getScope(): ?array
     {
         return $this->scope;
     }
+
+    /**
+     * Get scope operator
+     *
+     * @return string
+     */
+    public function getScopeOperator(): ?string
+    {
+        $operator = 'and';
+
+        if (isset($this->scope['operator'])) {
+            if (!in_array($this->scope['operator'], ['and', 'or'], true)) {
+                throw new LogicException('Permission scope operator is not valid.');
+            }
+
+            $operator = $this->scope['operator'];
+        }
+
+        return $operator;
+    }
+
+    /**
+     * Get scope conditions
+     *
+     * @return array
+     */
+    public function getScopeConditions(): array
+    {
+        $conditions = [];
+
+        if (isset($this->scope['conditions'])) {
+            if (!is_array($this->scope['conditions'])) {
+                throw new LogicException('Permission scope consitions is not valid.');
+            }
+
+            $conditions = $this->scope['conditions'];
+        } else if ($this->scope) {
+            $conditions = [$this->scope];
+        }
+
+        return $conditions;
+    }
 }

src/Acl/Entity/Permission.php

@@ -24,12 +24,12 @@
 class Permission implements Identifiable, Tenantable
 {
     use Accessor\Id;
-    use EntityAccessor\Scope;
     use EntityAccessor\Access;
     use Accessor\Key;
     use Accessor\Type;
     use Accessor\Value;
     use Accessor\Attributes;
+    use EntityAccessor\Scope;
     use TenantAccessor\Tenant;
 
     /**
@@ -48,13 +48,6 @@ class Permission implements Identifiable, Tenantable
      */
     private $access;
 
-    /**
-     * @var string
-     * @Serializer\Groups({"permission_output", "permission_input"})
-     * @ORM\Embedded(class="Scope")
-     */
-    private $scope;
-
     /**
      * @var string
      * @Serializer\Groups({"permission_output", "permission_input"})
@@ -86,6 +79,13 @@ class Permission implements Identifiable, Tenantable
      */
     private $attributes;
 
+    /**
+     * @var string
+     * @Serializer\Groups({"permission_output", "permission_input"})
+     * @ORM\Column(name="scope", type="json_array")
+     */
+    private $scope;
+
     /**
      * @var string
      * @ORM\Column(name="tenant", type="guid")

src/Acl/EventListener/ExceptionListener.php

@@ -29,7 +29,8 @@ public function kernelException(GetResponseForExceptionEvent $event)
 
         // In the event a user requests a list of entities and has no permissions,
         // an empty list is returned.
-        $response = new JsonResponse([]);
+        $response = new JsonResponse([], 200);
         $event->setResponse($response);
+        $event->allowCustomResponseCode();
     }
 }

src/Acl/Fixture/Access.php

@@ -2,6 +2,7 @@
 
 namespace Ds\Component\Acl\Fixture;
 
+use DateTime;
 use Doctrine\Common\Persistence\ObjectManager;
 use Ds\Component\Acl\Entity\Access as AccessEntity;
 use Ds\Component\Database\Fixture\Yaml;
@@ -36,6 +37,13 @@ public function load(ObjectManager $manager)
                 ->setAssignee($object->assignee)
                 ->setAssigneeUuid($object->assignee_uuid)
                 ->setTenant($object->tenant);
+
+            if (null !== $object->created_at) {
+                $date = new DateTime;
+                $date->setTimestamp($object->created_at);
+                $access->setCreatedAt($date);
+            }
+
             $manager->persist($access);
         }