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

SEBSERV-381 some minor changes and configurable proctoring attributes

Browse source
This commit is contained in:
anhefti 2023-02-21 10:44:55 +01:00
parent 6a15effa80
commit 52d41050d2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ZoomProctoringService.java
View file

@ -146,6 +146,7 @@ public class ZoomProctoringService implements ExamProctoringService {
private final SEBClientInstructionService sebInstructionService; private final SEBClientInstructionService sebInstructionService;
private final boolean enableWaitingRoom; private final boolean enableWaitingRoom;
private final boolean sendRejoinForCollectingRoom; private final boolean sendRejoinForCollectingRoom;
private final int tokenExpirySeconds;
public ZoomProctoringService( public ZoomProctoringService(
final ExamSessionService examSessionService, final ExamSessionService examSessionService,
@ -157,7 +158,8 @@ public class ZoomProctoringService implements ExamProctoringService {
final AuthorizationService authorizationService, final AuthorizationService authorizationService,
final SEBClientInstructionService sebInstructionService, final SEBClientInstructionService sebInstructionService,
@Value("${sebserver.webservice.proctoring.enableWaitingRoom:false}") final boolean enableWaitingRoom, @Value("${sebserver.webservice.proctoring.enableWaitingRoom:false}") final boolean enableWaitingRoom,
@Value("${sebserver.webservice.proctoring.sendRejoinForCollectingRoom:false}") final boolean sendRejoinForCollectingRoom) { @Value("${sebserver.webservice.proctoring.sendRejoinForCollectingRoom:false}") final boolean sendRejoinForCollectingRoom,
@Value("${sebserver.webservice.proctoring.zoom.tokenexpiry.seconds:86400}") final int tokenExpirySeconds) {
this.examSessionService = examSessionService; this.examSessionService = examSessionService;
this.clientHttpRequestFactoryService = clientHttpRequestFactoryService; this.clientHttpRequestFactoryService = clientHttpRequestFactoryService;
@ -169,6 +171,7 @@ public class ZoomProctoringService implements ExamProctoringService {
this.sebInstructionService = sebInstructionService; this.sebInstructionService = sebInstructionService;
this.enableWaitingRoom = enableWaitingRoom; this.enableWaitingRoom = enableWaitingRoom;
this.sendRejoinForCollectingRoom = sendRejoinForCollectingRoom; this.sendRejoinForCollectingRoom = sendRejoinForCollectingRoom;
this.tokenExpirySeconds = tokenExpirySeconds;
} }
@Override @Override
@ -664,7 +667,7 @@ public class ZoomProctoringService implements ExamProctoringService {
private long expiryTimeforExam(final ProctoringServiceSettings examProctoring) { private long expiryTimeforExam(final ProctoringServiceSettings examProctoring) {
final long nowInSeconds = Utils.getSecondsNow(); final long nowInSeconds = Utils.getSecondsNow();
final long nowPlusOneDayInSeconds = nowInSeconds + Utils.toSeconds(Constants.DAY_IN_MILLIS); final long nowPlusOneDayInSeconds = nowInSeconds + this.tokenExpirySeconds;
// NOTE: It seems that since the update of web sdk to SDKToken to 1.7.0, the max is new + one day // NOTE: It seems that since the update of web sdk to SDKToken to 1.7.0, the max is new + one day
return nowPlusOneDayInSeconds - 10; return nowPlusOneDayInSeconds - 10;
@ -707,7 +710,7 @@ public class ZoomProctoringService implements ExamProctoringService {
log.info("Create new OAuthZoomRestTemplate for settings: {}", proctoringSettings); log.info("Create new OAuthZoomRestTemplate for settings: {}", proctoringSettings);
return new OAuthZoomRestTemplate(this, proctoringSettings); return new OAuthZoomRestTemplate(this, proctoringSettings);
} else { } else {
log.info("Create new JWTZoomRestTemplate for settings: {}", proctoringSettings); log.warn("Create new JWTZoomRestTemplate for settings: {}", proctoringSettings);
return new JWTZoomRestTemplate(this, proctoringSettings); return new JWTZoomRestTemplate(this, proctoringSettings);
} }
} }