Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-context: Move credentials to context
[src/app-framework-binder.git]
/
src
/
afb-supervision.c
diff --git
a/src/afb-supervision.c
b/src/afb-supervision.c
index
df04580
..
259b256
100644
(file)
--- a/
src/afb-supervision.c
+++ b/
src/afb-supervision.c
@@
-34,7
+34,6
@@
#define AFB_BINDING_VERSION 3
#include <afb/afb-binding.h>
#define AFB_BINDING_VERSION 3
#include <afb/afb-binding.h>
-#include "afb-cred.h"
#include "afb-api.h"
#include "afb-apiset.h"
#include "afb-api-so-v2.h"
#include "afb-api.h"
#include "afb-apiset.h"
#include "afb-api-so-v2.h"
@@
-47,6
+46,7
@@
#include "afb-stub-ws.h"
#include "afb-debug.h"
#include "afb-fdev.h"
#include "afb-stub-ws.h"
#include "afb-debug.h"
#include "afb-fdev.h"
+#include "afb-error-text.h"
#include "verbose.h"
#include "wrap-json.h"
#include "jobs.h"
#include "verbose.h"
#include "wrap-json.h"
#include "jobs.h"
@@
-340,11
+340,11
@@
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
if (wrap_json_unpack(args, "s", &uuid))
wrap_json_unpack(args, "{ss}", "uuid", &uuid);
if (!uuid)
if (wrap_json_unpack(args, "s", &uuid))
wrap_json_unpack(args, "{ss}", "uuid", &uuid);
if (!uuid)
- afb_xreq_reply(xreq, NULL,
"invalid"
, NULL);
+ afb_xreq_reply(xreq, NULL,
afb_error_text_invalid_request
, NULL);
else {
session = afb_session_search(uuid);
if (!session)
else {
session = afb_session_search(uuid);
if (!session)
- afb_xreq_reply(xreq, NULL,
"not-found"
, NULL);
+ afb_xreq_reply(xreq, NULL,
afb_error_text_unknown_session
, NULL);
else {
afb_session_close(session);
afb_session_unref(session);
else {
afb_session_close(session);
afb_session_unref(session);
@@
-381,20
+381,19
@@
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
}
afb_req_success(req, NULL, NULL);
#else
}
afb_req_success(req, NULL, NULL);
#else
- afb_req_reply(req, NULL,
"not-available"
, NULL);
+ afb_req_reply(req, NULL,
afb_error_text_not_available
, NULL);
#endif
break;
case Do:
sub = NULL;
if (wrap_json_unpack(args, "{ss ss s?o*}", "api", &api, "verb", &verb, "args", &sub))
#endif
break;
case Do:
sub = NULL;
if (wrap_json_unpack(args, "{ss ss s?o*}", "api", &api, "verb", &verb, "args", &sub))
- afb_xreq_reply(xreq, NULL,
"error", "bad request"
);
+ afb_xreq_reply(xreq, NULL,
afb_error_text_invalid_request, NULL
);
else {
xapi = afb_apiset_lookup_started(global.apiset, api, 1);
if (!xapi)
afb_xreq_reply_unknown_api(xreq);
else {
else {
xapi = afb_apiset_lookup_started(global.apiset, api, 1);
if (!xapi)
afb_xreq_reply_unknown_api(xreq);
else {
- afb_cred_unref(xreq->cred);
- xreq->cred = NULL;
+ afb_context_change_cred(&xreq->context, NULL);
xreq->request.called_api = api;
xreq->request.called_verb = verb;
xreq->json = json_object_get(sub);
xreq->request.called_api = api;
xreq->request.called_verb = verb;
xreq->json = json_object_get(sub);