zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev-1.2' into development

Browse source
This commit is contained in:
anhefti 2021-09-01 11:04:01 +02:00
commit c412fc3d97
4 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/ZoomWindowScriptResolver.java
View file

@ -43,13 +43,17 @@ public class ZoomWindowScriptResolver implements ProctoringWindowScriptResolver
private static final String ATTR_ROOM_NAME = "ATTR_ROOM_NAME"; private static final String ATTR_ROOM_NAME = "ATTR_ROOM_NAME";
private static final String ATTR_HOST = "ATTR_HOST"; private static final String ATTR_HOST = "ATTR_HOST";
private static final String ATTR_USER_NAME = "ATTR_USER_NAME"; 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 Resource resourceFile;
private final String zoomSDKVersion;
public ZoomWindowScriptResolver( 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.resourceFile = resourceFile;
this.zoomSDKVersion = zoomSDKVersion;
} }
@Override @Override
@ -76,6 +80,7 @@ public class ZoomWindowScriptResolver implements ProctoringWindowScriptResolver
} }
args.put(ATTR_SUBJECT, data.connectionData.subject); args.put(ATTR_SUBJECT, data.connectionData.subject);
args.put(ATTR_USER_NAME, data.connectionData.userName); args.put(ATTR_USER_NAME, data.connectionData.userName);
args.put(ATTR_ZOOM_SDK_VERSION, this.zoomSDKVersion);
final String htmlWindow = getHTMLWindow(); final String htmlWindow = getHTMLWindow();
final String replace = new StringSubstitutor( final String replace = new StringSubstitutor(

19
src/main/resources/ch/ethz/seb/sebserver/gui/service/session/proctoring/zoomWindow.html
View file

@ -1,17 +1,16 @@
<html> <html>
<head> <head>
<meta charset='utf-8' /> <meta charset='utf-8' />
<link type='text/css' rel='stylesheet' href='https://source.zoom.us/1.9.1/css/bootstrap.css' /> <link type='text/css' rel='stylesheet' href='https://source.zoom.us/%%_ZOOM_SDK_VERSION_%%/css/bootstrap.css' />
<link type='text/css' rel='stylesheet' href='https://source.zoom.us/1.9.1/css/react-select.css' /> <link type='text/css' rel='stylesheet' href='https://source.zoom.us/%%_ZOOM_SDK_VERSION_%%/css/react-select.css' />
</head> </head>
<body> <body>
<script src='https://source.zoom.us/1.9.1/lib/vendor/react.min.js'></script> <script src='https://source.zoom.us/%%_ZOOM_SDK_VERSION_%%/lib/vendor/react.min.js'></script>
<script src='https://source.zoom.us/1.9.1/lib/vendor/react-dom.min.js'></script> <script src='https://source.zoom.us/%%_ZOOM_SDK_VERSION_%%/lib/vendor/react-dom.min.js'></script>
<script src='https://source.zoom.us/1.9.1/lib/vendor/redux.min.js'></script> <script src='https://source.zoom.us/%%_ZOOM_SDK_VERSION_%%/lib/vendor/redux.min.js'></script>
<script src='https://source.zoom.us/1.9.1/lib/vendor/redux-thunk.min.js'></script> <script src='https://source.zoom.us/%%_ZOOM_SDK_VERSION_%%/lib/vendor/redux-thunk.min.js'></script>
<script src='https://source.zoom.us/1.9.1/lib/vendor/jquery.min.js'></script> <script src='https://source.zoom.us/%%_ZOOM_SDK_VERSION_%%/lib/vendor/lodash.min.js'></script>
<script src='https://source.zoom.us/1.9.1/lib/vendor/lodash.min.js'></script> <script src='https://source.zoom.us/zoom-meeting-%%_ZOOM_SDK_VERSION_%%.min.js'></script>
<script src='https://source.zoom.us/zoom-meeting-1.9.1.min.js'></script>
<script src='https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.9/crypto-js.min.js'></script> <script src='https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.9/crypto-js.min.js'></script>
<script type='text/javascript'> <script type='text/javascript'>
@ -19,7 +18,7 @@
console.log(JSON.stringify(ZoomMtg.checkSystemRequirements())); console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));
console.log('Initializing Zoom...'); console.log('Initializing Zoom...');
ZoomMtg.setZoomJSLib('https://source.zoom.us/1.9.1/lib', '/av'); ZoomMtg.setZoomJSLib('https://source.zoom.us/%%_ZOOM_SDK_VERSION_%%/lib', '/av');
ZoomMtg.preLoadWasm(); ZoomMtg.preLoadWasm();
ZoomMtg.prepareJssdk(); ZoomMtg.prepareJssdk();

1
src/main/resources/config/application-gui.properties
View file

@ -31,6 +31,7 @@ sebserver.gui.webservice.edx-lms-enabled=true
sebserver.gui.webservice.moodle-lms-enabled=true sebserver.gui.webservice.moodle-lms-enabled=true
sebserver.gui.seb.client.config.download.filename=SEBServerSettings.seb sebserver.gui.seb.client.config.download.filename=SEBServerSettings.seb
sebserver.gui.seb.exam.config.download.filename=SEBExamSettings.seb sebserver.gui.seb.exam.config.download.filename=SEBExamSettings.seb
sebserver.gui.proctoring.zoom.websdk.version=1.9.8
sebserver.gui.filter.date.from.years=2 sebserver.gui.filter.date.from.years=2

21
src/test/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/ZoomWindowScriptResolverTest.java
View file

@ -24,7 +24,7 @@ public class ZoomWindowScriptResolverTest {
public void testZoomWindowScriptResolver() { public void testZoomWindowScriptResolver() {
final DefaultResourceLoader defaultResourceLoader = new DefaultResourceLoader(); final DefaultResourceLoader defaultResourceLoader = new DefaultResourceLoader();
final Resource resource = defaultResourceLoader.getResource(ZoomWindowScriptResolver.RES_PATH); final Resource resource = defaultResourceLoader.getResource(ZoomWindowScriptResolver.RES_PATH);
final ZoomWindowScriptResolver zoomWindowScriptResolver = new ZoomWindowScriptResolver(resource); final ZoomWindowScriptResolver zoomWindowScriptResolver = new ZoomWindowScriptResolver(resource, "1.9.8");
final ProctoringWindowData proctoringWindowDataZoom = new ProctoringWindowData( final ProctoringWindowData proctoringWindowDataZoom = new ProctoringWindowData(
"0", "0",
@ -70,17 +70,16 @@ public class ZoomWindowScriptResolverTest {
"<html>\r\n" "<html>\r\n"
+ " <head>\r\n" + " <head>\r\n"
+ " <meta charset='utf-8' />\r\n" + " <meta charset='utf-8' />\r\n"
+ " <link type='text/css' rel='stylesheet' href='https://source.zoom.us/1.9.1/css/bootstrap.css' />\r\n" + " <link type='text/css' rel='stylesheet' href='https://source.zoom.us/1.9.8/css/bootstrap.css' />\r\n"
+ " <link type='text/css' rel='stylesheet' href='https://source.zoom.us/1.9.1/css/react-select.css' />\r\n" + " <link type='text/css' rel='stylesheet' href='https://source.zoom.us/1.9.8/css/react-select.css' />\r\n"
+ " </head>\r\n" + " </head>\r\n"
+ " <body>\r\n" + " <body>\r\n"
+ " <script src='https://source.zoom.us/1.9.1/lib/vendor/react.min.js'></script>\r\n" + " <script src='https://source.zoom.us/1.9.8/lib/vendor/react.min.js'></script>\r\n"
+ " <script src='https://source.zoom.us/1.9.1/lib/vendor/react-dom.min.js'></script>\r\n" + " <script src='https://source.zoom.us/1.9.8/lib/vendor/react-dom.min.js'></script>\r\n"
+ " <script src='https://source.zoom.us/1.9.1/lib/vendor/redux.min.js'></script>\r\n" + " <script src='https://source.zoom.us/1.9.8/lib/vendor/redux.min.js'></script>\r\n"
+ " <script src='https://source.zoom.us/1.9.1/lib/vendor/redux-thunk.min.js'></script>\r\n" + " <script src='https://source.zoom.us/1.9.8/lib/vendor/redux-thunk.min.js'></script>\r\n"
+ " <script src='https://source.zoom.us/1.9.1/lib/vendor/jquery.min.js'></script>\r\n" + " <script src='https://source.zoom.us/1.9.8/lib/vendor/lodash.min.js'></script>\r\n"
+ " <script src='https://source.zoom.us/1.9.1/lib/vendor/lodash.min.js'></script>\r\n" + " <script src='https://source.zoom.us/zoom-meeting-1.9.8.min.js'></script>\r\n"
+ " <script src='https://source.zoom.us/zoom-meeting-1.9.1.min.js'></script>\r\n"
+ " <script src='https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.9/crypto-js.min.js'></script>\r\n" + " <script src='https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.9/crypto-js.min.js'></script>\r\n"
+ " <script type='text/javascript'>\r\n" + " <script type='text/javascript'>\r\n"
+ "\r\n" + "\r\n"
@ -88,7 +87,7 @@ public class ZoomWindowScriptResolverTest {
+ " console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));\r\n" + " console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));\r\n"
+ "\r\n" + "\r\n"
+ " console.log('Initializing Zoom...');\r\n" + " console.log('Initializing Zoom...');\r\n"
+ " ZoomMtg.setZoomJSLib('https://source.zoom.us/1.9.1/lib', '/av');\r\n" + " ZoomMtg.setZoomJSLib('https://source.zoom.us/1.9.8/lib', '/av');\r\n"
+ " ZoomMtg.preLoadWasm();\r\n" + " ZoomMtg.preLoadWasm();\r\n"
+ " ZoomMtg.prepareJssdk();\r\n" + " ZoomMtg.prepareJssdk();\r\n"
+ "\r\n" + "\r\n"