X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2F%2Bmy-account%2Fmy-account-settings%2Fmy-account-change-password%2Fmy-account-change-password.component.ts;h=c4837460a948a27f02d716916847717fa3107f04;hb=3805ce3f4335e89f63ddb6cd166f14ba120d9c83;hp=80af668f96c46218e75eee06416f3be7df57cc15;hpb=bf696869538eaef27e5a8445035967c01f214501;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 80af668f9..c4837460a 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
@@ -1,7 +1,12 @@
 import { Component, OnInit } from '@angular/core'
-import { FormBuilder, FormGroup } from '@angular/forms'
 import { NotificationsService } from 'angular2-notifications'
-import { FormReactive, USER_PASSWORD, UserService } from '../../../shared'
+import { FormReactive, UserService } from '../../../shared'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
+import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service'
+import { filter } from 'rxjs/operators'
+import { AuthService } from '@app/core';
+import { User } from '../../../../../../shared';
 
 @Component({
   selector: 'my-account-change-password',
@@ -10,51 +15,58 @@ import { FormReactive, USER_PASSWORD, UserService } from '../../../shared'
 })
 export class MyAccountChangePasswordComponent extends FormReactive implements OnInit {
   error: string = null
-
-  form: FormGroup
-  formErrors = {
-    'new-password': '',
-    'new-confirmed-password': ''
-  }
-  validationMessages = {
-    'new-password': USER_PASSWORD.MESSAGES,
-    'new-confirmed-password': USER_PASSWORD.MESSAGES
-  }
+  user: User = null
 
   constructor (
-    private formBuilder: FormBuilder,
+    protected formValidatorService: FormValidatorService,
+    private userValidatorsService: UserValidatorsService,
     private notificationsService: NotificationsService,
-    private userService: UserService
+    private authService: AuthService,
+    private userService: UserService,
+    private i18n: I18n
   ) {
     super()
   }
 
-  buildForm () {
-    this.form = this.formBuilder.group({
-      'new-password': [ '', USER_PASSWORD.VALIDATORS ],
-      'new-confirmed-password': [ '', USER_PASSWORD.VALIDATORS ]
+  ngOnInit () {
+    this.buildForm({
+      'old-password': this.userValidatorsService.USER_PASSWORD,
+      'new-password': this.userValidatorsService.USER_PASSWORD,
+      'new-confirmed-password': this.userValidatorsService.USER_CONFIRM_PASSWORD
     })
 
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
-  }
+    this.user = this.authService.getUser()
 
-  ngOnInit () {
-    this.buildForm()
-  }
+    const confirmPasswordControl = this.form.get('new-confirmed-password')
 
-  changePassword () {
-    const newPassword = this.form.value['new-password']
-    const newConfirmedPassword = this.form.value['new-confirmed-password']
+    confirmPasswordControl.valueChanges
+                          .pipe(filter(v => v !== this.form.value[ 'new-password' ]))
+                          .subscribe(() => confirmPasswordControl.setErrors({ matchPassword: true }))
+  }
 
+  checkPassword () {
     this.error = null
+    const oldPassword = this.form.value[ 'old-password' ];
+
+    // compare old password
+    this.authService.login(this.user.account.name, oldPassword)
+      .subscribe(
+        () => this.changePassword(),
+        err => {
+          if (err.message.indexOf('credentials are invalid') !== -1) this.error = this.i18n('Incorrect old password.')
+          else this.error = err.message
+        }
+      )
+
+  }
 
-    if (newPassword !== newConfirmedPassword) {
-      this.error = 'The new password and the confirmed password do not correspond.'
-      return
-    }
+  private changePassword(){
+    this.userService.changePassword(this.form.value[ 'new-password' ]).subscribe(
+      () => {
+        this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.'))
 
-    this.userService.changePassword(newPassword).subscribe(
-      () => this.notificationsService.success('Success', 'Password updated.'),
+        this.form.reset()
+      },
 
       err => this.error = err.message
     )