Replacing genereatepassword with create pass

Author: daveotengo

sormas-api/src/main/java/de/symeda/sormas/api/utils/PasswordHelper.java

@@ -25,7 +25,6 @@
 import javax.validation.ValidationException;
 
 import org.apache.commons.codec.binary.Hex;
-import java.util.Arrays;
 
 public final class PasswordHelper {
 
@@ -68,58 +67,6 @@ private PasswordHelper() {
         }
     }
 
-    public static String generatePasswordWithSpecialChars(int length) {
-        // Combine the existing character set with special characters
-        char[] combinedChars = Arrays.copyOf(PASSWORD_CHARS, PASSWORD_CHARS.length + 10);
-        combinedChars[PASSWORD_CHARS.length] = '!';
-        combinedChars[PASSWORD_CHARS.length + 1] = '@';
-        combinedChars[PASSWORD_CHARS.length + 2] = '#';
-        combinedChars[PASSWORD_CHARS.length + 3] = '$';
-        combinedChars[PASSWORD_CHARS.length + 4] = '%';
-        combinedChars[PASSWORD_CHARS.length + 5] = '^';
-        combinedChars[PASSWORD_CHARS.length + 6] = '&';
-        combinedChars[PASSWORD_CHARS.length + 7] = '*';
-        combinedChars[PASSWORD_CHARS.length + 8] = '(';
-        combinedChars[PASSWORD_CHARS.length + 9] = ')';
-
-        SecureRandom rnd = new SecureRandom();
-        char[] chs = new char[length];
-
-        // Ensure at least one digit
-        chs[0] = (char) ('2' + rnd.nextInt(8)); // 2-9
-
-        // Ensure at least one special character
-        chs[1] = combinedChars[PASSWORD_CHARS.length + rnd.nextInt(10)];
-
-        // Ensure at least one uppercase letter
-        chs[2] = (char) ('A' + rnd.nextInt(26));
-        while (chs[2] == 'I' || chs[2] == 'O' || chs[2] == 'V') {
-            chs[2] = (char) ('A' + rnd.nextInt(26));
-        }
-
-        // Ensure at least one lowercase letter
-        chs[3] = (char) ('a' + rnd.nextInt(26));
-        while (chs[3] == 'l' || chs[3] == 'v') {
-            chs[3] = (char) ('a' + rnd.nextInt(26));
-        }
-
-        // Fill the rest of the password
-        for (int i = 4; i < length; i++) {
-            chs[i] = combinedChars[rnd.nextInt(combinedChars.length)];
-        }
-
-        // Shuffle the password array to avoid predictable patterns
-        for (int i = 0; i < chs.length; i++) {
-            int randomIndex = rnd.nextInt(chs.length);
-            char temp = chs[i];
-            chs[i] = chs[randomIndex];
-            chs[randomIndex] = temp;
-        }
-
-        return new String(chs);
-    }
-
-
     public static String createPass(final int length) {
 
         SecureRandom rnd = new SecureRandom();

sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserService.java

@@ -183,18 +183,18 @@ public List<User> getAllByDistrictsAndUserRights(List<District> districts, Colle
         return em.createQuery(cq).getResultList();
     }
 
-	/**
-	 * Loads users filtered by combinable filter conditions.<br />
-	 * Condition combination if parameter is set:<br />
-	 * {@code ((regionUuids & districtUuids & filterByJurisdiction & userRoles) | includeSupervisors) & activeOnly}
-	 * 
-	 * @see #createCurrentUserJurisdictionFilter(CriteriaBuilder, From)
-	 * @param regionUuids
-	 * @param districtUuids
-	 * @param filterByCurrentUserJurisdiction
-	 * @param activeOnly
-	 * @param userRights
-	 */
+    /**
+     * Loads users filtered by combinable filter conditions.<br />
+     * Condition combination if parameter is set:<br />
+     * {@code ((regionUuids & districtUuids & filterByJurisdiction & userRoles) | includeSupervisors) & activeOnly}
+     *
+     * @param regionUuids
+     * @param districtUuids
+     * @param filterByCurrentUserJurisdiction
+     * @param activeOnly
+     * @param userRights
+     * @see #createCurrentUserJurisdictionFilter(CriteriaBuilder, From)
+     */
     public List<UserReference> getUserReferences(List<String> regionUuids, List<String> districtUuids, boolean activeOnly, UserRight... userRights) {
 
         return getUserReferences(regionUuids, districtUuids, null, activeOnly, userRights);
@@ -219,19 +219,19 @@ public List<UserReference> getUserReferences(
         return getUserReferences(regionUuids, districtUuids, communityUuids, activeOnly, limitedDisease, false, Arrays.asList(userRights));
     }
 
-	/**
-	 * Loads users filtered by combinable filter conditions.<br />
-	 * Condition combination if parameter is set:<br />
-	 * {@code ((regionUuids & districtUuids & communityUuids & filterByJurisdiction & userRoles) | includeSupervisors) & activeOnly}
-	 *
-	 * @see #createCurrentUserJurisdictionFilter(CriteriaBuilder, From)
-	 * @param regionUuids
-	 * @param districtUuids
-	 * @param communityUuids
-	 * @param filterByJurisdiction
-	 * @param activeOnly
-	 * @param userRights
-	 */
+    /**
+     * Loads users filtered by combinable filter conditions.<br />
+     * Condition combination if parameter is set:<br />
+     * {@code ((regionUuids & districtUuids & communityUuids & filterByJurisdiction & userRoles) | includeSupervisors) & activeOnly}
+     *
+     * @param regionUuids
+     * @param districtUuids
+     * @param communityUuids
+     * @param filterByJurisdiction
+     * @param activeOnly
+     * @param userRights
+     * @see #createCurrentUserJurisdictionFilter(CriteriaBuilder, From)
+     */
     public List<UserReference> getUserReferences(
             List<String> regionUuids,
             List<String> districtUuids,
@@ -654,7 +654,7 @@ public static String setNewPassword(User user) {
     }
 
     public String generatePassword() {
-        return PasswordHelper.generatePasswordWithSpecialChars(12);
+        return PasswordHelper.createPass(12);
     }
 
     public String updatePassword(String userUuid, String password) {
@@ -763,7 +763,6 @@ public Long countByAssignedOfficer(User officer, UserRight userRights) {
     }
 
     /**
-     *
      * @param districts
      * @param userRight
      * @return Number of users with specified UserRight on district level
@@ -782,7 +781,6 @@ public Long countByDistricts(List<District> districts, UserRight userRight) {
     }
 
     /**
-     *
      * @param districts
      * @return Number of users with specified UserRight on community level
      */
@@ -799,11 +797,10 @@ public Long countByCommunities(List<District> districts, UserRight userRight) {
         return em.createQuery(cq).getSingleResult();
     }
 
-	/**
-	 *
-	 * @param districts
-	 * @return Number of users with specified UserRight on health facility level
-	 */
+    /**
+     * @param districts
+     * @return Number of users with specified UserRight on health facility level
+     */
     public Long countByHealthFacilities(List<District> districts, UserRight userRight) {
 
         CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -817,11 +814,10 @@ public Long countByHealthFacilities(List<District> districts, UserRight userRigh
         return em.createQuery(cq).getSingleResult();
     }
 
-	/**
-	 *
-	 * @param districts
-	 * @return Number of users with specified UserRight on pointOfEntry level
-	 */
+    /**
+     * @param districts
+     * @return Number of users with specified UserRight on pointOfEntry level
+     */
     public Long countByPointOfEntries(List<District> districts, UserRight userRight) {
 
         CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -847,10 +843,9 @@ public boolean hasRegion(RegionReferenceDto regionReference) {
         return currentUser.getRegion().getUuid().equals(regionReference.getUuid());
     }
 
-	/**
-	 * @param root
-	 *            root to {@link User} or {@link UserReference}.
-	 */
+    /**
+     * @param root root to {@link User} or {@link UserReference}.
+     */
     private Predicate createDefaultFilter(CriteriaBuilder cb, From<?, ?> root) {
         return cb.isTrue(root.get(User.ACTIVE));
     }