revu des secrets et .env pour différencier

src/main/java/io/gmss/fiscad/component/DataLoadConfig.java

@@ -20,8 +20,11 @@ public class DataLoadConfig {
     private final UserRepository userRepository;
     private final PasswordEncoder passwordEncoder;
 
-    @Value("${app.sourcemind.env.defaultpassword}")
-    private String defaultPassword;
+    @Value("${DEFAULT_USER_NAME_FILE}")
+    private String usernameFile;
+
+    @Value("${DEFAULT_USER_PASSWORD_FILE}")
+    private String passwordFile;
 
     public DataLoadConfig(RoleRepository roleRepository, UserRepository userRepository, PasswordEncoder passwordEncoder) {
         this.roleRepository = roleRepository;
@@ -52,14 +55,14 @@ public class DataLoadConfig {
     }
 
     public void loadUsers() {
-        if (userRepository.countAllByUsernameIsNotNull() == 0) {
+        if (userRepository.existsByUsername(usernameFile) ) {
             User admin = new User();
-            admin.setUsername("administrateur@infocad.bj");
+            admin.setUsername(usernameFile);
             admin.setEmail("administrateur@infocad.bj");
             admin.setTel("N/A");
             admin.setNom("Administrateur");
             admin.setPrenom("Principal");
-            admin.setPassword(passwordEncoder.encode(defaultPassword));
+            admin.setPassword(passwordEncoder.encode(passwordFile));
             admin.setActive(true);
             Set<Role> roles = new HashSet<>();
             roles.add(roleRepository.findRoleByNom(UserRole.ROLE_ADMIN).get());

src/main/java/io/gmss/fiscad/repositories/user/UserRepository.java

@@ -14,6 +14,8 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByUsername(String username);
 
+    boolean existsByUsername(String username);
+
     long countAllByUsernameIsNotNull();
 
     List<User> findAllByStructureAndRolesIn(Structure structure, Set<Role> roleSet);

src/main/resources/application.properties

@@ -11,7 +11,7 @@ jwt.jwtExpirationInMs=7776000000
 spring.application.name=infocad
 #logging.file.name=fiscad.log
 logging.level.org.springframework.security=DEBUG
-app.sourcemind.env.defaultpassword=1234567890
+
 app.sourcemind.env.resetlink=http://localhost:4200/reset-password/
 spring.mail.host=sandbox.smtp.mailtrap.io
 spring.mail.port=587
@@ -42,6 +42,13 @@ file.upload_dir=./uploads
 file.jasper-reports=./jasperReport
 logging.file.name=/app/logs/fiscad.log
 
+#app.abs.env.defaultpassword = 1234567890
+
+#app.abs.env.defaultuser = infocad_admin
+
+app.default-user.username=${DEFAULT_USER_NAME:}
+app.default-user.password=${DEFAULT_USER_PASSWORD:}
+
 app.upload.root=${file.upload_dir}
 app.upload.zips.received=${app.upload.root}/zips/received
 app.upload.zips.done=${app.upload.root}/zips/done