diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/AgentRegistrationController.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/AgentRegistrationController.java
index 3d3cd60a..ae19e6a5 100644
--- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/AgentRegistrationController.java
+++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/AgentRegistrationController.java
@@ -28,6 +28,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -136,9 +137,14 @@ public class AgentRegistrationController {
String accessToken = jwtService.createAccessToken(request.instanceId(), application, environmentId, roles);
String refreshToken = jwtService.createRefreshToken(request.instanceId(), application, environmentId, roles);
+ String sseEndpoint = ServletUriComponentsBuilder.fromCurrentContextPath()
+ .path("/api/v1/agents/{id}/events")
+ .buildAndExpand(agent.instanceId())
+ .toUriString();
+
return ResponseEntity.ok(new AgentRegistrationResponse(
agent.instanceId(),
- "/api/v1/agents/" + agent.instanceId() + "/events",
+ sseEndpoint,
config.getHeartbeatIntervalMs(),
ed25519SigningService.getPublicKeyBase64(),
accessToken,
diff --git a/ui/index.html b/ui/index.html
index feadf71f..70980c1c 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -8,6 +8,6 @@
-
+