SEBSERV-487 defined some features

SafeExamBrowser · Nov 15, 2023 · 7079a4f · 7079a4f
1 parent a08a72a
commit 7079a4f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureService.java b/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureService.java
@@ -14,6 +14,12 @@
 
 public interface FeatureService {
 
+    String SCREEN_PROCTORING_FEATURE_NAME = "seb.screenProctoring";
+    String INSTITUTION_FEATURE_NAME = "admin.institution";
+    String REMOTE_PROCTORING_FEATURE_NAME = "seb.remoteProctoring";
+    String TEST_LMS_FEATURE_NAME = "lms.testLMS";
+    String EXAM_NO_LMS_FEATURE_NAME = "exam.noLMS";
+
     String FEATURE_SETTINGS_PREFIX = "sebserver.feature.";
 
     boolean isEnabled(LmsType LmsType);
@@ -22,6 +28,6 @@ public interface FeatureService {
 
     boolean isEnabled(CollectingStrategy collectingRoomStrategy);
 
-    boolean isScreenProcteringEnabled();
+    boolean isEnabled(String featureSuffix);
 
 }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureServiceImpl.java
@@ -55,16 +55,16 @@ public boolean isEnabled(final ProctoringServerType proctoringServerType) {
                 Boolean.TRUE);
     }
 
-    private String toConfigName(final String key) {
-        return key.replaceAll("_", "-");
-    }
-
     @Override
-    public boolean isScreenProcteringEnabled() {
+    public boolean isEnabled(final String featureSuffix) {
         return this.environment.getProperty(toConfigName(
-                FEATURE_SETTINGS_PREFIX + "seb.screenProctoring"),
+                        FEATURE_SETTINGS_PREFIX + featureSuffix + ".enabled"),
                 Boolean.class,
                 Boolean.FALSE);
     }
 
+    private String toConfigName(final String key) {
+        return key.replaceAll("_", "-");
+    }
+
 }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamForm.java
@@ -412,14 +412,15 @@ public void compose(final PageContext pageContext) {
             this.processTemplateSelection(formHandle.getForm(), formContext);
         }
 
-        final boolean proctoringEnabled = importFromQuizData ? false : this.restService
+        final boolean proctoringEnabled = !importFromQuizData && this.restService
                 .getBuilder(GetExamProctoringSettings.class)
                 .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
                 .call()
                 .map(ProctoringServiceSettings::getEnableProctoring)
                 .getOr(false);
 
-        final boolean screenProctoringEnabled = importFromQuizData ? false : this.restService
+        final boolean spsFeatureEnabled = this.featureService.isEnabled(FeatureService.SCREEN_PROCTORING_FEATURE_NAME);
+        final boolean screenProctoringEnabled = spsFeatureEnabled && !importFromQuizData && this.restService
                 .getBuilder(GetScreenProctoringSettings.class)
                 .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
                 .call()
@@ -430,6 +431,7 @@ public void compose(final PageContext pageContext) {
                 .clearEntityKeys()
                 .removeAttribute(AttributeKeys.IMPORT_FROM_QUIZ_DATA));
 
+
         // propagate content actions to action-pane
         actionBuilder
 
@@ -514,15 +516,15 @@ public void compose(final PageContext pageContext) {
                 .withExec(
                         this.screenProctoringSettingsPopup.settingsFunction(this.pageService, modifyGrant && editable))
                 .noEventPropagation()
-                .publishIf(() -> this.featureService.isScreenProcteringEnabled() && screenProctoringEnabled && readonly)
+                .publishIf(() -> spsFeatureEnabled && screenProctoringEnabled && readonly)
 
                 .newAction(ActionDefinition.SCREEN_PROCTORING_OFF)
                 .withEntityKey(entityKey)
                 .withExec(
                         this.screenProctoringSettingsPopup.settingsFunction(this.pageService, modifyGrant && editable))
                 .noEventPropagation()
                 .publishIf(
-                        () -> this.featureService.isScreenProcteringEnabled() && !screenProctoringEnabled && readonly)
+                        () -> spsFeatureEnabled && !screenProctoringEnabled && readonly)
 
         ;
 

diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java
@@ -150,10 +150,13 @@ public WebserviceInfo(
             this.lmsExternalAddressAlias = Collections.emptyMap();
         }
 
+        final boolean spsEnabled = BooleanUtils.toBoolean(environment.getProperty(
+                "sebserver.feature.seb.screenProctoring.enabled",
+                Constants.FALSE_STRING));
         final boolean spsBundled = BooleanUtils.toBoolean(environment.getProperty(
                 "sebserver.feature.seb.screenProctoring.bundled",
                 Constants.FALSE_STRING));
-        if (spsBundled) {
+        if (spsEnabled && spsBundled) {
             this.screenProctoringServiceBundle = new ScreenProctoringServiceBundle(
                     environment.getProperty("sebserver.feature.seb.screenProctoring.bundled.url"),
                     environment.getProperty("sebserver.feature.seb.screenProctoring.bundled.clientId"),

diff --git a/src/main/resources/config/application-dev.properties b/src/main/resources/config/application-dev.properties
@@ -30,4 +30,4 @@ sebserver.http.client.connection-request-timeout=10000
 sebserver.http.client.read-timeout=60000
 
 # features
-sebserver.feature.seb.screenProctoring=true
+sebserver.feature.seb.screenProctoring.enabled=true
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
@@ -64,7 +64,12 @@ sebserver.ssl.redirect.enabled=false
 sebserver.ssl.redirect.html.port=8080
 
 # features
-sebserver.feature.seb.screenProctoring=false
+sebserver.feature.admin.institution.enabled=true
+sebserver.feature.seb.remoteProctoring.enabled=true
+sebserver.feature.lms.testLMS.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