From 78775a3b9aa2bb6db91da0f2b15b7f0f8a1c970a Mon Sep 17 00:00:00 2001
From: Petar Georgiev <pkgeorgiev.bg@gmail.com>
Date: Mon, 25 Mar 2024 14:48:00 +0200
Subject: [PATCH] Fix extractZoomStartLink issue

---
 .../MonitoringProctoringService.java          | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/MonitoringProctoringService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/MonitoringProctoringService.java
index a6b70723..196a1ff2 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/MonitoringProctoringService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/MonitoringProctoringService.java
@@ -286,22 +286,23 @@ public class MonitoringProctoringService {
                 String.valueOf(proctoringSettings.examId),
                 proctoringConnectionData);
 
-        final String zoomStartLink = extractZoomStartLink(room.additionalRoomData);
-        if (proctoringSettings.useZoomAppClientForCollectingRoom &&
-                StringUtils.isNotBlank(zoomStartLink)) {
+        if (proctoringSettings.useZoomAppClientForCollectingRoom) {
+            final String zoomStartLink = extractZoomStartLink(room.additionalRoomData);
+            
+            if (StringUtils.isNotBlank(zoomStartLink)) {
 
-            final String script = String.format(
-                    getOpenRoomScriptTemplate(),
-                    room.name,
-                    800,
-                    1200,
-                    room.name,
-                    zoomStartLink,
-                    "");
-
-            RWT.getClient()
-                    .getService(JavaScriptExecutor.class)
-                    .execute(script);
+                final String script = String.format(
+                        getOpenRoomScriptTemplate(),
+                        room.name,
+                        800,
+                        1200,
+                        room.name,
+                        zoomStartLink,
+                        "");
+    
+                RWT.getClient()
+                        .getService(JavaScriptExecutor.class)
+                        .execute(script);
 
         } else {