import { Component, OnInit } from '@angular/core'
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',
})
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
) {
ngOnInit () {
this.buildForm({
- 'new-password': USER_PASSWORD,
- 'new-confirmed-password': USER_PASSWORD
+ 'current-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
+ .pipe(filter(v => v !== this.form.value[ 'new-password' ]))
+ .subscribe(() => confirmPasswordControl.setErrors({ matchPassword: true }))
}
changePassword () {
- const newPassword = this.form.value['new-password']
- const newConfirmedPassword = this.form.value['new-confirmed-password']
+ const currentPassword = this.form.value[ 'current-password' ]
+ const newPassword = this.form.value[ 'new-password' ]
- this.error = null
+ this.userService.changePassword(currentPassword, newPassword).subscribe(
+ () => {
+ this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.'))
- if (newPassword !== newConfirmedPassword) {
- this.error = this.i18n('The new password and the confirmed password do not correspond.')
- return
- }
+ this.form.reset()
+ this.error = null
+ },
- this.userService.changePassword(newPassword).subscribe(
- () => this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.')),
+ err => {
+ if (err.status === 401) {
+ this.error = this.i18n('You current password is invalid.')
+ return
+ }
- err => this.error = err.message
+ this.error = err.message
+ }
)
}
}