afb-proto-ws: Improve comment and names

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

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index d538fc6..b3b2e58 100644 (file)
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -44,6 +44,7 @@
 #include "afb-evt.h"
 #include "afb-xreq.h"
 #include "afb-token.h"
+#include "afb-error-text.h"
 #include "verbose.h"
 #include "fdev.h"
 #include "jobs.h"
@@ -144,7 +145,6 @@ static void server_req_destroy_cb(struct afb_xreq *xreq)
        struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
        afb_context_disconnect(&wreq->xreq.context);
-       afb_cred_unref(wreq->xreq.cred);
        json_object_put(wreq->xreq.json);
        afb_proto_ws_call_unref(wreq->call);
        afb_stub_ws_unref(wreq->stubws);
@@ -262,7 +262,7 @@ static void client_api_call_cb(void * closure, struct afb_xreq *xreq)
 
        proto = client_get_proto(stubws);
        if (proto == NULL) {
-               afb_xreq_reply(xreq, NULL, "disconnected", "server hung up");
+               afb_xreq_reply(xreq, NULL, afb_error_text_disconnected, NULL);
                return;
        }
 
@@ -279,7 +279,7 @@ static void client_api_call_cb(void * closure, struct afb_xreq *xreq)
                                xreq_on_behalf_cred_export(xreq));
        }
        if (rc < 0) {
-               afb_xreq_reply(xreq, NULL, "internal", "can't send message");
+               afb_xreq_reply(xreq, NULL, afb_error_text_internal_error, "can't send message");
                afb_xreq_unhooked_unref(xreq);
        }
 }
@@ -525,10 +525,10 @@ static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, con
        wreq->call = call;
 
        /* init the context */
-       afb_context_init(&wreq->xreq.context, session, token);
+       afb_context_init(&wreq->xreq.context, session, token, stubws->cred);
+       afb_context_on_behalf_import(&wreq->xreq.context, user_creds);
 
        /* makes the call */
-       wreq->xreq.cred = afb_cred_mixed_on_behalf_import(stubws->cred, &wreq->xreq.context, user_creds);
        wreq->xreq.request.called_api = stubws->apiname;
        wreq->xreq.request.called_verb = verb;
        wreq->xreq.json = args;
@@ -539,7 +539,7 @@ out_of_memory:
 no_session:
        json_object_put(args);
        afb_stub_ws_unref(stubws);
-       afb_proto_ws_call_reply(call, NULL, "internal-error", NULL);
+       afb_proto_ws_call_reply(call, NULL, afb_error_text_internal_error, NULL);
        afb_proto_ws_call_unref(call);
 }