update
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 27 Sep 2018 17:58:35 +0000 (19:58 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 27 Sep 2018 17:58:35 +0000 (19:58 +0200)
src/rest-plugins/Makefile.am
src/rest-plugins/plugin_rest_openid_connect.c

index a9096b2559d461ebcf03ca143dbdcb99d7539e5a..f119ea9b6fba2551eec32b90fae8b4323f9b3e6a 100644 (file)
@@ -49,8 +49,6 @@ libgnunet_plugin_rest_credential_la_LIBADD = \
   $(top_builddir)/src/credential/libgnunetcredential.la \
        $(top_builddir)/src/rest/libgnunetrest.la \
        $(top_builddir)/src/identity/libgnunetidentity.la \
-       $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
-  $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -lmicrohttpd
 libgnunet_plugin_rest_credential_la_LDFLAGS = \
@@ -121,7 +119,6 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \
        $(top_builddir)/src/identity/libgnunetidentity.la \
        $(top_builddir)/src/reclaim/libgnunetreclaim.la \
        $(top_builddir)/src/rest/libgnunetrest.la \
-       $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
        $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
        $(top_builddir)/src/namestore/libgnunetnamestore.la \
 $(top_builddir)/src/gns/libgnunetgns.la \
index 24673c692bd1ae5c0e7307878341fb6044ee6e9c..2bb60efce63ff1bf91d84be7ef31564f50b68508 100644 (file)
  */
 #define GNUNET_REST_API_NS_LOGIN "/openid/login"
 
-/**
- * Attribute key
- */
-#define GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE "attribute"
-
-/**
- * Ticket key
- */
-#define GNUNET_REST_JSONAPI_IDENTITY_TICKET "ticket"
-
-
-/**
- * Value key
- */
-#define GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE_VALUE "value"
-
 /**
  * State while collecting all egos
  */
@@ -449,11 +433,6 @@ struct RequestHandle
    */
   int response_code;
 
-  /**
-   * Response object
-   */
-  struct GNUNET_JSONAPI_Document *resp_object;
-
 };
 
 /**
@@ -469,8 +448,6 @@ cleanup_handle (struct RequestHandle *handle)
   struct EgoEntry *ego_tmp;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Cleaning up\n");
-  if (NULL != handle->resp_object)
-    GNUNET_JSONAPI_document_delete (handle->resp_object);
   if (NULL != handle->timeout_task)
     GNUNET_SCHEDULER_cancel (handle->timeout_task);
   if (NULL != handle->identity_handle)
@@ -1077,7 +1054,6 @@ login_check (void *cls)
         {
           handle->priv_key = *GNUNET_IDENTITY_ego_get_private_key (
                                                                    handle->ego_entry->ego);
-          handle->resp_object = GNUNET_JSONAPI_document_new ();
           handle->idp = GNUNET_RECLAIM_connect (cfg);
           handle->attr_list = GNUNET_new(
                                          struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList);