Skip to content

Commit e032f63

Browse files
committed
Small generate token refactor
1 parent cad3573 commit e032f63

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

backend/src/main/java/urjc/ovteaching/openvidu/OpenViduComponent.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ public boolean isSessionCreated(Room room) {
125125
public String createSession(Room room) throws IOException {
126126
System.out.println("Creating session for room: " + room.getName());
127127
try {
128-
SessionProperties sp = new SessionProperties.Builder().customSessionId(room.getName()).build();
128+
SessionProperties sp = new SessionProperties.Builder()
129+
.customSessionId(room.getName()).build();
129130
Session session = this.openVidu.createSession(sp);
130131
this.roomIdSession.put(room.getId(), session);
131132
this.sessionIdUserIdToken.put(session.getSessionId(), new HashMap<>());
@@ -156,11 +157,15 @@ public void addUserWithTokenToRoom(Room room, User user, String token) {
156157
}
157158

158159
public String generateToken(Room room, User user) throws IOException {
159-
System.out.println("Generating token for room: " + room.getName() + " and user: " + user.getName());
160+
System.out.print("Generating token for ");
161+
System.out.print("room: " + room.getName());
162+
System.out.println(" and user: " + user.getName());
160163
try {
161164
Session session = this.roomIdSession.get(room.getId());
162165
OpenViduRole role = this.getRole(user, room);
163-
TokenOptions tokenOpts = new TokenOptions.Builder().role(role).data("SERVER=" + user.getName()).build();
166+
TokenOptions tokenOpts = new TokenOptions.Builder()
167+
.role(role)
168+
.data("SERVER=" + user.getName()).build();
164169
return session.generateToken(tokenOpts);
165170
} catch (OpenViduJavaClientException e) {
166171
System.out.println(e.toString());

backend/src/main/java/urjc/ovteaching/openvidu/OpenViduController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public ResponseEntity<JSONObject> generateToken(@PathVariable String roomName) {
8787
return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
8888
}
8989

90-
JSONObject json = new JSONObject();
91-
if (!this.openViduComponent.isSessionCreated(room)) { // Create session if there isn't
90+
// Create session if there isn't
91+
if (!this.openViduComponent.isSessionCreated(room)) {
9292
try {
9393
this.openViduComponent.createSession(room);
9494
} catch (IOException e) {
@@ -97,6 +97,7 @@ public ResponseEntity<JSONObject> generateToken(@PathVariable String roomName) {
9797
}
9898
}
9999

100+
JSONObject json = new JSONObject();
100101
try {
101102
String token = this.openViduComponent.generateToken(room, user);
102103
this.openViduComponent.addUserWithTokenToRoom(room, user, token);

0 commit comments

Comments
 (0)