-import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
-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 { Component, OnInit } from '@angular/core'
+import { AuthService, Notifier, UserService } from '@app/core'
+import {
+ USER_CONFIRM_PASSWORD_VALIDATOR,
+ USER_EXISTING_PASSWORD_VALIDATOR,
+ USER_PASSWORD_VALIDATOR
+} from '@app/shared/form-validators/user-validators'
+import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
+import { User } from '@shared/models'
@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
+ private userService: UserService
) {
super()
}
ngOnInit () {
this.buildForm({
- 'old-password': this.userValidatorsService.USER_PASSWORD,
- 'new-password': this.userValidatorsService.USER_PASSWORD,
- 'new-confirmed-password': this.userValidatorsService.USER_CONFIRM_PASSWORD
+ 'current-password': USER_EXISTING_PASSWORD_VALIDATOR,
+ 'new-password': USER_PASSWORD_VALIDATOR,
+ 'new-confirmed-password': USER_CONFIRM_PASSWORD_VALIDATOR
})
this.user = this.authService.getUser()
const confirmPasswordControl = this.form.get('new-confirmed-password')
confirmPasswordControl.valueChanges
- .pipe(filter(v => v !== this.form.value[ 'new-password' ]))
+ .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
- }
- )
+ changePassword () {
+ const currentPassword = this.form.value['current-password']
+ const newPassword = this.form.value['new-password']
- }
+ this.userService.changePassword(currentPassword, newPassword)
+ .subscribe({
+ next: () => {
+ this.notifier.success($localize`Password updated.`)
- private changePassword () {
- this.userService.changePassword(this.form.value[ 'new-password' ]).subscribe(
- () => {
- this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.'))
+ this.form.reset()
+ this.error = null
+ },
- this.form.reset()
- },
+ error: err => {
+ if (err.status === 401) {
+ this.error = $localize`You current password is invalid.`
+ return
+ }
- err => this.error = err.message
- )
+ this.error = err.message
+ }
+ })
}
}