Merge pull request bartificer#64 from pricemi115/dev_issue37_statsupdate

Issue bartificer#37: Stats Update

Author: hepabolu

src/lib/statistics.mjs

@@ -561,21 +561,21 @@ class Statistics {
    * @private
    */
   __passwordStrength(stats) {
-    const minEntropyBlind = stats.minEntropyBlind;
-    const entropySeen = stats.entropySeen;
+    const minEntropyBlind = stats.minEntropyBlind.value;
+    const entropySeen = stats.entropySeen.value;
 
     const entropyBlindThreshold = this.#entropyBlindThreshold;
     const entropySeenThreshold = this.#entropySeenThreshold;
 
     // mix of good and bad
     let passwordStrength = 'OK';
 
-    if (minEntropyBlind >= entropyBlindThreshold &&
-      entropySeen >= entropySeenThreshold) {
+    if ((minEntropyBlind >= entropyBlindThreshold) &&
+        (entropySeen >= entropySeenThreshold)) {
       // all good
       passwordStrength = 'GOOD';
-    } else if (minEntropyBlind < entropyBlindThreshold &&
-      entropySeen < entropySeenThreshold) {
+    } else if ((minEntropyBlind < entropyBlindThreshold) &&
+               (entropySeen < entropySeenThreshold)) {
       // all bad
       passwordStrength = 'POOR';
     }

src/lib/statistics.test.mjs

@@ -406,10 +406,10 @@ describe('Test class Statistics', () => {
     test('with poor password strength', () => {
       // these are just the entropies
       const stats = {
-        entropyBlind: 179,
-        minEntropyBlind: 20,
-        maxEntropyBlind: 215,
-        entropySeen: 20,
+        entropyBlind: {value: 179},
+        minEntropyBlind: {value: 20},
+        maxEntropyBlind: {value: 215},
+        entropySeen: {value: 20},
       };
 
       expect(me.__passwordStrength(stats)).toBe('POOR');
@@ -418,10 +418,10 @@ describe('Test class Statistics', () => {
     test('with good password strength', () => {
       // these are just the entropies
       const stats = {
-        entropyBlind: 179,
-        minEntropyBlind: 143,
-        maxEntropyBlind: 215,
-        entropySeen: 60,
+        entropyBlind: {value: 179},
+        minEntropyBlind: {value: 143},
+        maxEntropyBlind: {value: 215},
+        entropySeen: {value: 60},
       };
 
       expect(me.__passwordStrength(stats)).toBe('GOOD');

src/lib/xkpasswd.mjs

@@ -52,6 +52,9 @@ class XKPasswd {
   setPreset(preset) {
     this.#preset = new Presets(preset);
     this.#config = this.#preset.config();
+
+    // Refresh the statistics
+    this.#statsClass = new Statistics(this.#config);
   }
 
   /**
@@ -169,7 +172,7 @@ class XKPasswd {
       num = 1;
     }
     const passwords = [];
-    for (let i = 0; i < num ; i++) {
+    for (let i = 0; i < num; i++) {
       passwords.push(this.password());
     }
 
@@ -280,21 +283,23 @@ class XKPasswd {
    * @private
    */
   __randomWords() {
-
     const numWords = this.#config.num_words;
     const maxDict = this.#dictionary.getLength();
 
     log.trace(`__randomwords, mindict: ${this.#dictionary.getMinWordLength()}
     maxdict: ${this.#dictionary.getMaxWordLength()}`);
     // get the minimum of the 2 input variables and the longest dictionary word
+    // eslint-disable-next-line max-len
     let minLength = Math.min(this.#config.word_length_min, this.#config.word_length_max, this.#dictionary.getMaxWordLength());
 
     // get the maximum of the 2 input variables and the shortest dictionary word
+    // eslint-disable-next-line max-len
     let maxLength = Math.max(this.#config.word_length_min, this.#config.word_length_max, this.#dictionary.getMinWordLength());
 
     minLength = Math.max(minLength, this.#dictionary.getMinWordLength());
     maxLength = Math.min(maxLength, this.#dictionary.getMaxWordLength());
 
+    // eslint-disable-next-line max-len
     log.trace(`about to generate ${numWords} words ${minLength} - ${maxLength}`);
 
     const list = [];

src/web/settingscontroller.mjs

@@ -76,15 +76,16 @@ class SettingsController {
     settings.sep_before_after = parseInt(settings.sep_before_after);
     settings.padding_digits_before = parseInt(settings.padding_digits_before);
     settings.padding_digits_after = parseInt(settings.padding_digits_after);
+    // eslint-disable-next-line max-len
     settings.padding_characters_before = parseInt(settings.padding_characters_before);
+    // eslint-disable-next-line max-len
     settings.padding_characters_after = parseInt(settings.padding_characters_after);
     settings.pad_to_length = parseInt(settings.pad_to_length);
 
     this.#model.setPreset({
       description: 'Custom preset',
-      config: settings
-    });
-  }
+      config: settings});
+  };
 
   /**
    * Prepare the config object as retrieved from XKPasswd library