- Identity token support

3 files changed, 13 insertions, 18 deletions

diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index b2357bdf3..ba18c5dfa 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -336,20 +336,17 @@ create_response (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Queueing response from plugin with MHD\n");
     //Handle Preflights
-    if (0 == strcmp(meth, MHD_HTTP_METHOD_OPTIONS))
+    if (NULL != allow_origin)
     {
-      if (NULL != allow_origin)
-      {
-        MHD_add_response_header (con_handle->response,
-                                 MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
-                                 allow_origin);
-      }
-      if (NULL != allow_headers)
-      {
-        MHD_add_response_header (con_handle->response,
-                                 "Access-Control-Allow-Headers",
-                                 allow_headers);
-      }
+      MHD_add_response_header (con_handle->response,
+                               MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
+                               allow_origin);
+    }
+    if (NULL != allow_headers)
+    {
+      MHD_add_response_header (con_handle->response,
+                               "Access-Control-Allow-Headers",
+                               allow_headers);
     }
     int ret = MHD_queue_response (con,
                                   con_handle->status,
diff --git a/src/rest/rest.c b/src/rest/rest.c
index 02eca77e0..3a27c6813 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -227,11 +227,9 @@ add_json_resource (struct JsonApiObject *obj,
 {
   struct JsonApiResource *res;
   json_t *type_json;
-  json_t *id_json;
 
-  id_json = json_object_get (res_json, GNUNET_REST_JSONAPI_KEY_ID);
   type_json = json_object_get (res_json, GNUNET_REST_JSONAPI_KEY_TYPE);
-  if (!json_is_string (id_json) || !json_is_string (type_json))
+  if (!json_is_string (type_json))
     return;
   res = GNUNET_new (struct JsonApiResource);
   res->next = NULL;
diff --git a/src/rest/rest.conf b/src/rest/rest.conf
index 2ee3ba4b2..6cd013345 100644
--- a/src/rest/rest.conf
+++ b/src/rest/rest.conf
@@ -1,5 +1,5 @@
 [rest]
 BINARY=gnunet-rest-server
 REST_PORT=7776
-REST_ALLOW_HEADERS=Authorization
-REST_ALLOW_ORIGIN=localhost
+REST_ALLOW_HEADERS=Authorization,Accept,Content-Type
+REST_ALLOW_ORIGIN=*