From 68f36d89a8c5df855cfabcca37be5abfd8347377 Mon Sep 17 00:00:00 2001
From: Meric Feyzullahoglu <meric.feyzullahoglu@gmail.com>
Date: Wed, 10 Jul 2024 14:35:30 +0200
Subject: [PATCH] Fix internal server error on subscription

The subscription manager implicitly requires the at context server
to work, which was deactivated before. Now it is activated.
In addition an endpoint was secured with RBAC.

Signed-off-by: Meric Feyzullahoglu <meric.feyzullahoglu@gmail.com>
---
 AllInOneRunner/pom.xml                                        | 4 ++--
 .../entityhandler/controller/EntityBatchController.java       | 1 +
 pom.xml                                                       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AllInOneRunner/pom.xml b/AllInOneRunner/pom.xml
index d1cabc29a..a7f581171 100644
--- a/AllInOneRunner/pom.xml
+++ b/AllInOneRunner/pom.xml
@@ -9,11 +9,11 @@
 	<artifactId>all-in-one-runner</artifactId>
 	<name>AllInOneRunner</name>
 	<dependencies>
-		<!-- <dependency>
+		<dependency>
 			<groupId>eu.neclab.ngsildbroker</groupId>
 			<artifactId>at-context-server</artifactId>
 			<version>${parent.version}</version>
-		</dependency> -->
+		</dependency>
 		<dependency>
 			<groupId>eu.neclab.ngsildbroker</groupId>
 			<artifactId>entity-manager</artifactId>
diff --git a/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchController.java b/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchController.java
index e36db488f..426a033ca 100644
--- a/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchController.java
+++ b/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchController.java
@@ -257,6 +257,7 @@ public Uni<RestResponse<Object>> deleteMultiple(HttpServerRequest request, Strin
 	}
 	@POST
 	@Path("/merge")
+	@RolesAllowed({"Factory-Admin", "Factory-Editor", "Factory-Writer"})
 	public Uni<RestResponse<Object>> mergeMultiple(HttpServerRequest request,
 													List<Map<String, Object>> compactedEntities, @QueryParam(value = "options") String options,
 													@QueryParam("localOnly") boolean localOnly) {
diff --git a/pom.xml b/pom.xml
index 2ce14f6ed..bc7b3f326 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<modules>
 		<module>BrokerParent</module>
 		<module>Commons</module>
-		<!-- <module>at-context-server</module> -->
+		<module>at-context-server</module>
 		<module>EntityManager</module>
 		<module>QueryManager</module>
 		<module>SubscriptionManager</module>