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

openvidu-browser: get openviduServerUrl from token in VB

pull/722/head
pabloFuente 2022-04-28 12:10:26 +02:00
parent 2e39243070
commit 1517be875a
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openvidu-browser/src/OpenVidu/Session.ts
View File

@ -1370,13 +1370,14 @@ export class Session extends EventDispatcher {
}, {}); }, {});
return { return {
url,
sessionId: queryParams['sessionId'], sessionId: queryParams['sessionId'],
secret: queryParams['secret'], secret: queryParams['secret'],
recorder: queryParams['recorder'], recorder: queryParams['recorder'],
webrtcStatsInterval: queryParams['webrtcStatsInterval'], webrtcStatsInterval: queryParams['webrtcStatsInterval'],
sendBrowserLogs: queryParams['sendBrowserLogs'], sendBrowserLogs: queryParams['sendBrowserLogs'],
edition: queryParams['edition'] edition: queryParams['edition'],
wsUri = 'wss://' + url.host + '/openvidu',
httpUri = 'https://' + url.host
}; };
} else { } else {
@ -1519,8 +1520,8 @@ export class Session extends EventDispatcher {
this.openvidu.isAtLeastPro = tokenParams.edition === 'pro' || tokenParams.edition === 'enterprise'; this.openvidu.isAtLeastPro = tokenParams.edition === 'pro' || tokenParams.edition === 'enterprise';
this.openvidu.isEnterprise = tokenParams.edition === 'enterprise'; this.openvidu.isEnterprise = tokenParams.edition === 'enterprise';
this.openvidu.wsUri = 'wss://' + tokenParams.url.host + '/openvidu'; this.openvidu.wsUri = tokenParams.wsUri;
this.openvidu.httpUri = 'https://' + tokenParams.url.host; this.openvidu.httpUri = tokenParams.httpUri;
} }
private processJoinRoomResponse(opts: LocalConnectionOptions, token: string) { private processJoinRoomResponse(opts: LocalConnectionOptions, token: string) {

12
openvidu-browser/src/OpenVidu/Stream.ts
View File

@ -365,15 +365,9 @@ export class Stream {
return reject(new OpenViduError(OpenViduErrorName.VIRTUAL_BACKGROUND_ERROR, 'Virtual Background requires the client to be connected to a Session or to have a "token" property available in "options" parameter with a valid OpenVidu token')); return reject(new OpenViduError(OpenViduErrorName.VIRTUAL_BACKGROUND_ERROR, 'Virtual Background requires the client to be connected to a Session or to have a "token" property available in "options" parameter with a valid OpenVidu token'));
} }
if (!!this.session.token && !this.session.openvidu.isAtLeastPro) { const tokenParams = this.session.getTokenParams(openviduToken);
// Check OpenVidu edition after connection to the Session if (tokenParams.edition !== 'pro' && tokenParams.edition !== 'enterprise') {
return reject(new OpenViduError(OpenViduErrorName.VIRTUAL_BACKGROUND_ERROR, 'OpenVidu Virtual Background API is available from OpenVidu Pro edition onwards')); return reject(new OpenViduError(OpenViduErrorName.VIRTUAL_BACKGROUND_ERROR, 'OpenVidu Virtual Background API is available from OpenVidu Pro edition onwards'));
} else {
// Check OpenVidu edition with the token
const tokenParams = this.session.getTokenParams(openviduToken);
if (tokenParams.edition !== 'pro' && tokenParams.edition !== 'enterprise') {
return reject(new OpenViduError(OpenViduErrorName.VIRTUAL_BACKGROUND_ERROR, 'OpenVidu Virtual Background API is available from OpenVidu Pro edition onwards'));
}
} }
openviduToken = encodeURIComponent(btoa(openviduToken)); openviduToken = encodeURIComponent(btoa(openviduToken));
@ -400,7 +394,7 @@ export class Stream {
// @ts-ignore // @ts-ignore
const VB = new VirtualBackground.VirtualBackground({ const VB = new VirtualBackground.VirtualBackground({
id, id,
openviduServerUrl: new URL(this.session.openvidu.httpUri), openviduServerUrl: new URL(tokenParams.httpUri),
openviduToken, openviduToken,
inputVideo: videoClone, inputVideo: videoClone,
inputResolution: '160x96', inputResolution: '160x96',