From 813bf1613b7c1768bbc3f3444b5120ab8a85771b Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Fri, 25 Jan 2019 12:30:01 +0100
Subject: [PATCH] openvidu-server: updated config GET response. Version in
 variable

---
 openvidu-server/pom.xml                       | 23 ++++++++++---------
 .../server/config/OpenviduConfig.java         | 12 ++++++----
 .../server/rest/ConfigRestController.java     | 17 ++++++++++----
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml
index 2e050cbd..888be6e9 100644
--- a/openvidu-server/pom.xml
+++ b/openvidu-server/pom.xml
@@ -12,7 +12,7 @@
 	<packaging>jar</packaging>
 
 	<name>OpenVidu Server</name>
-	<version>2.7.0</version>
+	<version>${version.openvidu.server}</version>
 	<description>OpenVidu Server</description>
 	<url>https://github.com/OpenVidu/openvidu</url>
 
@@ -48,6 +48,7 @@
 	<properties>
 		<!-- Main class -->
 		<start-class>io.openvidu.server.OpenViduServer</start-class>
+		<version.openvidu.server>2.7.0</version.openvidu.server>
 	</properties>
 
 	<profiles>
@@ -83,15 +84,15 @@
 						</configuration>
 						<executions>
 							<execution>
-								<id>build-info</id>
 								<goals>
 									<goal>build-info</goal>
-								</goals>
-							</execution>
-							<execution>
-								<goals>
 									<goal>repackage</goal>
 								</goals>
+								<configuration>
+									<additionalProperties>
+										<version.openvidu.server>${version.openvidu.server}</version.openvidu.server>
+									</additionalProperties>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>
@@ -143,15 +144,15 @@
 						</configuration>
 						<executions>
 							<execution>
-								<id>build-info</id>
 								<goals>
 									<goal>build-info</goal>
-								</goals>
-							</execution>
-							<execution>
-								<goals>
 									<goal>repackage</goal>
 								</goals>
+								<configuration>
+									<additionalProperties>
+										<version.openvidu.server>${version.openvidu.server}</version.openvidu.server>
+									</additionalProperties>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>
diff --git a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
index 1a15ad88..fb3fe771 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
@@ -95,10 +95,6 @@ public class OpenviduConfig {
 
 	private String finalUrl;
 
-	public String getOpenViduServerVersion() {
-		return this.buildProperties.getVersion();
-	}
-
 	public String getOpenViduPublicUrl() {
 		return this.openviduPublicUrl;
 	}
@@ -218,4 +214,12 @@ public class OpenviduConfig {
 		return roles;
 	}
 
+	public String getOpenViduServerVersion() {
+		return this.buildProperties.get("version.openvidu.server");
+	}
+
+	public String getVersion() {
+		return this.buildProperties.getVersion();
+	}
+
 }
diff --git a/openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java
index 18911da0..9e8c588c 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java
@@ -69,16 +69,25 @@ public class ConfigRestController {
 	}
 
 	@RequestMapping(method = RequestMethod.GET)
-	public ResponseEntity<?> getOpenViduConfiguration() {
+	public ResponseEntity<String> getOpenViduConfiguration() {
 
 		JsonObject json = new JsonObject();
 		json.addProperty("openviduServerVersion", openviduConfig.getOpenViduServerVersion());
+		json.addProperty("artifactVersion", openviduConfig.getVersion());
 		json.addProperty("openviduPublicurl", openviduConfig.getOpenViduPublicUrl());
 		json.addProperty("openviduCdr", openviduConfig.isCdrEnabled());
+		json.addProperty("maxRecvBandwidth", openviduConfig.getVideoMaxRecvBandwidth());
+		json.addProperty("minRecvBandwidth", openviduConfig.getVideoMinRecvBandwidth());
+		json.addProperty("maxSendBandwidth", openviduConfig.getVideoMaxSendBandwidth());
+		json.addProperty("minSendBandwidth", openviduConfig.getVideoMinSendBandwidth());
 		json.addProperty("openviduRecording", openviduConfig.isRecordingModuleEnabled());
-		json.addProperty("openviduRecordingPublicAccess", openviduConfig.getOpenViduRecordingPublicAccess());
-		json.addProperty("openviduRecordingPath", openviduConfig.getOpenViduRecordingPath());
-		json.addProperty("openviduRecordingVersion", openviduConfig.getOpenViduRecordingVersion());
+		if (openviduConfig.isRecordingModuleEnabled()) {
+			json.addProperty("openviduRecordingVersion", openviduConfig.getOpenViduRecordingVersion());
+			json.addProperty("openviduRecordingPath", openviduConfig.getOpenViduRecordingPath());
+			json.addProperty("openviduRecordingPublicAccess", openviduConfig.getOpenViduRecordingPublicAccess());
+			json.addProperty("openviduRecordingNotification", openviduConfig.getOpenViduRecordingNotification());
+			json.addProperty("openviduRecordingCustomLayout", openviduConfig.getOpenviduRecordingCustomLayout());
+		}
 
 		HttpHeaders responseHeaders = new HttpHeaders();
 		responseHeaders.setContentType(MediaType.APPLICATION_JSON);