diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/Participant.java b/openvidu-server/src/main/java/io/openvidu/server/core/Participant.java index 0da4aa25..0b1a5a56 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/Participant.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/Participant.java @@ -271,7 +271,9 @@ public class Participant { public JsonObject toJson() { JsonObject json = new JsonObject(); - json.addProperty("connectionId", this.participantPublicId); + json.addProperty("id", this.participantPublicId); + json.addProperty("object", "connection"); + json.addProperty("connectionId", this.participantPublicId); // TODO: deprecated. Better use only "id" json.addProperty("sessionId", this.sessionId); json.addProperty("createdAt", this.createdAt); json.addProperty("location", this.location != null ? this.location.toString() : "unknown"); diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/Session.java b/openvidu-server/src/main/java/io/openvidu/server/core/Session.java index c521686e..1b6e88b5 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/Session.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/Session.java @@ -224,8 +224,9 @@ public class Session implements SessionInterface { private JsonObject sharedJson(Function toJsonFunction) { JsonObject json = new JsonObject(); - json.addProperty("sessionId", this.sessionId); - json.addProperty("id", this.sessionId); // TODO: deprecated. Better use only "sessionId" + json.addProperty("id", this.sessionId); + json.addProperty("object", "session"); + json.addProperty("sessionId", this.sessionId); // TODO: deprecated. Better use only "id" json.addProperty("createdAt", this.startTime); json.addProperty("mediaMode", this.sessionProperties.mediaMode().name()); json.addProperty("recordingMode", this.sessionProperties.recordingMode().name()); diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/Token.java b/openvidu-server/src/main/java/io/openvidu/server/core/Token.java index 5e707316..220d19f8 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/Token.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/Token.java @@ -91,8 +91,9 @@ public class Token { public JsonObject toJson() { JsonObject json = new JsonObject(); - json.addProperty("token", this.getToken()); json.addProperty("id", this.getToken()); + json.addProperty("object", "token"); + json.addProperty("token", this.getToken()); json.addProperty("connectionId", this.getConnectionId()); json.addProperty("session", this.sessionId); json.addProperty("role", this.getRole().toString()); @@ -104,6 +105,25 @@ public class Token { return json; } + public JsonObject toJsonAsParticipant() { + JsonObject json = new JsonObject(); + json.addProperty("id", this.getConnectionId()); + json.addProperty("object", "connection"); + json.addProperty("connectionId", this.getConnectionId()); // DEPRECATED: better use id + json.addProperty("sessionId", this.sessionId); + json.add("createdAt", null); + json.add("location", null); + json.add("platform", null); + json.addProperty("token", this.getToken()); + json.addProperty("role", this.getRole().toString()); + json.addProperty("serverData", this.getServerMetadata()); + json.addProperty("record", this.record()); + json.add("clientData", null); + json.add("publishers", null); + json.add("subscribers", null); + return json; + } + @Override public String toString() { if (this.role != null) diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java index 72b3cca4..31d74da9 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java @@ -152,9 +152,9 @@ public class Kms { public JsonObject toJson() { JsonObject json = new JsonObject(); json.addProperty("id", this.id); + json.addProperty("object", "mediaNode"); json.addProperty("ip", this.ip); json.addProperty("uri", this.uri); - final boolean connected = this.isKurentoClientConnected(); json.addProperty("connected", connected); json.addProperty("connectionTime", this.getTimeOfKurentoClientConnection()); diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java index bcaf216a..326f468a 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java @@ -191,6 +191,7 @@ public class Recording { public JsonObject toJson() { JsonObject json = new JsonObject(); json.addProperty("id", this.id); + json.addProperty("object", "recording"); json.addProperty("name", this.recordingProperties.name()); json.addProperty("outputMode", this.getOutputMode().name()); if (RecordingUtils.IS_COMPOSED(this.recordingProperties.outputMode()) && this.hasVideo) {