Merge pull request #18 from pdsinterop/feature/resources-api

Add resources api calls

Author: Potherca

bin/serve-docker-dev.sh

@@ -4,15 +4,9 @@
 
 docker run                          \
   -i                                \
-  --env 'ENVIRONMENT=development'   \
-  --expose 80                       \
-  --name php-solid-server           \
+  --expose 443                      \
+  --name server                     \
   --network host                    \
   --rm                              \
   --volume "${PWD}:/app"            \
-  "php:${PHP_VERSION:-7.1}-alpine"  \
-  php                               \
-    --define 'log_errors=On'        \
-    --docroot /app/web/             \
-    --server '0.0.0.0:80'           \
-    /app/web/index.php
+  "${DOCKER_IMAGE:=php-solid-server}"

composer.json

@@ -30,6 +30,7 @@
         "league/route": "^4.5",
         "pdsinterop/flysystem-rdf": "dev-dev",
         "pdsinterop/solid-auth": "dev-master",
+        "pdsinterop/solid-crud": "dev-master",
         "php-http/httplug": "^2.1",
         "phptal/phptal": "^1.4"
     },
@@ -42,5 +43,10 @@
         "serve-dev-docker":"bash ./bin/serve-docker-dev.sh",
         "test":"phpunit"
     },
+    "scripts-descriptions": {
+      "serve-dev": "Run the application with the internal PHP development server",
+      "serve-dev-docker": "Run the application with the docker image provided by the TestSuite repo.",
+      "test": "Run unit-test with PHPUnit"
+    },
     "type": "project"
 }

src/Controller/ResourceController.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);
+
+namespace Pdsinterop\Solid\Controller;
+
+use Pdsinterop\Solid\Resources\Server;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+class ResourceController extends AbstractController
+{
+    ////////////////////////////// CLASS PROPERTIES \\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+    /** @var Server */
+    private $server;
+
+    //////////////////////////////// PUBLIC API \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+    final public function __construct(Server $server)
+    {
+        $this->server = $server;
+    }
+
+    final public function __invoke(Request $request, array $args) : Response
+    {
+        return $this->server->respondToRequest($request);
+    }
+}

web/index.php

@@ -18,8 +18,8 @@
 use League\Route\Strategy\ApplicationStrategy;
 
 use Pdsinterop\Solid\Controller\AddSlashToPathController;
-use Pdsinterop\Solid\Controller\AuthorizeController;
 use Pdsinterop\Solid\Controller\ApprovalController;
+use Pdsinterop\Solid\Controller\AuthorizeController;
 use Pdsinterop\Solid\Controller\CorsController;
 use Pdsinterop\Solid\Controller\HandleApprovalController;
 use Pdsinterop\Solid\Controller\HelloWorldController;
@@ -31,7 +31,9 @@
 use Pdsinterop\Solid\Controller\Profile\CardController;
 use Pdsinterop\Solid\Controller\Profile\ProfileController;
 use Pdsinterop\Solid\Controller\RegisterController;
+use Pdsinterop\Solid\Controller\ResourceController;
 use Pdsinterop\Solid\Controller\TokenController;
+use Pdsinterop\Solid\Resources\Server as ResourceServer;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -80,6 +82,16 @@
     return $template;
 });
 
+$container->add(ResourceController::class, function () use ($container) {
+    $filesystem = $container-> get(FilesystemInterface::class);
+
+    require_once __DIR__ . '/../lib/solid-crud/src/Server.php';
+
+    $server = new ResourceServer($filesystem, new Response());
+
+    return new ResourceController($server);
+});
+
 $controllers = [
     AddSlashToPathController::class,
 	ApprovalController::class,
@@ -149,6 +161,23 @@
 $router->map('POST', '/token', TokenController::class)->setScheme($scheme);
 $router->map('POST', '/token/', TokenController::class)->setScheme($scheme);
 
+$router->group('/data', static function (\League\Route\RouteGroup $group) {
+    $methods = [
+        'DELETE',
+        'GET',
+        'HEAD',
+        // 'OPTIONS', // @TODO: This breaks because of the CorsController being added to `OPTION /*` in the index.php
+        'PATCH',
+        'POST',
+        'PUT',
+    ];
+
+    array_walk($methods, static function ($method) use (&$group) {
+        $group->map($method, '/', AddSlashToPathController::class);
+        $group->map($method, '{path:.*}', ResourceController::class);
+    });
+})->setScheme($scheme);
+
 try {
     $response = $router->dispatch($request);
 } catch (HttpException $exception) {