3 files changed, 35 insertions, 3 deletions

diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html
index ab6df52be..00b6d20fa 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html
@@ -1,9 +1,17 @@
 <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
 
-<form role="form" (ngSubmit)="changePassword()" [formGroup]="form">
+<form role="form" (ngSubmit)="checkPassword()" [formGroup]="form">
 
   <label i18n for="new-password">Change password</label>
   <input
+    type="password" id="old-password" i18n-placeholder placeholder="Old password"
+    formControlName="old-password" [ngClass]="{ 'input-error': formErrors['old-password'] }"
+  >
+  <div *ngIf="formErrors['old-password']" class="form-error">
+    {{ formErrors['old-password'] }}
+  </div>
+
+  <input
     type="password" id="new-password" i18n-placeholder placeholder="New password"
     formControlName="new-password" [ngClass]="{ 'input-error': formErrors['new-password'] }"
   >
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
index f8279ffd3..e641482f0 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
@@ -5,7 +5,8 @@ input[type=password] {
   @include peertube-input-text(340px);
   display: block;
 
-  &#new-confirmed-password {
+  &#new-password,
+  &#new-confirmed-password  {
     margin-top: 15px;
   }
 }
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 57a706b0f..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
@@ -5,6 +5,8 @@ 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',
@@ -13,11 +15,13 @@ import { filter } from 'rxjs/operators'
 })
 export class MyAccountChangePasswordComponent extends FormReactive implements OnInit {
   error: string = null
+  user: User = null
 
   constructor (
     protected formValidatorService: FormValidatorService,
     private userValidatorsService: UserValidatorsService,
     private notificationsService: NotificationsService,
+    private authService: AuthService,
     private userService: UserService,
     private i18n: I18n
   ) {
@@ -26,10 +30,13 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
 
   ngOnInit () {
     this.buildForm({
+      'old-password': this.userValidatorsService.USER_PASSWORD,
       'new-password': this.userValidatorsService.USER_PASSWORD,
       'new-confirmed-password': this.userValidatorsService.USER_CONFIRM_PASSWORD
     })
 
+    this.user = this.authService.getUser()
+
     const confirmPasswordControl = this.form.get('new-confirmed-password')
 
     confirmPasswordControl.valueChanges
@@ -37,7 +44,23 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
                           .subscribe(() => confirmPasswordControl.setErrors({ matchPassword: true }))
   }
 
-  changePassword () {
+  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
+        }
+      )
+
+  }
+
+  private changePassword(){
     this.userService.changePassword(this.form.value[ 'new-password' ]).subscribe(
       () => {
         this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.'))