Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 6c1966c

Browse files
JonasCirJonas Cirotzki
andauthored
Feature/4129 Server property for default user creation (SORMAS-Foundation#4131)
* [SORMAS-Foundation#4129] control default user creation * [SORMAS-Foundation#4129] logging * [SORMAS-Foundation#4129] review comments * [SORMAS-Foundation#4129] reformat Co-authored-by: Jonas Cirotzki <[email protected]>
1 parent 255ad6c commit 6c1966c

3 files changed

Lines changed: 22 additions & 5 deletions

File tree

sormas-backend/src/main/java/de/symeda/sormas/backend/common/ConfigFacadeEjb.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ public class ConfigFacadeEjb implements ConfigFacade {
130130

131131
private static final String DASHBOARD_MAP_MARKER_LIMIT = "dashboardMapMarkerLimit";
132132

133+
private static final String CREATE_DEFAULT_USERS = "createDefaultUsers";
134+
133135
private final Logger logger = LoggerFactory.getLogger(getClass());
134136

135137
@Resource(lookup = "sormas/Properties")
@@ -538,6 +540,10 @@ public int getDashboardMapMarkerLimit() {
538540
return getInt(DASHBOARD_MAP_MARKER_LIMIT, -1);
539541
}
540542

543+
public boolean isCreateDefaultUsers() {
544+
return getBoolean(CREATE_DEFAULT_USERS, true);
545+
}
546+
541547
public String getDocgenerationNullReplacement() {
542548
return getProperty(DOCGENERATION_NULL_REPLACEMENT, "./.");
543549
}

sormas-backend/src/main/java/de/symeda/sormas/backend/common/StartupShutdownService.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,18 @@ private void createDefaultUsers() {
340340

341341
if (userService.count() == 0) {
342342

343+
// Create Admin
344+
User admin = MockDataGenerator.createUser(UserRole.ADMIN, "ad", "min", "sadmin");
345+
admin.setUserName("admin");
346+
userService.persist(admin);
347+
userUpdateEvent.fire(new UserUpdateEvent(admin));
348+
349+
if (!configFacade.isCreateDefaultUsers()) {
350+
// return if getCreateDefaultUsers() is false
351+
logger.info("Skipping the creation of default users");
352+
return;
353+
}
354+
343355
Region region = regionService.getAll().get(0);
344356
District district = region.getDistricts().get(0);
345357
Community community = district.getCommunities().get(0);
@@ -349,11 +361,7 @@ private void createDefaultUsers() {
349361
Facility laboratory = laboratories.size() > 0 ? laboratories.get(0) : null;
350362
PointOfEntry pointOfEntry = pointOfEntryService.getAllActive().get(0);
351363

352-
// Create Admin
353-
User admin = MockDataGenerator.createUser(UserRole.ADMIN, "ad", "min", "sadmin");
354-
admin.setUserName("admin");
355-
userService.persist(admin);
356-
userUpdateEvent.fire(new UserUpdateEvent(admin));
364+
logger.info("Create default users");
357365

358366
// Create Surveillance Supervisor
359367
User surveillanceSupervisor = MockDataGenerator.createUser(UserRole.SURVEILLANCE_SUPERVISOR, "Surveillance", "Supervisor", "SurvSup");

sormas-base/setup/sormas.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,6 @@ sms.auth.secret=
196196
# Default replacement for empty variables in document generation
197197
# default "./."
198198
#docgeneration.nullReplacement=./.
199+
200+
# Control the creation of the default users
201+
# createDefaultUsers=true

0 commit comments

Comments
 (0)