wip

Author: tobyzerner

README.md

@@ -1,5 +1,6 @@
 {
     "name": "tobyz/json-api-server",
+    "description": "A fully automated framework-agnostic JSON:API server implementation in PHP.",
     "require": {
         "php": "^7.2",
         "doctrine/inflector": "^1.3",
@@ -19,7 +20,10 @@
         "psr-4": {
             "Tobyz\\JsonApiServer\\": "src/"
         },
-        "files": ["src/functions.php"]
+        "files": [
+            "src/functions.php",
+            "src/functions_laravel.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
@@ -31,6 +35,9 @@
         "helmich/phpunit-json-assert": "^3.0",
         "phpunit/phpunit": "^8.0"
     },
+    "scripts": {
+        "test": "phpunit"
+    },
     "config": {
         "sort-packages": true
     }

composer.json

@@ -208,12 +208,12 @@ private function setValues(array $data, $model, Request $request)
 
             $value = get_value($data, $field);
 
-            if ($setter = $field->getSetter()) {
-                $setter($model, $value, $request);
+            if ($setCallback = $field->getSetCallback()) {
+                $setCallback($model, $value, $request);
                 continue;
             }
 
-            if ($field->getSaver()) {
+            if ($field->getSaveCallback()) {
                 continue;
             }
 

src/Handler/Concerns/SavesData.php

@@ -78,8 +78,8 @@ private function createModel(Request $request)
     private function fillDefaultValues(array &$data, Request $request)
     {
         foreach ($this->resource->getSchema()->getFields() as $field) {
-            if (! has_value($data, $field) && ($default = $field->getDefault())) {
-                set_value($data, $field, $default($request));
+            if (! has_value($data, $field) && ($defaultCallback = $field->getDefaultCallback())) {
+                set_value($data, $field, $defaultCallback($request));
             }
         }
     }

src/Handler/Create.php

@@ -49,7 +49,7 @@ public function handle(Request $request): Response
         run_callbacks($this->resource->getSchema()->getListeners('show'), [$this->model, $request]);
 
         $serializer = new Serializer($this->api, $request);
-        $serializer->addSingle($this->resource, $this->model, $include);
+        $serializer->add($this->resource, $this->model, $include, true);
 
         return new JsonApiResponse(
             new CompoundDocument(

src/Handler/Show.php

@@ -17,11 +17,13 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Tobyz\JsonApiServer\Adapter\AdapterInterface;
 use Tobyz\JsonApiServer\Exception\BadRequestException;
+use Tobyz\JsonApiServer\Exception\ForbiddenException;
 use Tobyz\JsonApiServer\Exception\InternalServerErrorException;
 use Tobyz\JsonApiServer\Exception\MethodNotAllowedException;
 use Tobyz\JsonApiServer\Exception\NotAcceptableException;
 use Tobyz\JsonApiServer\Exception\NotImplementedException;
 use Tobyz\JsonApiServer\Exception\ResourceNotFoundException;
+use Tobyz\JsonApiServer\Exception\UnauthorizedException;
 use Tobyz\JsonApiServer\Exception\UnsupportedMediaTypeException;
 use Tobyz\JsonApiServer\Handler\Concerns\FindsResources;
 use Tobyz\JsonApiServer\Http\MediaTypes;
@@ -34,6 +36,7 @@ final class JsonApi implements RequestHandlerInterface
 
     private $resources = [];
     private $baseUrl;
+    private $authenticated = false;
 
     public function __construct(string $baseUrl)
     {
@@ -50,6 +53,8 @@ public function resource(string $type, AdapterInterface $adapter, callable $buil
 
     /**
      * Get defined resource types.
+     *
+     * @return ResourceType[]
      */
     public function getResources(): array
     {
@@ -209,6 +214,10 @@ public function error($e)
             $e = new InternalServerErrorException;
         }
 
+        if (! $this->authenticated && $e instanceof ForbiddenException) {
+            $e = new UnauthorizedException;
+        }
+
         $errors = $e->getJsonApiErrors();
         $status = $e->getJsonApiStatus();
 
@@ -226,4 +235,12 @@ public function getBaseUrl(): string
     {
         return $this->baseUrl;
     }
+
+    /**
+     * Indicate that the consumer is authenticated.
+     */
+    public function authenticated(): void
+    {
+        $this->authenticated = true;
+    }
 }

src/JsonApi.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Forust.
+ *
+ * (c) Toby Zerner <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Tobyz\JsonApiServer\Schema\Concerns;
+
+use Tobyz\JsonApiServer\Schema\Meta;
+
+trait HasMeta
+{
+    private $meta = [];
+
+    /**
+     * Add a meta attribute.
+     */
+    public function meta(string $name, callable $value): Meta
+    {
+        return $this->meta[$name] = new Meta($name, $value);
+    }
+
+    /**
+     * Remove a meta attribute.
+     */
+    public function removeMeta(string $name): void
+    {
+        unset($this->meta[$name]);
+    }
+
+    /**
+     * Get the meta attributes.
+     *
+     * @return Meta[]
+     */
+    public function getMeta(): array
+    {
+        return $this->meta;
+    }
+}

src/Schema/Concerns/HasMeta.php

@@ -11,8 +11,12 @@
 
 namespace Tobyz\JsonApiServer\Schema;
 
+use Tobyz\JsonApiServer\Schema\Concerns\HasMeta;
+
 abstract class Relationship extends Field
 {
+    use HasMeta;
+
     private $type;
     private $linkage = false;
     private $links = true;

src/Schema/Relationship.php

@@ -12,14 +12,14 @@
 namespace Tobyz\JsonApiServer\Schema;
 
 use Tobyz\JsonApiServer\Schema\Concerns\HasListeners;
+use Tobyz\JsonApiServer\Schema\Concerns\HasMeta;
 use function Tobyz\JsonApiServer\negate;
 
 final class Type
 {
-    use HasListeners;
+    use HasListeners, HasMeta;
 
     private $fields = [];
-    private $meta = [];
     private $filters = [];
     private $sortFields = [];
     private $perPage = 20;
@@ -95,32 +95,6 @@ public function getFields(): array
         return $this->fields;
     }
 
-    /**
-     * Add a meta attribute to the resource type.
-     */
-    public function meta(string $name, callable $value): Meta
-    {
-        return $this->meta[$name] = new Meta($name, $value);
-    }
-
-    /**
-     * Remove a meta attribute from the resource type.
-     */
-    public function removeMeta(string $name): void
-    {
-        unset($this->meta[$name]);
-    }
-
-    /**
-     * Get the resource type's meta attributes.
-     *
-     * @return Meta[]
-     */
-    public function getMeta(): array
-    {
-        return $this->meta;
-    }
-
     /**
      * Add a filter to the resource type.
      */