Commit a0d65a0b authored by jan.koester's avatar jan.koester
Browse files

test

parent c48f9107
Loading
Loading
Loading
Loading
Loading
+16 −0
Changes for client/client.cpp: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -473,6 +473,22 @@ void Client::SessionInfo(class SessionData& sdat) {
                sdat._uid      = json_object_get_string(json_object_object_get(val, "userid"));
                sdat._username = json_object_get_string(json_object_object_get(val, "username"));
                sdat._did      = json_object_get_string(json_object_object_get(val, "domainid"));

                json_object* jmembers = json_object_object_get(val, "members");
                if (jmembers && json_object_get_type(jmembers) == json_type_array) {
                    sdat._members.clear();
                    int mcount = json_object_array_length(jmembers);
                    for (int mi = 0; mi < mcount; ++mi) {
                        json_object* jmid = json_object_array_get_idx(jmembers, mi);
                        if (json_object_get_type(jmid) == json_type_string) {
                            try {
                                uuid::uuid member(json_object_get_string(jmid));
                                sdat._members.emplace_back(member);
                            } catch (...) {
                            }
                        }
                    }
                }
            }
        }
    }
+9 −0
Changes for src/api.cpp: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -606,6 +606,15 @@ public:
                    json_object_object_add(respid, "domainid",
                                           json_object_new_string(tmp.c_str()));

                    std::vector<uuid::uuid> members;
                    _SessionData->getMembers(members);
                    json_object* members_arr = json_object_new_array();
                    for (const auto& member : members) {
                        json_object_array_add(members_arr,
                                              json_object_new_string(member.c_str()));
                    }
                    json_object_object_add(respid, "members", members_arr);

                    json_object* sinfo = json_object_new_object();
                    json_object_object_add(sinfo, "sessioninfo", respid);
                    json_object_array_add(response, sinfo);