X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Flogin%2Flogin.component.ts;h=32dc9e36fed6769cef52db6006906e0ac0079981;hb=35fb2b68ff9cd9b755dae6f073c32a97dc237e35;hp=7a4e15c2c28ff607ebc973d44c9d8dc98f17058e;hpb=ab32b0fc805b92c5a1d7ac5901cb1a38e94622ca;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 7a4e15c2c..32dc9e36f 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -1,48 +1,68 @@
-import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { Router } from '@angular/router';
+import { Component, OnInit } from '@angular/core'
+import { FormBuilder, FormGroup, Validators } from '@angular/forms'
+import { Router } from '@angular/router'
 
-import { AuthService } from '../shared';
+import { AuthService } from '../core'
+import { FormReactive } from '../shared'
 
 @Component({
   selector: 'my-login',
-  template: require('./login.component.html')
+  templateUrl: './login.component.html'
 })
 
-export class LoginComponent implements OnInit {
-  error: string = null;
-  username = '';
-  password: '';
-  loginForm: FormGroup;
+export class LoginComponent extends FormReactive implements OnInit {
+  error: string = null
 
-  constructor(
+  form: FormGroup
+  formErrors = {
+    'username': '',
+    'password': ''
+  }
+  validationMessages = {
+    'username': {
+      'required': 'Username is required.'
+    },
+    'password': {
+      'required': 'Password is required.'
+    }
+  }
+
+  constructor (
     private authService: AuthService,
+    private formBuilder: FormBuilder,
     private router: Router
-  ) {}
+  ) {
+    super()
+  }
 
-  ngOnInit() {
-    this.loginForm = new FormGroup({
-      username: new FormControl('', [ <any>Validators.required ]),
-      password: new FormControl('', [ <any>Validators.required ]),
-    });
+  buildForm () {
+    this.form = this.formBuilder.group({
+      username: [ '', Validators.required ],
+      password: [ '', Validators.required ]
+    })
+
+    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
+  }
+
+  ngOnInit () {
+    this.buildForm()
   }
 
-  login() {
-    this.authService.login(this.username, this.password).subscribe(
-      result => {
-        this.error = null;
+  login () {
+    this.error = null
+
+    const { username, password } = this.form.value
 
-        this.router.navigate(['/videos/list']);
-      },
-      error => {
-        console.error(error.json);
+    this.authService.login(username, password).subscribe(
+      result => this.router.navigate(['/videos/list']),
 
-        if (error.json.error === 'invalid_grant') {
-          this.error = 'Credentials are invalid.';
+      err => {
+        if (err.message === 'invalid_grant') {
+          this.error = 'Credentials are invalid.'
         } else {
-          this.error = `${error.json.error}: ${error.json.error_description}`;
+          this.error = `${err.body.error_description}`
         }
       }
-    );
+    )
   }
 }