X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Faccount%2Faccount.component.ts;h=57b3d4ccd4c052f1ab674bea3df4990c0514b9fa;hb=09223546a4d882a9dbfdbd95d551e48af7bee123;hp=851eaf198e1ae73dc9b4d84e6d95c815a7d76e80;hpb=ec8d8440a893ba64075da2e57ea04c7976e0b303;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts index 851eaf198..57b3d4ccd 100644 --- a/client/src/app/account/account.component.ts +++ b/client/src/app/account/account.component.ts @@ -1,67 +1,28 @@ -import { } from '@angular/common'; import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { Router } from '@angular/router'; -import { AccountService } from './account.service'; -import { FormReactive, USER_PASSWORD } from '../shared'; +import { NotificationsService } from 'angular2-notifications'; + +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 { - information: string = null; - error: string = null; - - form: FormGroup; - formErrors = { - 'new-password': '', - 'new-confirmed-password': '' - }; - validationMessages = { - 'new-password': USER_PASSWORD.MESSAGES, - 'new-confirmed-password': USER_PASSWORD.MESSAGES - }; - - constructor( - private accountService: AccountService, - private formBuilder: FormBuilder, - private router: Router - ) { - 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)); - } + constructor(private authService: AuthService) {} ngOnInit() { - this.buildForm(); - } - - changePassword() { - const newPassword = this.form.value['new-password']; - const newConfirmedPassword = this.form.value['new-confirmed-password']; - - this.information = null; - this.error = null; - - if (newPassword !== newConfirmedPassword) { - this.error = 'The new password and the confirmed password do not correspond.'; - return; - } - - this.accountService.changePassword(newPassword).subscribe( - ok => this.information = 'Password updated.', - - err => this.error = err - ); + this.user = this.authService.getUser(); } }