change the method for the password's minLength to be max, so if a big…

…ger value than 6 is retrieved from "system.security.passwordEnforcement.minLength" this is taken into account (#6953)
geonetwork · Mar 30, 2023 · 159d82b · 159d82b
1 parent f909c1d
commit 159d82b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/web-ui/src/main/resources/catalog/js/LoginController.js b/web-ui/src/main/resources/catalog/js/LoginController.js
@@ -84,7 +84,8 @@
       $scope.isShowLoginAsLink = gnGlobalSettings.isShowLoginAsLink;
       $scope.isUserProfileUpdateEnabled = gnGlobalSettings.isUserProfileUpdateEnabled;
 
-      $scope.passwordMinLength = Math.min(
+      // take the bigger of the two values
+      $scope.passwordMinLength = Math.max(
         gnConfig["system.security.passwordEnforcement.minLength"],
         6
       );

diff --git a/web-ui/src/main/resources/catalog/js/admin/UserGroupController.js b/web-ui/src/main/resources/catalog/js/admin/UserGroupController.js
@@ -118,7 +118,8 @@
       $scope.isLoadingGroups = false;
 
       gnConfigService.load().then(function (c) {
-        $scope.passwordMinLength = Math.min(
+        // take the bigger of the two values 
+        $scope.passwordMinLength = Math.max(
           gnConfig["system.security.passwordEnforcement.minLength"],
           6
         );