From 1f2aff508414fcc36fb461f3e16f801448613a15 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 1 Apr 2021 15:13:41 +0200 Subject: [PATCH] SEBSERV-148 fixed JS API by switch to version 1.9.0 --- .../proctoring/ZoomWindowScriptResolver.java | 148 ++++++++++++++++-- .../proctoring/ZoomProctoringService.java | 6 +- 2 files changed, 141 insertions(+), 13 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 a5cbca8b..127fe5b8 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 @@ -42,17 +42,17 @@ public class ZoomWindowScriptResolver implements ProctoringWindowScriptResolver "\n" + " \n" + " \n" - + " \n" - + " \n" + + " \n" + + " \n" + " \n" + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + " \n" + " \n" +// + " \n" +// + " \n" +// + " \n" +// + " \n" +// + " \n" +// + " \n" +// + " \n" +// + " \n" +// + " \n" +// + ""; +// // @formatter:on + @Override public boolean applies(final ProctoringWindowData data) { try { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ZoomProctoringService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ZoomProctoringService.java index ef3b19e3..333002ed 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ZoomProctoringService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ZoomProctoringService.java @@ -156,7 +156,7 @@ public class ZoomProctoringService implements ExamProctoringService { final ClientCredentials credentials = new ClientCredentials( proctoringSettings.appKey, - this.cryptor.decrypt(proctoringSettings.appSecret)); + this.cryptor.encrypt(proctoringSettings.appSecret)); final ResponseEntity result = this.zoomRestTemplate .testServiceConnection( @@ -179,7 +179,7 @@ public class ZoomProctoringService implements ExamProctoringService { proctoringSettings.serverURL, proctoringSettings.collectingRoomSize, proctoringSettings.appKey, - this.cryptor.decrypt(proctoringSettings.appSecret)); + this.cryptor.encrypt(proctoringSettings.appSecret)); disposeServiceRoomsForExam( proctoringSettings.examId, @@ -425,7 +425,7 @@ public class ZoomProctoringService implements ExamProctoringService { return Result.tryCatch(() -> { final ClientCredentials credentials = new ClientCredentials( proctoringSettings.appKey, - this.cryptor.decrypt(proctoringSettings.appSecret)); + proctoringSettings.appSecret); // First create a new user/host for the new room final ResponseEntity createUser = this.zoomRestTemplate.createUser(