Zookeeper

.gitignore

@@ -94,9 +94,11 @@ conversation/src/main/resources/view/
 **/backend/**/resources/public/*.*
 # Ignore HTML files in "backend/view" folders
 **/backend/**/resources/view/*.html
-broker-parent/broker-client
+#broker-parent/broker-client
 .env
 dependency-reduced-pom.xml
 .flattened-pom.xml
 .version.properties
 .pnpm-store
+
+?

Jenkinsfile

@@ -39,6 +39,13 @@ pipeline {
           }
         }
       }
+      /*
+        stage('Build image') {
+            steps {
+                sh 'edifice image'
+            }
+        }
+        */
     }
   post {
     cleanup {

admin/pom.xml

@@ -19,5 +19,19 @@
             <version>${revision}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>fr.wseduc</groupId>
+            <artifactId>mod-sms-proxy</artifactId>
+            <version>2.0-zookeeper-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <classifier>fat</classifier>
+        </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>mod-mongo-persistor</artifactId>
+            <version>4.1-zookeeper-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <classifier>fat</classifier>
+        </dependency>
     </dependencies>
 </project>

admin/src/main/java/org/entcore/admin/Admin.java

@@ -18,66 +18,79 @@
 
 package org.entcore.admin;
 
+import io.vertx.core.Future;
 import io.vertx.core.Promise;
+
+import java.util.Map;
+
 import org.entcore.admin.controllers.AdminController;
 import org.entcore.admin.controllers.BlockProfileTraceController;
 import org.entcore.admin.controllers.PlatformInfoController;
 import org.entcore.admin.controllers.ConfigController;
 import org.entcore.admin.services.BlockProfileTraceService;
 import org.entcore.admin.services.impl.DefaultBlockProfileTraceService;
 import org.entcore.common.http.BaseServer;
+
+import fr.wseduc.webutils.collections.SharedDataHelper;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 import io.vertx.core.eventbus.Message;
 import io.vertx.core.json.JsonObject;
-import io.vertx.core.shareddata.LocalMap;
 import io.vertx.core.eventbus.DeliveryOptions;
 
 public class Admin extends BaseServer {
 
-	 @Override
-	 public void start(final Promise<Void> startPromise) throws Exception {
-		 super.start(startPromise);
-
-		 addController(new AdminController());
+	@Override
+	public void start(final Promise<Void> startPromise) throws Exception {
+		final Promise<Void> promise = Promise.promise();
+		super.start(promise);
+		promise.future()
+				.compose(init -> SharedDataHelper.getInstance().<String, Object>getLocalMulti("server", "smsProvider", "node", "hidePersonalData"))
+				.compose(adminConfigMap -> initAdmin(adminConfigMap))
+				.onComplete(startPromise);
+	}
+
+	public Future<Void> initAdmin(final Map<String, Object> adminMap) {
+		addController(new AdminController());
 
-		 BlockProfileTraceController blockProfileTraceController = new BlockProfileTraceController("adminv2");
-		 BlockProfileTraceService blockProfileTraceService = new DefaultBlockProfileTraceService("adminv2");
-		 blockProfileTraceController.setBlockProfileTraceService(blockProfileTraceService);
-		 addController(blockProfileTraceController);
-		 addController(new ConfigController());
-
-		 final PlatformInfoController platformInfoController = new PlatformInfoController();
+		BlockProfileTraceController blockProfileTraceController = new BlockProfileTraceController("adminv2");
+		BlockProfileTraceService blockProfileTraceService = new DefaultBlockProfileTraceService("adminv2");
+		blockProfileTraceController.setBlockProfileTraceService(blockProfileTraceService);
+		addController(blockProfileTraceController);
+		addController(new ConfigController());
+
+		final PlatformInfoController platformInfoController = new PlatformInfoController();
+		platformInfoController.setHidePersonalData((Boolean) adminMap.get("hidePersonalData"));
 
-		 // check if sms module activated
-		 String smsAddress = "";
-		 String smsProvider = "";
-		 LocalMap<Object, Object> server = vertx.sharedData().getLocalMap("server");
-		 if(server != null && server.get("smsProvider") != null) {
-			 smsProvider = (String) server.get("smsProvider");
-			 final String node = (String) server.get("node");
-			 smsAddress = (node != null ? node : "") + "entcore.sms";
-		 } else {
-			 smsAddress = "entcore.sms";
-		 }
+		// check if sms module activated
+		String smsAddress = "";
+		String smsProvider = "";
+		if(adminMap.get("smsProvider") != null) {
+			smsProvider = (String) adminMap.get("smsProvider");
+			final String node = (String) adminMap.get("node");
+			smsAddress = (node != null ? node : "") + "entcore.sms";
+		} else {
+			smsAddress = "entcore.sms";
+		}
 
-		 JsonObject pingAction = new JsonObject()
-				 .put("provider", smsProvider)
-				 .put("action", "ping");
+		JsonObject pingAction = new JsonObject()
+				.put("provider", smsProvider)
+				.put("action", "ping");
 
-		 vertx.eventBus().request(smsAddress, pingAction, new DeliveryOptions().setSendTimeout(5000l),
-				 new Handler<AsyncResult<Message<JsonObject>>>() {
-					 @Override
-					 public void handle(AsyncResult<Message<JsonObject>> res) {
-						 if (res != null && res.succeeded()) {
-							 if ("ok".equals(res.result().body().getString("status"))) {
-								 platformInfoController.setSmsModule(true);
-							 }
-						 }
-						 addController(platformInfoController);
-					 }
-				 }
-		 );
-	 }
+		vertx.eventBus().request(smsAddress, pingAction, new DeliveryOptions().setSendTimeout(5000l),
+				new Handler<AsyncResult<Message<JsonObject>>>() {
+					@Override
+					public void handle(AsyncResult<Message<JsonObject>> res) {
+						if (res != null && res.succeeded()) {
+							if ("ok".equals(res.result().body().getString("status"))) {
+								platformInfoController.setSmsModule(true);
+							}
+						}
+						addController(platformInfoController);
+					}
+				}
+		);
+		return Future.succeededFuture();
+	}
 
 }

admin/src/main/java/org/entcore/admin/controllers/BlockProfileTraceController.java

@@ -1,7 +1,6 @@
 package org.entcore.admin.controllers;
 
 import fr.wseduc.bus.BusAddress;
-import fr.wseduc.mongodb.MongoDb;
 import fr.wseduc.rs.ApiDoc;
 import fr.wseduc.rs.Get;
 import fr.wseduc.security.ActionType;

admin/src/main/java/org/entcore/admin/controllers/PlatformInfoController.java

@@ -26,7 +26,6 @@
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import io.vertx.core.shareddata.LocalMap;
 import org.entcore.common.http.filter.AdminFilter;
 import org.entcore.common.http.filter.ResourceFilter;
 
@@ -40,6 +39,7 @@ public class PlatformInfoController extends BaseController {
 
 	private boolean smsActivated;
 	private static final List<String> PROFILES = Arrays.asList("Personnel", "Teacher", "Student", "Relative", "Guest");
+	private boolean hidePersonalData;
 
 	@Get("api/platform/module/sms")
 	@SecuredAction(type = ActionType.RESOURCE, value = "")
@@ -62,15 +62,13 @@ public void setSmsModule(boolean smsModule) {
 	@ResourceFilter(AdminFilter.class)
 	@MfaProtected()
 	public void readConfig(HttpServerRequest request) {
-		LocalMap<Object, Object> serverMap = vertx.sharedData().getLocalMap("server");
-
 		final JsonObject preDelete = config.getJsonObject("pre-delete");
 		final JsonObject configuration =  new JsonObject()
 				.put("delete-user-delay", config.getLong("delete-user-delay", defaultDeleteUserDelay))
 				.put("reset-code-delay", config.getLong("resetCodeDelay", 0L))
 				.put("distributions", config.getJsonArray("distributions", new JsonArray()))
 				.put("hide-adminv1-link", config.getBoolean("hide-adminv1-link", false))
-				.put("hide-personal-data", serverMap.get("hidePersonalData"))
+				.put("hide-personal-data", hidePersonalData)
 				.put("mass-messaging-enabled", config.getBoolean("mass-messaging-enabled"))
 				.put("allow-adml-structure-name-change", config.getBoolean("allow-adml-structure-name-change", true))
 				.put("enable-manual-group-autolink", config.getBoolean("enable-manual-group-autolink", false))
@@ -95,4 +93,9 @@ public void readConfig(HttpServerRequest request) {
 
 		renderJson(request, configuration);
 	}
+
+	public void setHidePersonalData(boolean hidePersonalData) {
+		this.hidePersonalData = hidePersonalData;
+	}
+
 }

admin/src/main/java/org/entcore/admin/services/impl/DefaultBlockProfileTraceService.java

@@ -4,7 +4,6 @@
 import fr.wseduc.mongodb.MongoDb;
 import fr.wseduc.mongodb.MongoQueryBuilder;
 import fr.wseduc.webutils.Either;
-import fr.wseduc.webutils.request.filter.Filter;
 import io.vertx.core.Handler;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;

admin/src/main/resources/i18n/fr.json

@@ -1296,6 +1296,7 @@
   "rss-widget": "RSS",
   "save": "Enregistrer",
   "save.modifications": "Enregistrer les modifications",
+  "screen-time-widget": "Temps d'écran",
   "scholarshipHolder": "Boursier",
   "school-widget": "Mon réseau",
   "screen-time-widget": "Temps d'écran",

admin/src/main/ts/package.json

@@ -34,9 +34,9 @@
     "font-awesome": "4.7.0",
     "jquery": "^3.4.1",
     "ngx-infinite-scroll": "14.0.1",
-    "ngx-ode-core": "dev",
-    "ngx-ode-sijil": "dev",
-    "ngx-ode-ui": "dev",
+    "ngx-ode-core": "zookeeper",
+    "ngx-ode-sijil": "zookeeper",
+    "ngx-ode-ui": "zookeeper",
     "ngx-trumbowyg": "^6.0.7",
     "noty": "2.4.1",
     "reflect-metadata": "0.1.10",

app-registry/pom.xml

@@ -25,5 +25,12 @@
             <version>${revision}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>mod-mongo-persistor</artifactId>
+            <version>4.1-zookeeper-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <classifier>fat</classifier>
+        </dependency>
     </dependencies>
 </project>

app-registry/src/main/java/org/entcore/registry/AppRegistry.java

@@ -19,6 +19,7 @@
 
 package org.entcore.registry;
 
+import io.vertx.core.Future;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.Promise;
 import org.entcore.broker.api.utils.AddressParameter;
@@ -29,33 +30,53 @@
 import org.entcore.registry.filters.AppRegistryFilter;
 import org.entcore.registry.services.impl.NopAppRegistryEventService;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class AppRegistry extends BaseServer {
 
 	@Override
 	public void start(final Promise<Void> startPromise) throws Exception {
-		super.start(startPromise);
-		final AppRegistryController appRegistryController = new AppRegistryController();
-		addController(appRegistryController);
-		addController(new ExternalApplicationController(config.getInteger("massAuthorizeBatchSize", 1000)));
-		addController(new WidgetController());
-		addController(new LibraryController(vertx, config()));
+		final Promise<Void> promise = Promise.promise();
+		super.start(promise);
+		promise.future().compose(init -> initAppRegistry()).onComplete(startPromise);
+	}
+
+	public Future<Void> initAppRegistry() {
+    final List<Future<?>> futures = new ArrayList<>();
+    final AppRegistryController appRegistryController = new AppRegistryController();
+    futures.add(addController(appRegistryController));
+
+    futures.add(addController(new ExternalApplicationController(config.getInteger("massAuthorizeBatchSize", 1000))));
+    futures.add(addController(new WidgetController()));
+		try {
+      futures.add(addController(new LibraryController(vertx, config())));
+		} catch (Exception e) {
+			return Future.failedFuture(e);
+		}
 		BrokerProxyUtils.addBrokerProxy(appRegistryController, vertx, new AddressParameter("application", "appregistry"));
 		JsonObject eduMalinConf = config.getJsonObject("edumalin-widget-config");
 		if(eduMalinConf != null)
-			addController(new EdumalinWidgetController());
+      futures.add(addController(new EdumalinWidgetController()));
 
 		JsonObject webGerestEnabled = config.getJsonObject("webGerest-config");
 		if(webGerestEnabled != null) {
-			addController(new WebGerestController());
+      futures.add(addController(new WebGerestController()));
 		}
 		JsonObject screenTimeEnabled = config.getJsonObject("screen-time-config");
 		if(screenTimeEnabled != null) {
-			addController(new ScreenTimeController());
+      futures.add(addController(new ScreenTimeController()));
+		}
+
+		JsonObject ptitObservatoireConf = config.getJsonObject("ptit-observatoire-widget-config");
+		if (ptitObservatoireConf != null) {
+			addController(new PtitObservatoireController());
 		}
 
 		setDefaultResourceFilter(new AppRegistryFilter());
 		new AppRegistryEventsHandler(vertx, new NopAppRegistryEventService());
 		vertx.eventBus().publish("app-registry.loaded", new JsonObject());
+		return Future.all(futures).mapEmpty();
 	}
 
 }

app-registry/src/main/java/org/entcore/registry/controllers/AppRegistryController.java

@@ -30,11 +30,13 @@
 import fr.wseduc.webutils.Either;
 import fr.wseduc.webutils.I18n;
 import fr.wseduc.webutils.Server;
+import fr.wseduc.webutils.collections.SharedDataHelper;
 import fr.wseduc.webutils.http.BaseController;
 
 import fr.wseduc.webutils.http.Renders;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
+import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import org.apache.commons.lang3.NotImplementedException;
 import org.entcore.broker.api.appregistry.AppRegistrationRequestDTO;
@@ -77,10 +79,13 @@ public class AppRegistryController extends BaseController implements AppRegistry
 	private final AppRegistryService appRegistryService = new DefaultAppRegistryService();
 	private JsonObject skinLevels;
 
-	public void init(Vertx vertx, JsonObject config, RouteMatcher rm,
-					 Map<String, fr.wseduc.webutils.security.SecuredAction> securedActions) {
+	public Future<Void> initAsync(Vertx vertx, JsonObject config, RouteMatcher rm,
+                          Map<String, fr.wseduc.webutils.security.SecuredAction> securedActions) {
 		super.init(vertx, config, rm, securedActions);
-		this.skinLevels = new JsonObject(vertx.sharedData().getLocalMap("skin-levels"));
+		return SharedDataHelper.getInstance().<String, JsonObject>getLocal("server", "skin-levels")
+			.onSuccess(skinLevels -> AppRegistryController.this.skinLevels = skinLevels)
+			.onFailure(ex -> log.error("Error getting skin-levels", ex))
+      .mapEmpty();
 	}
 
 	@Get("/admin-console")
@@ -532,7 +537,7 @@ public void handle(JsonObject body) {
     @Put("/structures/:structureId/roles")
     @SecuredAction(value = "", type = ActionType.RESOURCE)
     @ResourceFilter(AdminFilter.class)
-		@MfaProtected()
+	@MfaProtected()
     public void authorizeProfiles(final HttpServerRequest request) {
         bodyToJson(request, new Handler<JsonObject>() {
             @Override