Use afb_token in contexts

[src/app-framework-binder.git] / src / afb-xreq.c

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 790a384..7621b80 100644 (file)
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -206,8 +206,6 @@ int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
                ERROR("request replied, subscription impossible");
                errno = EINVAL;
        } else {
-               if (xreq->listener)
-                       return afb_evt_event_x2_add_watch(xreq->listener, event);
                if (xreq->queryitf->subscribe)
                        return xreq->queryitf->subscribe(xreq, event);
                ERROR("no event listener, subscription impossible");
@@ -233,8 +231,6 @@ int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
                ERROR("request replied, unsubscription impossible");
                errno = EINVAL;
        } else {
-               if (xreq->listener)
-                       return afb_evt_event_x2_remove_watch(xreq->listener, event);
                if (xreq->queryitf->unsubscribe)
                        return xreq->queryitf->unsubscribe(xreq, event);
                ERROR("no event listener, unsubscription impossible");
@@ -324,7 +320,7 @@ static struct json_object *xreq_get_client_info_cb(struct afb_req_x2 *closure)
                json_object_object_add(r, "id", json_object_new_string(xreq->cred->id));
        }
        if (xreq->context.session) {
-               json_object_object_add(r, "uuid", json_object_new_string(afb_context_uuid(&xreq->context)));
+               json_object_object_add(r, "uuid", json_object_new_string(afb_context_uuid(&xreq->context)?:""));
                json_object_object_add(r, "LOA", json_object_new_int(afb_context_get_loa(&xreq->context)));
        }
        return r;
@@ -764,9 +760,6 @@ static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
                }
        }
 
-       if ((sessionflags & AFB_SESSION_RENEW_X1) != 0) {
-               afb_context_refresh(&xreq->context);
-       }
        if ((sessionflags & AFB_SESSION_CLOSE_X1) != 0) {
                afb_context_change_loa(&xreq->context, 0);
                afb_context_close(&xreq->context);
@@ -802,9 +795,6 @@ static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionfl
                return -1;
        }
 
-       if ((sessionflags & AFB_SESSION_REFRESH_X2) != 0) {
-               afb_context_refresh(&xreq->context);
-       }
        if ((sessionflags & AFB_SESSION_CLOSE_X2) != 0) {
                afb_context_close(&xreq->context);
        }