Support OPTIONS method for all endpoints.

relaxedws · Feb 25, 2016 · 2653252 · 2653252
1 parent 733ffb0
commit 2653252
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 16 deletions.
diff --git a/config/install/relaxed.settings.yml b/config/install/relaxed.settings.yml
@@ -14,6 +14,12 @@ resources:
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
     POST:
       supported_formats:
         - json
@@ -45,6 +51,12 @@ resources:
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
     PUT:
       supported_formats:
         - json
@@ -64,6 +76,12 @@ resources:
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
   relaxed:changes:
     GET:
       supported_formats:
@@ -91,6 +109,12 @@ resources:
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
     PUT:
       supported_formats:
         - json
@@ -111,6 +135,12 @@ resources:
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
   relaxed:local:doc:
     HEAD:
       supported_formats:
@@ -124,6 +154,12 @@ resources:
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
     PUT:
       supported_formats:
         - json
@@ -137,31 +173,61 @@ resources:
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
   relaxed:session:
     GET:
       supported_formats:
         - json
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
   relaxed:ensure_full_commit:
     POST:
       supported_formats:
         - json
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
   relaxed:all_dbs:
     GET:
       supported_formats:
         - json
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
   relaxed:all_docs:
     GET:
       supported_formats:
         - json
       supported_auth:
         - cookie
         - basic_auth
+    OPTIONS:
+      supported_formats:
+        - json
+      supported_auth:
+        - cookie
+        - basic_auth
diff --git a/src/Plugin/rest/resource/ChangesResource.php b/src/Plugin/rest/resource/ChangesResource.php
@@ -28,22 +28,6 @@
  */
 class ChangesResource extends ResourceBase {
 
-  /**
-   * @param $workspace
-   *
-   * @return ResourceResponse
-   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-   */
-  public function options($workspace) {
-    if (!$workspace instanceof WorkspaceInterface) {
-      throw new NotFoundHttpException();
-    }
-    $response = new ResourceResponse(NULL, 204);
-    $response->addCacheableDependency($workspace);
-
-    return $response;
-  }
-
   /**
    * @param $workspace
    *

diff --git a/src/Plugin/rest/resource/ResourceBase.php b/src/Plugin/rest/resource/ResourceBase.php
@@ -1,15 +1,39 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\relaxed\Plugin\rest\resource\ResourceBase.
+ */
+
 namespace Drupal\relaxed\Plugin\rest\resource;
 
 use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\multiversion\Entity\WorkspaceInterface;
 use Drupal\rest\Plugin\ResourceBase as CoreResourceBase;
+use Drupal\rest\ResourceResponse;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 abstract class ResourceBase extends CoreResourceBase implements RelaxedResourceInterface {
 
+  /**
+   * @param $workspace
+   *
+   * @return ResourceResponse
+   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+   */
+  public function options($workspace) {
+    if (!$workspace instanceof WorkspaceInterface) {
+      throw new NotFoundHttpException();
+    }
+    $response = new ResourceResponse(NULL, 204);
+    $response->addCacheableDependency($workspace);
+
+    return $response;
+  }
+
   /**
    * {@inheritdoc}
    */