From 0061b27e750116e8499c096ded56d963dad5e7ee Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 31 Aug 2021 17:02:30 +0200 Subject: [PATCH] update zoom web SDK to version 1.9.8, make version configurable removed unused libs for zoom web SDK (jQuery) --- .../proctoring/ZoomWindowScriptResolver.java | 7 ++++++- .../session/proctoring/zoomWindow.html | 19 ++++++++--------- .../config/application-gui.properties | 1 + .../ZoomWindowScriptResolverTest.java | 21 +++++++++---------- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/ZoomWindowScriptResolver.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/ZoomWindowScriptResolver.java index e3da08ad..3dead51b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/ZoomWindowScriptResolver.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/ZoomWindowScriptResolver.java @@ -43,13 +43,17 @@ public class ZoomWindowScriptResolver implements ProctoringWindowScriptResolver private static final String ATTR_ROOM_NAME = "ATTR_ROOM_NAME"; private static final String ATTR_HOST = "ATTR_HOST"; private static final String ATTR_USER_NAME = "ATTR_USER_NAME"; + private static final String ATTR_ZOOM_SDK_VERSION = "ZOOM_SDK_VERSION"; private final Resource resourceFile; + private final String zoomSDKVersion; public ZoomWindowScriptResolver( - @Value(RES_PATH) final Resource resourceFile) { + @Value(RES_PATH) final Resource resourceFile, + @Value("${sebserver.gui.proctoring.zoom.websdk.version:1.9.8}") final String zoomSDKVersion) { this.resourceFile = resourceFile; + this.zoomSDKVersion = zoomSDKVersion; } @Override @@ -76,6 +80,7 @@ public class ZoomWindowScriptResolver implements ProctoringWindowScriptResolver } args.put(ATTR_SUBJECT, data.connectionData.subject); args.put(ATTR_USER_NAME, data.connectionData.userName); + args.put(ATTR_ZOOM_SDK_VERSION, this.zoomSDKVersion); final String htmlWindow = getHTMLWindow(); final String replace = new StringSubstitutor( diff --git a/src/main/resources/ch/ethz/seb/sebserver/gui/service/session/proctoring/zoomWindow.html b/src/main/resources/ch/ethz/seb/sebserver/gui/service/session/proctoring/zoomWindow.html index 6f4a7798..0c52d38e 100644 --- a/src/main/resources/ch/ethz/seb/sebserver/gui/service/session/proctoring/zoomWindow.html +++ b/src/main/resources/ch/ethz/seb/sebserver/gui/service/session/proctoring/zoomWindow.html @@ -1,17 +1,16 @@ - - + + - - - - - - - + + + + + + \r\n" - + " \r\n" - + " \r\n" - + " \r\n" - + " \r\n" - + " \r\n" - + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + " \r\n" + "