diff --git a/openvidu-browser/src/OpenVidu/OpenVidu.ts b/openvidu-browser/src/OpenVidu/OpenVidu.ts index 60e421d9..e4f0fa49 100644 --- a/openvidu-browser/src/OpenVidu/OpenVidu.ts +++ b/openvidu-browser/src/OpenVidu/OpenVidu.ts @@ -32,7 +32,7 @@ import { PlatformUtils } from '../OpenViduInternal/Utils/Platform'; import * as screenSharingAuto from '../OpenViduInternal/ScreenSharing/Screen-Capturing-Auto'; import * as screenSharing from '../OpenViduInternal/ScreenSharing/Screen-Capturing'; -import {OpenViduLoggerConfiguration} from "../OpenViduInternal/Logger/OpenViduLoggerConfiguration"; +import { OpenViduLoggerConfiguration } from "../OpenViduInternal/Logger/OpenViduLoggerConfiguration"; /** * @hidden */ @@ -100,6 +100,10 @@ export class OpenVidu { * @hidden */ role: string; + /** + * @hidden + */ + finalUserId: string; /** * @hidden */ diff --git a/openvidu-browser/src/OpenVidu/Session.ts b/openvidu-browser/src/OpenVidu/Session.ts index 2635f8dd..d31c4cff 100644 --- a/openvidu-browser/src/OpenVidu/Session.ts +++ b/openvidu-browser/src/OpenVidu/Session.ts @@ -1464,7 +1464,7 @@ export class Session extends EventDispatcher { if (!!webrtcStatsInterval) { this.openvidu.webrtcStatsInterval = +webrtcStatsInterval; } - if(!!sendBrowserLogs) { + if (!!sendBrowserLogs) { this.openvidu.sendBrowserLogs = sendBrowserLogs; } @@ -1486,6 +1486,7 @@ export class Session extends EventDispatcher { logger.log('TURN temp credentials [' + opts.turnUsername + ':' + opts.turnCredential + ']'); } this.openvidu.role = opts.role; + this.openvidu.finalUserId = opts.finalUserId; this.capabilities = { subscribe: true, publish: this.openvidu.role !== 'SUBSCRIBER', diff --git a/openvidu-browser/src/OpenViduInternal/Interfaces/Private/LocalConnectionOptions.ts b/openvidu-browser/src/OpenViduInternal/Interfaces/Private/LocalConnectionOptions.ts index b53c4940..028410cc 100644 --- a/openvidu-browser/src/OpenViduInternal/Interfaces/Private/LocalConnectionOptions.ts +++ b/openvidu-browser/src/OpenViduInternal/Interfaces/Private/LocalConnectionOptions.ts @@ -19,6 +19,7 @@ import { RemoteConnectionOptions } from './RemoteConnectionOptions'; export interface LocalConnectionOptions { id: string; + finalUserId: string; createdAt: number; metadata: string; value: RemoteConnectionOptions[]; diff --git a/openvidu-client/src/main/java/io/openvidu/client/internal/ProtocolElements.java b/openvidu-client/src/main/java/io/openvidu/client/internal/ProtocolElements.java index 23bed85e..ba3468e6 100644 --- a/openvidu-client/src/main/java/io/openvidu/client/internal/ProtocolElements.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/ProtocolElements.java @@ -144,6 +144,7 @@ public class ProtocolElements { public static final String PARTICIPANTJOINED_METHOD = "participantJoined"; public static final String PARTICIPANTJOINED_USER_PARAM = "id"; + public static final String PARTICIPANTJOINED_FINALUSERID_PARAM = "finalUserId"; public static final String PARTICIPANTJOINED_CREATEDAT_PARAM = "createdAt"; public static final String PARTICIPANTJOINED_METADATA_PARAM = "metadata"; public static final String PARTICIPANTJOINED_VALUE_PARAM = "value"; diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java b/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java index 5f89f474..45c5523e 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java @@ -153,6 +153,7 @@ public class SessionEventsHandler { } } result.addProperty(ProtocolElements.PARTICIPANTJOINED_USER_PARAM, participant.getParticipantPublicId()); + result.addProperty(ProtocolElements.PARTICIPANTJOINED_FINALUSERID_PARAM, participant.getFinalUserId()); result.addProperty(ProtocolElements.PARTICIPANTJOINED_CREATEDAT_PARAM, participant.getActiveAt()); result.addProperty(ProtocolElements.PARTICIPANTJOINED_METADATA_PARAM, participant.getFullMetadata()); result.add(ProtocolElements.PARTICIPANTJOINED_VALUE_PARAM, resultArray);