fix(package): fixed the calculation of the strength (unit transform)

angular-material-extensions · Aug 1, 2018 · 798ced0 · 798ced0
1 parent b70cb74
commit 798ced0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/demo/src/app/home/home.component.html b/demo/src/app/home/home.component.html
@@ -79,6 +79,7 @@ <h1>@angular-material-extensions/password-strength</h1>
 
             <!--@angular-material-extensions/password-strength's main component-->
             <mat-password-strength #passwordComponent
+                                   [enableDigitRule]="false"
                                    (onStrengthChanged)="onStrengthChanged($event)"
                                    [password]="password.value">
             </mat-password-strength>

diff --git a/src/module/component/mat-password-strength/mat-password-strength.component.ts b/src/module/component/mat-password-strength/mat-password-strength.component.ts
@@ -46,17 +46,12 @@ export class MatPasswordStrengthComponent implements OnInit, OnChanges {
   containAtLeastOneDigit: boolean;
   containAtLeastOneSpecialChar: boolean;
 
-  passwordFormControl: AbstractControl;
+  passwordFormControl: AbstractControl = new FormControl();
 
   private _strength: number;
 
   private _color: string;
 
-
-  constructor() {
-    this.setRulesAndValidators();
-  }
-
   ngOnInit(): void {
     this.setRulesAndValidators();
   }
@@ -149,16 +144,20 @@ export class MatPasswordStrengthComponent implements OnInit, OnChanges {
 
   calculatePasswordStrength() {
     const requirements: Array<boolean> = [];
-    const unit = 100 / 5;
+    const unit = 100 / this.criteriaMap.size;
+
+    console.log('this.criteriaMap.size = ', this.criteriaMap.size);
+    console.log('unit = ', unit);
 
     requirements.push(
-      this._containAtLeastEightChars(),
-      this._containAtLeastOneLowerCaseLetter(),
-      this._containAtLeastOneUpperCaseLetter(),
-      this._containAtLeastOneDigit(),
-      this._containAtLeastOneSpecialChar());
+      this.enableLengthRule ? this._containAtLeastEightChars() : false,
+      this.enableLowerCaseLetterRule ? this._containAtLeastOneLowerCaseLetter() : false,
+      this.enableUpperCaseLetterRule ? this._containAtLeastOneUpperCaseLetter() : false,
+      this.enableDigitRule ? this._containAtLeastOneDigit() : false,
+      this.enableSpecialCharRule ? this._containAtLeastOneSpecialChar() : false);
 
     this._strength = requirements.filter(v => v).length * unit;
+    console.log('length = ', this._strength / unit);
     this.onStrengthChanged.emit(this.strength);
   }