From b06ad1d951a1c4f38160e351371badb4eb7ceb86 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Wed, 4 Nov 2020 12:36:47 +0100 Subject: [PATCH] openvidu-server: fix openvidu-browser 2.15.0 compatibility --- .../openvidu/server/core/TokenGenerator.java | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java b/openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java index a39101b0..8ef7dbdc 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java @@ -47,36 +47,29 @@ public class TokenGenerator { token += "?sessionId=" + sessionId; token += "&token=" + IdentifierPrefixes.TOKEN_ID + RandomStringUtils.randomAlphabetic(1).toUpperCase() + RandomStringUtils.randomAlphanumeric(15); - - // REMOVE AFTER RELEASE 2.16.0 - token = compatibilityWithOpenViduBrowser2150(token, role); - // REMOVE AFTER RELEASE 2.16.0 - TurnCredentials turnCredentials = null; if (this.openviduConfig.isTurnadminAvailable()) { 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) .data(serverMetadata).record(record).role(role).kurentoOptions(kurentoOptions).build(); return new Token(token, sessionId, connectionProperties, turnCredentials); } // 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 += "&version=" + openviduBuildConfig.getOpenViduServerVersion(); - TurnCredentials turnCredentials = null; - if (this.openviduConfig.isTurnadminAvailable()) { - try { - turnCredentials = coturnCredentialsService.createUser(); - } catch (Exception e) { - e.printStackTrace(); - } - if (turnCredentials != null) { - token += "&coturnIp=" + openviduConfig.getCoturnIp(); - token += "&turnUsername=" + turnCredentials.getUsername(); - token += "&turnCredential=" + turnCredentials.getCredential(); - } + if (turnCredentials != null) { + token += "&coturnIp=" + openviduConfig.getCoturnIp(); + token += "&turnUsername=" + turnCredentials.getUsername(); + token += "&turnCredential=" + turnCredentials.getCredential(); } return token; }