X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bmy-account%2Fmy-account-settings%2Fmy-account-change-password%2Fmy-account-change-password.component.ts;h=0707d8f9ae62d15bcdca64c3969f0ff7732417c4;hb=4c8e4e04d1b3f0f207e9155df393ceeb23dc2172;hp=7be7aabc213ff4ce4ff595ce0676bd9dc958993b;hpb=e309822b93d9b69f30cbe830ef3d09dfdb2c13b2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
index 7be7aabc2..0707d8f9a 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
@@ -12,6 +12,7 @@ import { UserValidatorsService } from '@app/shared/forms/form-validators/user-va
 })
 export class MyAccountChangePasswordComponent extends FormReactive implements OnInit {
   error: string = null
+  unsendable = true // default to true to not have to not the if in change password
 
   constructor (
     protected formValidatorService: FormValidatorService,
@@ -30,18 +31,31 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
     })
   }
 
-  changePassword () {
-    const newPassword = this.form.value['new-password']
-    const newConfirmedPassword = this.form.value['new-confirmed-password']
-
-    this.error = null
+  validateNewPassword () {
+    if (this.form.value['new-password'] && this.form.value['new-confirmed-password']) {
+      if (this.form.value['new-password'] === this.form.value['new-confirmed-password']) {
+        this.error = null
+        this.unsendable = false
+        return
+      }
+    }
+    this.unsendable = true
+  }
 
-    if (newPassword !== newConfirmedPassword) {
+  printAnError () {
+    console.log(this.unsendable)
+    this.validateNewPassword()
+    if (this.unsendable) {
       this.error = this.i18n('The new password and the confirmed password do not correspond.')
+    }
+  }
+
+  changePassword () {
+    if (this.unsendable) {
       return
     }
 
-    this.userService.changePassword(newPassword).subscribe(
+    this.userService.changePassword(this.form.value['new-password']).subscribe(
       () => this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.')),
 
       err => this.error = err.message