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

openvidu-server: fix openvidu-browser 2.15.0 compatibility

pull/553/head
pabloFuente 2020-11-04 12:36:47 +01:00
parent 944f0ac8b4
commit b06ad1d951
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java
View File

@ -47,36 +47,29 @@ public class TokenGenerator {
token += "?sessionId=" + sessionId; token += "?sessionId=" + sessionId;
token += "&token=" + IdentifierPrefixes.TOKEN_ID + RandomStringUtils.randomAlphabetic(1).toUpperCase() token += "&token=" + IdentifierPrefixes.TOKEN_ID + RandomStringUtils.randomAlphabetic(1).toUpperCase()
+ RandomStringUtils.randomAlphanumeric(15); + RandomStringUtils.randomAlphanumeric(15);
// REMOVE AFTER RELEASE 2.16.0
token = compatibilityWithOpenViduBrowser2150(token, role);
// REMOVE AFTER RELEASE 2.16.0
TurnCredentials turnCredentials = null; TurnCredentials turnCredentials = null;
if (this.openviduConfig.isTurnadminAvailable()) { if (this.openviduConfig.isTurnadminAvailable()) {
turnCredentials = coturnCredentialsService.createUser(); turnCredentials = coturnCredentialsService.createUser();
} }
// REMOVE AFTER RELEASE 2.16.0
token = compatibilityWithOpenViduBrowser2150(token, role, turnCredentials);
// REMOVE AFTER RELEASE 2.16.0
ConnectionProperties connectionProperties = new ConnectionProperties.Builder().type(ConnectionType.WEBRTC) ConnectionProperties connectionProperties = new ConnectionProperties.Builder().type(ConnectionType.WEBRTC)
.data(serverMetadata).record(record).role(role).kurentoOptions(kurentoOptions).build(); .data(serverMetadata).record(record).role(role).kurentoOptions(kurentoOptions).build();
return new Token(token, sessionId, connectionProperties, turnCredentials); return new Token(token, sessionId, connectionProperties, turnCredentials);
} }
// REMOVE AFTER RELEASE 2.16.0 // REMOVE AFTER RELEASE 2.16.0
private String compatibilityWithOpenViduBrowser2150(String token, OpenViduRole role) { private String compatibilityWithOpenViduBrowser2150(String token, OpenViduRole role,
TurnCredentials turnCredentials) {
token += "&role=" + role.name(); token += "&role=" + role.name();
token += "&version=" + openviduBuildConfig.getOpenViduServerVersion(); token += "&version=" + openviduBuildConfig.getOpenViduServerVersion();
TurnCredentials turnCredentials = null; if (turnCredentials != null) {
if (this.openviduConfig.isTurnadminAvailable()) { token += "&coturnIp=" + openviduConfig.getCoturnIp();
try { token += "&turnUsername=" + turnCredentials.getUsername();
turnCredentials = coturnCredentialsService.createUser(); token += "&turnCredential=" + turnCredentials.getCredential();
} catch (Exception e) {
e.printStackTrace();
}
if (turnCredentials != null) {
token += "&coturnIp=" + openviduConfig.getCoturnIp();
token += "&turnUsername=" + turnCredentials.getUsername();
token += "&turnCredential=" + turnCredentials.getCredential();
}
} }
return token; return token;
} }