Make health token optional

ls1intum · Jul 21, 2023 · 9395e67 · 9395e67
1 parent 8a139ad
commit 9395e67
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java
@@ -8,6 +8,7 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.*;
+import java.util.Optional;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -60,7 +61,7 @@ public class GitLabService extends AbstractVersionControlService {
     private String ciToken;
 
     @Value("${artemis.version-control.health-api-token}")
-    private String ciHealthToken;
+    private Optional<String> ciHealthToken;
 
     private final UserRepository userRepository;
 
@@ -508,7 +509,10 @@ private void updateMemberPermissionInRepository(VcsRepositoryUrl repositoryUrl,
     public ConnectorHealth health() {
         try {
             UriComponentsBuilder builder = Endpoints.HEALTH.buildEndpoint(gitlabServerUrl.toString());
-            URI uri = builder.queryParam("token", ciHealthToken).build().toUri();
+            if (ciHealthToken != null) {
+                builder.queryParam("token", ciHealthToken);
+            }
+            URI uri = builder.build().toUri();
 
             final var healthResponse = shortTimeoutRestTemplate.getForObject(uri, JsonNode.class);
             final var status = healthResponse.get("status").asText();