ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 23ade52816 into dc759dffd4

pull/723/merge
Mihail Juganaru 2024-06-14 11:55:38 +00:00 committed by GitHub
parent dc759dffd4 23ade52816
commit 43cea66e31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventParticipant.java
View File

@ -46,6 +46,7 @@ public class CDREventParticipant extends CDREventEnd {
// TODO: remove deprecated "participantId" when possible // TODO: remove deprecated "participantId" when possible
json.addProperty("participantId", this.participant.getParticipantPublicId()); json.addProperty("participantId", this.participant.getParticipantPublicId());
json.addProperty("connectionId", this.participant.getParticipantPublicId()); json.addProperty("connectionId", this.participant.getParticipantPublicId());
json.addProperty("role", this.participant.getToken().getRole().toString());
json.addProperty("location", this.participant.getLocation().toString()); json.addProperty("location", this.participant.getLocation().toString());
json.addProperty("ip", this.participant.getLocation().getIp()); json.addProperty("ip", this.participant.getLocation().getIp());
json.addProperty("platform", this.participant.getPlatform()); json.addProperty("platform", this.participant.getPlatform());

2
openvidu-server/src/test/java/io/openvidu/server/test/integration/WebhookIntegrationTest.java
View File

@ -42,6 +42,7 @@ import com.google.gson.JsonObject;
import io.openvidu.client.internal.ProtocolElements; import io.openvidu.client.internal.ProtocolElements;
import io.openvidu.java.client.ConnectionProperties; import io.openvidu.java.client.ConnectionProperties;
import io.openvidu.java.client.OpenViduRole;
import io.openvidu.server.cdr.CallDetailRecord; import io.openvidu.server.cdr.CallDetailRecord;
import io.openvidu.server.core.Participant; import io.openvidu.server.core.Participant;
import io.openvidu.server.core.Session; import io.openvidu.server.core.Session;
@ -154,6 +155,7 @@ public class WebhookIntegrationTest {
Session session = kurentoSessionManager.getSessionWithNotActive(sessionId); Session session = kurentoSessionManager.getSessionWithNotActive(sessionId);
Token token = new Token("token", sessionId, new ConnectionProperties.Builder().build(), null); Token token = new Token("token", sessionId, new ConnectionProperties.Builder().build(), null);
token.setRole(OpenViduRole.PUBLISHER);
String participantPrivateId = "participantPrivateId"; String participantPrivateId = "participantPrivateId";
Participant participant = kurentoSessionManager.newParticipant(session, participantPrivateId, token, null, Participant participant = kurentoSessionManager.newParticipant(session, participantPrivateId, token, null,
mock(GeoLocation.class), "platform", "finalUserId"); mock(GeoLocation.class), "platform", "finalUserId");