X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Faccount%2Faccount.component.ts;h=929934f67adad77b38506205b0170e9cb86d2eb9;hb=a685e25ca05f08ad1b3f7fbaccc8744727bd8d27;hp=9b6b5fbf421123f282cc1e2e1a8d065d22d346a7;hpb=7ddd02c9b8c1e088f6679a2227f105e6439fc992;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts index 9b6b5fbf4..929934f67 100644 --- a/client/src/app/account/account.component.ts +++ b/client/src/app/account/account.component.ts @@ -1,67 +1,28 @@ -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Component, OnInit } from '@angular/core' +import { FormBuilder, FormGroup } from '@angular/forms' +import { Router } from '@angular/router' -import { NotificationsService } from 'angular2-notifications'; +import { NotificationsService } from 'angular2-notifications' -import { AccountService } from './account.service'; -import { FormReactive, USER_PASSWORD } from '../shared'; +import { AuthService } from '../core' +import { + FormReactive, + User, + UserService, + USER_PASSWORD +} from '../shared' @Component({ selector: 'my-account', - templateUrl: './account.component.html' + templateUrl: './account.component.html', + styleUrls: [ './account.component.scss' ] }) +export class AccountComponent implements OnInit { + user: User = null -export class AccountComponent extends FormReactive implements OnInit { - error: string = null; + constructor (private authService: AuthService) {} - form: FormGroup; - formErrors = { - 'new-password': '', - 'new-confirmed-password': '' - }; - validationMessages = { - 'new-password': USER_PASSWORD.MESSAGES, - 'new-confirmed-password': USER_PASSWORD.MESSAGES - }; - - constructor( - private formBuilder: FormBuilder, - private router: Router, - private notificationsService: NotificationsService, - private accountService: AccountService - ) { - super(); - } - - buildForm() { - this.form = this.formBuilder.group({ - 'new-password': [ '', USER_PASSWORD.VALIDATORS ], - 'new-confirmed-password': [ '', USER_PASSWORD.VALIDATORS ], - }); - - this.form.valueChanges.subscribe(data => this.onValueChanged(data)); - } - - ngOnInit() { - this.buildForm(); - } - - changePassword() { - const newPassword = this.form.value['new-password']; - const newConfirmedPassword = this.form.value['new-confirmed-password']; - - this.error = null; - - if (newPassword !== newConfirmedPassword) { - this.error = 'The new password and the confirmed password do not correspond.'; - return; - } - - this.accountService.changePassword(newPassword).subscribe( - () => this.notificationsService.success('Success', 'Password updated.'), - - err => this.error = err - ); + ngOnInit () { + this.user = this.authService.getUser() } }