From 1225542130939ef13f49e22b53a0f878bc256adb Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 19 Jun 2017 10:18:08 +0200 Subject: [PATCH] Const OpenViduRole changed to variable when storing in collections --- openvidu-js-java/README.md | 4 ++-- .../src/main/java/io/openvidu/js/java/SessionController.java | 4 ++-- openvidu-mvc-java/README.md | 4 ++-- .../src/main/java/io/openvidu/mvc/java/SessionController.java | 4 ++-- openvidu-mvc-node/README.md | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openvidu-js-java/README.md b/openvidu-js-java/README.md index c048537d..a9983a90 100644 --- a/openvidu-js-java/README.md +++ b/openvidu-js-java/README.md @@ -230,7 +230,7 @@ else { // Store the session and the token in our collections this.mapSessions.put(sessionName, session); this.mapSessionIdsTokens.put(sessionId, new ConcurrentHashMap<>()); - this.mapSessionIdsTokens.get(sessionId).put(token, OpenViduRole.PUBLISHER); + this.mapSessionIdsTokens.get(sessionId).put(token, role); // Prepare the response with the sessionId and the token responseJson.put(0, sessionId); @@ -336,7 +336,7 @@ if (this.mapSessions.get(sessionName) != null) { String token = this.mapSessions.get(sessionName).generateToken(tokenOptions); // Update our collection storing the new token - this.mapSessionIdsTokens.get(sessionId).put(token, OpenViduRole.PUBLISHER); + this.mapSessionIdsTokens.get(sessionId).put(token, role); // Prepare the response with the sessionId and the token responseJson.put(0, sessionId); diff --git a/openvidu-js-java/src/main/java/io/openvidu/js/java/SessionController.java b/openvidu-js-java/src/main/java/io/openvidu/js/java/SessionController.java index ac6ba214..5cc1ccfc 100644 --- a/openvidu-js-java/src/main/java/io/openvidu/js/java/SessionController.java +++ b/openvidu-js-java/src/main/java/io/openvidu/js/java/SessionController.java @@ -66,7 +66,7 @@ public class SessionController { String sessionId = this.mapSessions.get(sessionName).getSessionId(); String token = this.mapSessions.get(sessionName).generateToken(tokenOptions); - this.mapSessionIdsTokens.get(sessionId).put(token, OpenViduRole.PUBLISHER); + this.mapSessionIdsTokens.get(sessionId).put(token, role); responseJson.put(0, sessionId); responseJson.put(1, token); @@ -86,7 +86,7 @@ public class SessionController { this.mapSessions.put(sessionName, session); this.mapSessionIdsTokens.put(sessionId, new ConcurrentHashMap<>()); - this.mapSessionIdsTokens.get(sessionId).put(token, OpenViduRole.PUBLISHER); + this.mapSessionIdsTokens.get(sessionId).put(token, role); responseJson.put(0, sessionId); responseJson.put(1, token); diff --git a/openvidu-mvc-java/README.md b/openvidu-mvc-java/README.md index 6331b9d1..8b506ec1 100644 --- a/openvidu-mvc-java/README.md +++ b/openvidu-mvc-java/README.md @@ -214,7 +214,7 @@ else { // Store the session and the token in our collections this.mapSessions.put(sessionName, session); this.mapSessionIdsTokens.put(sessionId, new ConcurrentHashMap<>()); - this.mapSessionIdsTokens.get(sessionId).put(token, OpenViduRole.PUBLISHER); + this.mapSessionIdsTokens.get(sessionId).put(token, role); // Add all the needed attributes to the template model.addAttribute("sessionId", sessionId); @@ -326,7 +326,7 @@ if (this.mapSessions.get(sessionName) != null) { String token = this.mapSessions.get(sessionName).generateToken(tokenOptions); // Update our collection storing the new token - this.mapSessionIdsTokens.get(sessionId).put(token, OpenViduRole.PUBLISHER); + this.mapSessionIdsTokens.get(sessionId).put(token, role); // Add all the needed attributes to the template model.addAttribute("sessionId", sessionId); diff --git a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/SessionController.java b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/SessionController.java index e7898331..24299aa9 100644 --- a/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/SessionController.java +++ b/openvidu-mvc-java/src/main/java/io/openvidu/mvc/java/SessionController.java @@ -56,7 +56,7 @@ public class SessionController { String sessionId = this.mapSessions.get(sessionName).getSessionId(); String token = this.mapSessions.get(sessionName).generateToken(tokenOptions); - this.mapSessionIdsTokens.get(sessionId).put(token, OpenViduRole.PUBLISHER); + this.mapSessionIdsTokens.get(sessionId).put(token, role); model.addAttribute("sessionId", sessionId); model.addAttribute("token", token); @@ -80,7 +80,7 @@ public class SessionController { this.mapSessions.put(sessionName, session); this.mapSessionIdsTokens.put(sessionId, new ConcurrentHashMap<>()); - this.mapSessionIdsTokens.get(sessionId).put(token, OpenViduRole.PUBLISHER); + this.mapSessionIdsTokens.get(sessionId).put(token, role); model.addAttribute("sessionId", sessionId); model.addAttribute("token", token); diff --git a/openvidu-mvc-node/README.md b/openvidu-mvc-node/README.md index 77ac7704..bdeddd3b 100644 --- a/openvidu-mvc-node/README.md +++ b/openvidu-mvc-node/README.md @@ -121,8 +121,8 @@ function dashboardController(req, res) { if (login(user, pass)) { // Correct user-pass // Validate session and return OK - // Value stored in req.session allows us to identify the user in future requests - req.session.loggedUser = user; + // Value stored in req.session allows us to identify the user in future requests + req.session.loggedUser = user; res.render('dashboard.ejs', { user: user });