Merge #16978 - Fix #16974 - Replace zxcvbn by zxcvbn-ts

Pull-request: #16978 Fixes: #16974 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Jun 27, 2021 · ee6220d · ee6220d
2 parents 6996e8d + 135b116
commit ee6220d
Show file tree

Hide file tree

Showing 11 changed files with 2,159 additions and 70 deletions.
diff --git a/js/src/functions.js b/js/src/functions.js
@@ -6,7 +6,7 @@
 /* global Indexes */ // js/indexes.js
 /* global firstDayOfCalendar, maxInputVars, mysqlDocTemplate, themeImagePath */ // templates/javascript/variables.twig
 /* global sprintf */ // js/vendor/sprintf.js
-/* global zxcvbn */ // js/vendor/zxcvbn.js
+/* global zxcvbnts */ // js/vendor/zxcvbn-ts.js
 
 /**
  * general function, usually for data manipulation pages
@@ -518,7 +518,9 @@ Functions.checkPasswordStrength = function (value, meterObject, meterObjectLabel
     if (username !== null) {
         customDict.push(username);
     }
-    var zxcvbnObject = zxcvbn(value, customDict);
+
+    zxcvbnts.core.ZxcvbnOptions.setOptions({ dictionary: { userInputs: customDict } });
+    var zxcvbnObject = zxcvbnts.core.zxcvbn(value);
     var strength = zxcvbnObject.score;
     strength = parseInt(strength);
     meterObject.val(strength);