Fix validazione doppia password

src/app/auth/pages/registrazione/registrazione.page.html

@@ -21,7 +21,7 @@
       {{ 'registrazione' | translate }}
     </div>
   </div>
-  <ion-grid class="transparent bc-grid">
+  <ion-grid class="transparent bc-grid"> 
     <ion-row class="transparent">
       <ion-col align-self-end size-md="6" size-lg="6" size-xs="12" class="transparent">
         <div class="body-form body-img12">
@@ -55,10 +55,10 @@
                       <ion-input formControlName="cellulare" type="tel" placeholder="{{ 'cellulare' | translate }}" ngModel required></ion-input>
                     </ion-item>
                     <ion-item>
-                      <ion-input formControlName="password" type="password" placeholder="{{ 'pwd' | translate }}" ngModel required></ion-input>
+                      <ion-input formControlName="newpassword" type="password" placeholder="{{ 'pwd' | translate }}" ngModel required></ion-input>
                     </ion-item>
                     <ion-item>
-                      <ion-input formControlName="passwordbis" type="password" placeholder="{{ 'repeat_pwd' | translate }}" ngModel required></ion-input>
+                      <ion-input formControlName="newpasswordbis" type="password" placeholder="{{ 'repeat_pwd' | translate }}" ngModel required></ion-input>
                     </ion-item>
                   </div>
                   <div padding>

src/app/auth/pages/registrazione/registrazione.page.ts

@@ -79,12 +79,12 @@ export class RegistrazionePage implements OnInit {
     cellulare: new FormControl('', Validators.compose([
       Validators.pattern('^[0-9]+$'),
     ])),
-    password: new FormControl('', Validators.compose([
+    newpassword: new FormControl('', Validators.compose([
       Validators.minLength(5),
       Validators.required,
       Validators.pattern('^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9]+$') //this is for the letters (both uppercase and lowercase) and numbers validation
     ])),
-    passwordbis: new FormControl('', Validators.compose([
+    newpasswordbis: new FormControl('', Validators.compose([
       Validators.required
     ]))
   },(formGroup: FormGroup) => {

src/app/auth/service/auth.service.ts

@@ -158,7 +158,7 @@ export class AuthService {
 
   registra(value) : Observable<ErrorResponse>{
     this.tipoStruttura = environment.struttura;
-    var param = UtilService.encodeBody({nome: value.nome, cognome: value.cognome, email: value.email, cellulare: value.cellulare, password: value.password, tipostruttura: this.tipoStruttura});
+    var param = UtilService.encodeBody({nome: value.nome, cognome: value.cognome, email: value.email, cellulare: value.cellulare, password: value.newpassword, tipostruttura: this.tipoStruttura});
     this.clientiSalvati = false;
     return this.httpClient.post<ErrorResponse>(this.httpClientDataService.BASE_ADDRESS+'/autenticazione/registrazione.do', param, this.httpClientDataService.httpOptions)
     .pipe(

src/app/auth/validators/password.validator.ts

@@ -8,20 +8,22 @@ static equals = (newpasswordControl: AbstractControl): ValidatorFn => {
     return (passwordBisControl: AbstractControl): {[key: string]: boolean} => {
 		if(newpasswordControl.value == passwordBisControl.value) {
 			return {
-				equals: true
+				equals: false
 			};
 		}
-		else return null;
+		else return {
+			equals: true
+		};;
 	};
 }
 
-static areEqual(formGroup: FormGroup) {
+ static areEqual(formGroup: FormGroup) {
 	let val;
 	let valid = true;
 
 	for (let key in formGroup.controls) {
 		if (formGroup.controls.hasOwnProperty(key)) {
-			if(key == "oldpassword") continue;
+			if(key != "newpassword" && key != "newpasswordbis") continue;
 			let control: FormControl = <FormControl>formGroup.controls[key];
 			if (val === undefined) {
 				val = control.value
@@ -33,14 +35,12 @@ static areEqual(formGroup: FormGroup) {
 			}
 		}
 	}
-	if (!valid) /*{
-		return null;
+	if (!valid) {
+		//return null;
 		return {
-			areEqual: false
+			areEqual: true
 		}
-	}*/
-	return {
-		areEqual: true
 	}
+	return null;
  }
 }
\ No newline at end of file