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

SEBSERV-270 fixed

Browse source
This commit is contained in:
anhefti 2022-02-28 14:30:20 +01:00
parent 1d6bd86b57
commit ed28bb7c5d
3 changed files with 28 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,20 +141,6 @@ public class JitsiProctoringService implements ExamProctoringService {
"proctoringSettings:serverURL:invalidURL"); "proctoringSettings:serverURL:invalidURL");
} }
if (StringUtils.isBlank(proctoringSettings.appKey)) {
throw new APIMessageException(Arrays.asList(
APIMessage.fieldValidationError(ProctoringServiceSettings.ATTR_APP_KEY,
"proctoringSettings:appKey:notNull"),
APIMessage.ErrorMessage.EXTERNAL_SERVICE_BINDING_ERROR.of()));
}
if (StringUtils.isBlank(proctoringSettings.appSecret)) {
throw new APIMessageException(Arrays.asList(
APIMessage.fieldValidationError(ProctoringServiceSettings.ATTR_APP_SECRET,
"proctoringSettings:appSecret:notNull"),
APIMessage.ErrorMessage.EXTERNAL_SERVICE_BINDING_ERROR.of()));
}
final ClientHttpRequestFactory clientHttpRequestFactory = this.clientHttpRequestFactoryService final ClientHttpRequestFactory clientHttpRequestFactory = this.clientHttpRequestFactoryService
.getClientHttpRequestFactory() .getClientHttpRequestFactory()
.getOrThrow(); .getOrThrow();

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

@ -172,20 +172,6 @@ public class ZoomProctoringService implements ExamProctoringService {
"proctoringSettings:serverURL:invalidURL"); "proctoringSettings:serverURL:invalidURL");
} }
if (StringUtils.isBlank(proctoringSettings.appKey)) {
throw new APIMessageException(Arrays.asList(
APIMessage.fieldValidationError(ProctoringServiceSettings.ATTR_APP_KEY,
"proctoringSettings:appKey:notNull"),
APIMessage.ErrorMessage.EXTERNAL_SERVICE_BINDING_ERROR.of()));
}
if (StringUtils.isBlank(proctoringSettings.appSecret)) {
throw new APIMessageException(Arrays.asList(
APIMessage.fieldValidationError(ProctoringServiceSettings.ATTR_APP_SECRET,
"proctoringSettings:appSecret:notNull"),
APIMessage.ErrorMessage.EXTERNAL_SERVICE_BINDING_ERROR.of()));
}
try { try {
final ClientCredentials credentials = new ClientCredentials( final ClientCredentials credentials = new ClientCredentials(

47
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/validation/ProctoringSettingsValidator.java
View file

@ -25,28 +25,37 @@ public class ProctoringSettingsValidator
return false; return false;
} }
if (value.enableProctoring) { //if (value.enableProctoring) {
if (value.serverType == ProctoringServerType.JITSI_MEET || value.serverType == ProctoringServerType.ZOOM) { if (value.serverType == ProctoringServerType.JITSI_MEET || value.serverType == ProctoringServerType.ZOOM) {
boolean passed = true; boolean passed = true;
if (StringUtils.isBlank(value.appKey)) {
context.disableDefaultConstraintViolation();
context
.buildConstraintViolationWithTemplate("proctoringSettings:appKey:notNull")
.addPropertyNode("appKey").addConstraintViolation();
passed = false;
}
if (StringUtils.isBlank(value.appSecret)) { if (StringUtils.isBlank(value.serverURL)) {
context.disableDefaultConstraintViolation(); context.disableDefaultConstraintViolation();
context context
.buildConstraintViolationWithTemplate("proctoringSettings:appSecret:notNull") .buildConstraintViolationWithTemplate("proctoringSettings:serverURL:notNull")
.addPropertyNode("appSecret").addConstraintViolation(); .addPropertyNode("serverURL").addConstraintViolation();
passed = false; passed = false;
}
return passed;
} }
if (StringUtils.isBlank(value.appKey)) {
context.disableDefaultConstraintViolation();
context
.buildConstraintViolationWithTemplate("proctoringSettings:appKey:notNull")
.addPropertyNode("appKey").addConstraintViolation();
passed = false;
}
if (StringUtils.isBlank(value.appSecret)) {
context.disableDefaultConstraintViolation();
context
.buildConstraintViolationWithTemplate("proctoringSettings:appSecret:notNull")
.addPropertyNode("appSecret").addConstraintViolation();
passed = false;
}
return passed;
} }
//}
return true; return true;
} }