/*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2015-2020 "IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include <json-c/json.h>
#include "afb-msg-json.h"
+#include "afb-context.h"
+static const char _success_[] = "success";
-struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, const char *token, const char *uuid)
+struct json_object *afb_msg_json_reply(struct json_object *resp, const char *error, const char *info, struct afb_context *context)
{
json_object *msg, *request;
-
- request = json_object_new_object();
- json_object_object_add(request, "status", json_object_new_string(status));
- if (info != NULL)
- json_object_object_add(request, "info", json_object_new_string(info));
- if (token != NULL)
- json_object_object_add(request, "token", json_object_new_string(token));
- if (uuid != NULL)
- json_object_object_add(request, "uuid", json_object_new_string(uuid));
+ json_object *type_reply = NULL;
msg = json_object_new_object();
- json_object_object_add(msg, "jtype", json_object_new_string("afb-reply"));
- json_object_object_add(msg, "request", request);
if (resp != NULL)
json_object_object_add(msg, "response", resp);
+ type_reply = json_object_new_string("afb-reply");
+ json_object_object_add(msg, "jtype", type_reply);
+
+ request = json_object_new_object();
+ json_object_object_add(msg, "request", request);
+ json_object_object_add(request, "status", json_object_new_string(error ?: _success_));
+
+ if (info != NULL)
+ json_object_object_add(request, "info", json_object_new_string(info));
+
return msg;
}
struct json_object *afb_msg_json_event(const char *event, struct json_object *object)
{
json_object *msg;
+ json_object *type_event = NULL;
msg = json_object_new_object();
- json_object_object_add(msg, "jtype", json_object_new_string("afb-event"));
+
json_object_object_add(msg, "event", json_object_new_string(event));
+
if (object != NULL)
json_object_object_add(msg, "data", object);
+ type_event = json_object_new_string("afb-event");
+ json_object_object_add(msg, "jtype", type_event);
+
return msg;
}
+