From 9dbce157588af61416ac6c885298f32f2e6088f5 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Sat, 18 Apr 2020 15:27:03 +0200
Subject: [PATCH] openvidu-server: by default append /inspector to recording
 composed url

---
 .../openvidu/server/config/OpenviduConfig.java |  4 ++++
 .../service/ComposedRecordingService.java      | 18 ++++++++++--------
 openvidu-test-e2e/jenkins/Jenkinsfile          |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

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 4f9de815..aa64b9eb 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
@@ -352,6 +352,10 @@ public class OpenviduConfig {
 		return !"/opt/openvidu/custom-layout".equals(path);
 	}
 
+	public String getOpenViduRecordingDefaultLayoutsPath() {
+		return "dashboard";
+	}
+
 	// Properties management methods
 
 	public OpenviduConfig deriveWithAdditionalPropertiesSource(Map<String, ?> propertiesSource) {
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
index 0dd01aa9..2c2b10b4 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
@@ -45,7 +45,6 @@ import io.openvidu.client.OpenViduException;
 import io.openvidu.client.OpenViduException.Code;
 import io.openvidu.java.client.RecordingLayout;
 import io.openvidu.java.client.RecordingProperties;
-import io.openvidu.server.OpenViduServer;
 import io.openvidu.server.cdr.CallDetailRecord;
 import io.openvidu.server.config.OpenviduConfig;
 import io.openvidu.server.core.EndReason;
@@ -506,15 +505,15 @@ public class ComposedRecordingService extends RecordingService {
 			}
 		}
 
-		boolean recordingUrlDefined = openviduConfig.getOpenViduRecordingComposedUrl() != null
+		boolean recordingComposedUrlDefined = openviduConfig.getOpenViduRecordingComposedUrl() != null
 				&& !openviduConfig.getOpenViduRecordingComposedUrl().isEmpty();
-		String recordingUrl = recordingUrlDefined ? openviduConfig.getOpenViduRecordingComposedUrl()
-				: OpenViduServer.wsUrl;
-		recordingUrl = recordingUrl.replaceFirst("wss://", "").replaceFirst("https://", "");
-		boolean startsWithHttp = recordingUrl.startsWith("http://") || recordingUrl.startsWith("ws://");
+		String recordingUrl = recordingComposedUrlDefined ? openviduConfig.getOpenViduRecordingComposedUrl()
+				: openviduConfig.getFinalUrl();
+		recordingUrl = recordingUrl.replaceFirst("https://", "");
+		boolean startsWithHttp = recordingUrl.startsWith("http://");
 
 		if (startsWithHttp) {
-			recordingUrl = recordingUrl.replaceFirst("http://", "").replaceFirst("ws://", "");
+			recordingUrl = recordingUrl.replaceFirst("http://", "");
 		}
 
 		if (recordingUrl.endsWith("/")) {
@@ -539,8 +538,11 @@ public class ComposedRecordingService extends RecordingService {
 			} catch (MalformedURLException e) {
 				log.error(e.getMessage());
 			}
+			String defaultPathForDefaultLayout = recordingComposedUrlDefined ? ""
+					: ("/" + openviduConfig.getOpenViduRecordingDefaultLayoutsPath());
 			finalUrl = (startsWithHttp ? "http" : "https") + "://OPENVIDUAPP:" + secret + "@" + recordingUrl
-					+ "/#/layout-" + layout + "/" + recording.getSessionId() + "/" + secret + "/" + port + "/" + !recording.hasAudio();
+					+ defaultPathForDefaultLayout + "/#/layout-" + layout + "/" + recording.getSessionId() + "/"
+					+ secret + "/" + port + "/" + !recording.hasAudio();
 		}
 
 		return finalUrl;
diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile
index adde757f..a12b604f 100644
--- a/openvidu-test-e2e/jenkins/Jenkinsfile
+++ b/openvidu-test-e2e/jenkins/Jenkinsfile
@@ -59,7 +59,7 @@ node('container') {
           sh 'cd openvidu/openvidu-server && mvn --batch-mode -Dtest=io.openvidu.server.test.integration.*Test test'
         }
         stage('OpenVidu Server build') {
-          sh 'cd openvidu/openvidu-server/src/dashboard && npm install --unsafe-perm && npm link openvidu-browser && export NG_CLI_ANALYTICS=ci && ./node_modules/@angular/cli/bin/ng build --prod --output-path ../main/resources/static'
+          sh 'cd openvidu/openvidu-server/src/dashboard && npm install --unsafe-perm && npm link openvidu-browser && export NG_CLI_ANALYTICS=ci && npm run build-prod'
           sh 'cd openvidu/openvidu-server && mvn --batch-mode clean compile package'
         }
         stage ('Environment Launch') {