import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier } from '@app/core'
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';
+import { User } from '../../../../../../shared'
@Component({
selector: 'my-account-change-password',
constructor (
protected formValidatorService: FormValidatorService,
private userValidatorsService: UserValidatorsService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private authService: AuthService,
private userService: UserService,
private i18n: I18n
ngOnInit () {
this.buildForm({
- 'old-password': this.userValidatorsService.USER_PASSWORD,
+ 'current-password': this.userValidatorsService.USER_PASSWORD,
'new-password': this.userValidatorsService.USER_PASSWORD,
'new-confirmed-password': this.userValidatorsService.USER_CONFIRM_PASSWORD
})
.subscribe(() => confirmPasswordControl.setErrors({ matchPassword: true }))
}
- checkPassword () {
- this.error = null
- const oldPassword = this.form.value[ 'old-password' ];
+ changePassword () {
+ const currentPassword = this.form.value[ 'current-password' ]
+ const newPassword = this.form.value[ 'new-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.userService.changePassword(currentPassword, newPassword).subscribe(
() => {
- this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.'))
+ this.notifier.success(this.i18n('Password updated.'))
this.form.reset()
+ this.error = null
},
- err => this.error = err.message
+ err => {
+ if (err.status === 401) {
+ this.error = this.i18n('You current password is invalid.')
+ return
+ }
+
+ this.error = err.message
+ }
)
}
}