From d100a50e1eae211fd32cbb2e60d0ec8bf001c7ad Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 22 Feb 2024 15:02:07 +0100 Subject: [PATCH] fixed sps bundle and feature keys --- .../seb/sebserver/webservice/WebserviceInfo.java | 14 +++++++------- .../resources/config/application-dev-ws.properties | 10 +++++----- .../resources/config/application-ws.properties | 14 +++++++------- src/test/resources/application-test.properties | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java index 0c43db48..115cb625 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java @@ -156,21 +156,21 @@ public class WebserviceInfo { } final boolean spsEnabled = BooleanUtils.toBoolean(environment.getProperty( - "sebserver.feature.seb.screenProctoring.enabled", + "sebserver.feature.exam.seb.screenProctoring.enabled", Constants.FALSE_STRING)); final boolean spsBundled = BooleanUtils.toBoolean(environment.getProperty( - "sebserver.feature.seb.screenProctoring.bundled", + "sebserver.feature.exam.seb.screenProctoring.bundled", Constants.FALSE_STRING)); if (spsEnabled && spsBundled) { this.screenProctoringServiceBundle = new ScreenProctoringServiceBundle( - environment.getProperty("sebserver.feature.seb.screenProctoring.bundled.url"), - environment.getProperty("sebserver.feature.seb.screenProctoring.bundled.clientId"), + environment.getProperty("sebserver.feature.exam.seb.screenProctoring.bundled.url"), + environment.getProperty("sebserver.feature.exam.seb.screenProctoring.bundled.clientId"), cryptor.encrypt( - environment.getProperty("sebserver.feature.seb.screenProctoring.bundled.clientPassword")) + environment.getProperty("sebserver.feature.exam.seb.screenProctoring.bundled.clientPassword")) .getOrThrow(), - environment.getProperty("sebserver.feature.seb.screenProctoring.bundled.sebserveraccount.username"), + environment.getProperty("sebserver.feature.exam.seb.screenProctoring.bundled.sebserveraccount.username"), cryptor.encrypt(environment - .getProperty("sebserver.feature.seb.screenProctoring.bundled.sebserveraccount.password")) + .getProperty("sebserver.feature.exam.seb.screenProctoring.bundled.sebserveraccount.password")) .getOrThrow()); } else { this.screenProctoringServiceBundle = new ScreenProctoringServiceBundle(); diff --git a/src/main/resources/config/application-dev-ws.properties b/src/main/resources/config/application-dev-ws.properties index 9f9e5f2b..750f47a7 100644 --- a/src/main/resources/config/application-dev-ws.properties +++ b/src/main/resources/config/application-dev-ws.properties @@ -72,11 +72,11 @@ springdoc.swagger-ui.oauth.clientSecret=${sebserver.password} springdoc.paths-to-exclude=/exam-api,/exam-api/discovery,/sebserver/error,/sebserver/check,/oauth,/exam-api/v1/* # features -sebserver.feature.seb.screenProctoring.enabled=true -sebserver.feature.seb.screenProctoring.bundled=true -sebserver.feature.seb.screenProctoring.bundled.url=http://localhost:8090 -sebserver.feature.seb.screenProctoring.bundled.clientId=sebserverClient -sebserver.feature.seb.screenProctoring.bundled.sebserveraccount.username=SEBServerAPIAccount +sebserver.feature.exam.seb.screenProctoring.enabled=true +sebserver.feature.exam.seb.screenProctoring.bundled=true +sebserver.feature.exam.seb.screenProctoring.bundled.url=http://localhost:8090 +sebserver.feature.exam.seb.screenProctoring.bundled.clientId=sebserverClient +sebserver.feature.exam.seb.screenProctoring.bundled.sebserveraccount.username=SEBServerAPIAccount #sebserver.feature.admin.user.administration.enabled=false #sebserver.feature.admin.user.account.enabled=false diff --git a/src/main/resources/config/application-ws.properties b/src/main/resources/config/application-ws.properties index e5968a60..960ab45a 100644 --- a/src/main/resources/config/application-ws.properties +++ b/src/main/resources/config/application-ws.properties @@ -102,11 +102,11 @@ sebserver.feature.seb.liveProctoring.enabled=true sebserver.feature.lms.type.MOCKUP.enabled=true sebserver.feature.exam.noLMS.enabled=true -sebserver.feature.seb.screenProctoring.enabled=false -sebserver.feature.seb.screenProctoring.bundled=true -sebserver.feature.seb.screenProctoring.bundled.url=sps-service:8090 -sebserver.feature.seb.screenProctoring.bundled.clientId=sebserverClient -sebserver.feature.seb.screenProctoring.bundled.clientPassword=${sps.sebserver.client.secret} -sebserver.feature.seb.screenProctoring.bundled.sebserveraccount.username=SEBServerAPIAccount -sebserver.feature.seb.screenProctoring.bundled.sebserveraccount.password=${sps.sebserver.password} +sebserver.feature.exam.seb.screenProctoring.enabled=false +sebserver.feature.exam.seb.screenProctoring.bundled=true +sebserver.feature.exam.seb.screenProctoring.bundled.url=sps-service:8090 +sebserver.feature.exam.seb.screenProctoring.bundled.clientId=sebserverClient +sebserver.feature.exam.seb.screenProctoring.bundled.clientPassword=${sps.sebserver.client.secret} +sebserver.feature.exam.seb.screenProctoring.bundled.sebserveraccount.username=SEBServerAPIAccount +sebserver.feature.exam.seb.screenProctoring.bundled.sebserveraccount.password=${sps.sebserver.password} diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties index ab8a6782..2747dec0 100644 --- a/src/test/resources/application-test.properties +++ b/src/test/resources/application-test.properties @@ -45,7 +45,7 @@ management.endpoints.web.base-path=/actuator sebserver.webservice.api.exam.indicator.name=Ping sebserver.webservice.api.exam.indicator.type=LAST_PING sebserver.webservice.api.exam.indicator.color=b4b4b4 -sebserver.webservice.api.exam.indicator.thresholds=[{"value":5000.0,"color":"22b14c"},{"value":10000.0,"color":"ff7e00"},{"value":15000.0,"color":"ed1c24"}] +sebserver.webservice.api.exam.indicator.thresholds=[{"value":5000.0,"color":"22b14c"},{"value":10000.0,"color":"ff7e00"},{"value":15000.0,"color":"ed1c24"}] sebserver.webservice.master.delay.threshold=1000 - -sebserver.feature.seb.screenProctoring.bundled=false \ No newline at end of file + +sebserver.feature.exam.seb.screenProctoring.bundled=false \ No newline at end of file