Merge pull request #4 from codeurjc-students/call_rebase

OpenViduCall rebase

Author: DiegoMzmn

.gitignore

@@ -1,10 +1,61 @@
+# backend
 backend/src/main/resources/static/*
 backend/bin/src/main/resources/keystore.jks
 backend/bin/src/main/resources/static/*
+backend/bin/
 backend/src/main/resources/static/*
 *.class
+
+#docker
 docker/composed/.env
+docker/videos/
 
-backend/bin/
 
-docker/videos/
+# compiled output
+**/dist
+**/tmp
+*/out-tsc
+**/openvidu-webcomponent
+**/public
+
+# dependencies
+**/node_modules
+
+**/projects/openvidu-angular/src/lib/environments
+**/projects/openvidu-angular/src/lib/shared
+**/projects/openvidu-angular/src/lib/video-room
+**/projects/openvidu-angular/src/lib/app-routing.module.ts
+
+# IDEs and editors
+**/.idea
+**.project
+**.classpath
+**.c9/
+**.launch
+**.settings/
+**.sublime-workspace
+
+# IDE - VSCode
+**.vscode
+**.vscode/*
+**!.vscode/settings.json
+**!.vscode/tasks.json
+**!.vscode/launch.json
+**!.vscode/extensions.json
+
+# misc
+**/.sass-cache
+**/connect.lock
+**/coverage
+**/libpeerconnection.log
+**npm-debug.log
+**yarn-error.log
+**testem.log
+**/typings
+**/*.key
+**/*.crt
+
+# System Files
+**.DS_Store
+**Thumbs.db
+frontend/debug.log

.travis.yml

@@ -1,7 +1,29 @@
-language: java
-jdk: openjdk8
+matrix:
+  include:
+    - language: java
+      jdk: openjdk8
 
-before_script:
-    - cd ./backend/
-script:
-    - mvn test -B
+      before_script:
+        - cd ./backend/
+      script:
+        - mvn test -B
+    
+    - language: node_js
+      node_js:
+        - '12'
+    
+      addons:
+        chrome: stable
+    
+      before_install:
+        - cd ./frontend/
+
+      cache:
+        directories:
+          - ./node_modules
+    
+      install:
+        - npm install
+    
+      script:
+        - npm run test -- --watch=false --no-progress --browsers=ChromeHeadless

backend/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>urjc.openvidu</groupId>
 	<artifactId>OpenViduTeaching</artifactId>
-	<version>0.3.3</version>
+	<version>1.0.0</version>
 	<name>OpenViduTeaching</name>
 	<description>Project for online teaching using OpenVidu</description>
 

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

@@ -74,9 +74,8 @@ public ResponseEntity<String> createSession(@PathVariable String roomName) {
 	 * 
 	 * @return The token
 	 */
-	@SuppressWarnings("unchecked")
 	@GetMapping("/room/{roomName}/token")
-	public ResponseEntity<JSONObject> generateToken(@PathVariable String roomName) {
+	public ResponseEntity<String> generateToken(@PathVariable String roomName) {
 		Room room = roomServ.findByName(roomName);
 		User user = userServ.findByName(this.userComponent.getLoggedUser().getName());
 		if (room == null) { // No room with that name
@@ -96,12 +95,10 @@ public ResponseEntity<JSONObject> generateToken(@PathVariable String roomName) {
 			}
 		}
 
-		JSONObject json = new JSONObject();
 		try {
 			String token = this.openViduComponent.generateToken(room, user);
 			this.openViduComponent.addUserWithTokenToRoom(room, user, token);
-			json.put("token", token);
-			return new ResponseEntity<>(json, HttpStatus.OK);
+			return new ResponseEntity<>("\"" + token + "\"", HttpStatus.OK);
 		} catch (IOException e1) {
 			// Internal error
 			return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
@@ -111,8 +108,7 @@ public ResponseEntity<JSONObject> generateToken(@PathVariable String roomName) {
 				// anymore. Must clean invalid session and create a new one
 				try {
 					String token = this.openViduComponent.replaceSession(room, user);
-					json.put("token", token);
-					return new ResponseEntity<>(json, HttpStatus.OK);
+					return new ResponseEntity<>("\"" + token + "\"", HttpStatus.OK);
 				} catch (IOException  e3) {
 					return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
 				}

backend/src/test/java/urjc/ovteaching/OpenViduTests.java

@@ -1,12 +1,11 @@
 package urjc.ovteaching;
 
-import static org.hamcrest.Matchers.is;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.io.IOException;
@@ -151,7 +150,7 @@ public void getToken() throws Exception {
 		mvc.perform(MockMvcRequestBuilders.get("/ovTeachingApi/room/testRoom/token")
 				.contentType(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.token", is(token)));
+				.andExpect(content().string("\"" + token + "\""));
 
 		verify(openviduComponent, never()).createSession(any());
 		verify(openviduComponent).generateToken(room, user);
@@ -193,7 +192,7 @@ public void getTokenAndCreateSession() throws Exception {
 		mvc.perform(MockMvcRequestBuilders.get("/ovTeachingApi/room/testRoom/token")
 				.contentType(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.token", is(token)));
+				.andExpect(content().string("\"" + token + "\""));
 
 		verify(openviduComponent).createSession(room);
 		verify(openviduComponent).generateToken(room, user);
@@ -257,7 +256,7 @@ public void getTokenUserLeftUnexpectedly() throws Exception {
 		mvc.perform(MockMvcRequestBuilders.get("/ovTeachingApi/room/testRoom/token")
 				.contentType(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.token", is(token)));
+				.andExpect(content().string("\"" + token + "\""));
 
 		verify(openviduComponent).generateToken(room, user);
 		verify(openviduComponent).replaceSession(room, user);

docker/build/OpenViduTeaching.jar

@@ -6,4 +6,4 @@ docker run -p 4443:4443 --name openvidu-server-kms --rm \
 -e OPENVIDU_RECORDING_PATH=/home/diegomzmn/Escritorio/OpenViduTeaching/2019-OpenViduTeaching/docker/videos \
 -e OPENVIDU_RECORDING_NOTIFICATION=moderator \
 -e OPENVIDU_SECRET=MY_SECRET \
-openvidu/openvidu-server-kms:2.13.0
+openvidu/openvidu-server-kms:2.14.0

docker/dockerOVServer.sh

@@ -30,7 +30,7 @@ This document will explain how is used the Licensoft-Web API.
     * [Stop recording](#stop-recording)
     * [Get recording status](#get-recording-status)
     * [Get recording enabled](#get-recording-enabled)
-    * [Get recordings' info](#get-recordings'-info)
+    * [Get recordings info](#get-recordings-info)
     * [Get video](#get-video)
 
 
@@ -464,9 +464,7 @@ Gets the OpenVidu Token for the current user according to it's role (moderator=m
     Password: pass
   - **Response**:
     ~~~~ json
-    {
-        "token": "wss://localhost:4443?sessionId=roomA&token=l5lcdqshsjb0tsym&role=MODERATOR&version=2.11.0"
-    }
+    "wss://localhost:4443?sessionId=roomA&token=l5lcdqshsjb0tsym&role=MODERATOR&version=2.11.0"
     ~~~~
 
 ### Disconnect current user ###
@@ -603,7 +601,7 @@ Check whether recording was enabled in the server. It it disabled by default and
     true
     ~~~~
 
-### Get recordings' info ###
+### Get recordings info ###
 Get the info of the recordings of a room.
 - **URL**  
    `/ovTeachingApi/room/{roomName}/recordings`

documentation/api.md

@@ -1,9 +1,9 @@
 # Editor configuration, see http://editorconfig.org
 root = true
-
+quote_type = single
 [*]
 charset = utf-8
-indent_style = space
+indent_style = tabs
 indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true