Merge branch 'develop' into unused-imports

[github/Chocobozzz/PeerTube.git] / client / src / app / login / login.component.ts

diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index a14cb2eb7243e81fc9ba8ba03dc50cd38c29efc6..7553e64564220907cf323ed7c88f1279893d28c5 100644 (file)
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -1,13 +1,14 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { FormBuilder, FormGroup, Validators } from '@angular/forms'
-import { Router } from '@angular/router'
 import { RedirectService, ServerService } from '@app/core'
 import { UserService } from '@app/shared'
 import { NotificationsService } from 'angular2-notifications'
-import { ModalDirective } from 'ngx-bootstrap/modal'
 import { AuthService } from '../core'
 import { FormReactive } from '../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
+import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
+import { LoginValidatorsService } from '@app/shared/forms/form-validators/login-validators.service'
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
+import { Router } from '@angular/router'
 
 @Component({
   selector: 'my-login',
@@ -16,33 +17,25 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
 })
 
 export class LoginComponent extends FormReactive implements OnInit {
-  @ViewChild('forgotPasswordModal') forgotPasswordModal: ModalDirective
+  @ViewChild('emailInput') input: ElementRef
+  @ViewChild('forgotPasswordModal') forgotPasswordModal: ElementRef
   @ViewChild('forgotPasswordEmailInput') forgotPasswordEmailInput: ElementRef
 
   error: string = null
-
-  form: FormGroup
-  formErrors = {
-    'username': '',
-    'password': ''
-  }
-  validationMessages = {
-    'username': {
-      'required': 'Username is required.'
-    },
-    'password': {
-      'required': 'Password is required.'
-    }
-  }
   forgotPasswordEmail = ''
 
+  private openedForgotPasswordModal: NgbModalRef
+
   constructor (
+    public router: Router,
+    protected formValidatorService: FormValidatorService,
+    private modalService: NgbModal,
+    private loginValidatorsService: LoginValidatorsService,
     private authService: AuthService,
     private userService: UserService,
     private serverService: ServerService,
     private redirectService: RedirectService,
     private notificationsService: NotificationsService,
-    private formBuilder: FormBuilder,
     private i18n: I18n
   ) {
     super()
@@ -52,17 +45,13 @@ export class LoginComponent extends FormReactive implements OnInit {
     return this.serverService.getConfig().signup.allowed === true
   }
 
-  buildForm () {
-    this.form = this.formBuilder.group({
-      username: [ '', Validators.required ],
-      password: [ '', Validators.required ]
+  ngOnInit () {
+    this.buildForm({
+      username: this.loginValidatorsService.LOGIN_USERNAME,
+      password: this.loginValidatorsService.LOGIN_PASSWORD
     })
 
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
-  }
-
-  ngOnInit () {
-    this.buildForm()
+    this.input.nativeElement.focus()
   }
 
   login () {
@@ -72,18 +61,31 @@ export class LoginComponent extends FormReactive implements OnInit {
 
     this.authService.login(username, password)
       .subscribe(
-        () => this.redirectService.redirectToHomepage(),
+        () => this.redirect(),
 
-        err => this.error = err.message
+        err => {
+          if (err.message.indexOf('credentials are invalid') !== -1) this.error = this.i18n('Incorrect username or password.')
+          else if (err.message.indexOf('blocked') !== -1) this.error = this.i18n('You account is blocked.')
+          else this.error = err.message
+        }
       )
   }
 
+  redirect () {
+    const redirect = this.authService.redirectUrl
+    if (redirect) {
+      this.router.navigate([ redirect ])
+    } else {
+      this.redirectService.redirectToHomepage()
+    }
+  }
+
   askResetPassword () {
     this.userService.askResetPassword(this.forgotPasswordEmail)
       .subscribe(
-        res => {
+        () => {
           const message = this.i18n(
-            'An email with the reset password instructions will be sent to {{ email }}.',
+            'An email with the reset password instructions will be sent to {{email}}.',
             { email: this.forgotPasswordEmail }
           )
           this.notificationsService.success(this.i18n('Success'), message)
@@ -99,10 +101,10 @@ export class LoginComponent extends FormReactive implements OnInit {
   }
 
   openForgotPasswordModal () {
-    this.forgotPasswordModal.show()
+    this.openedForgotPasswordModal = this.modalService.open(this.forgotPasswordModal)
   }
 
   hideForgotPasswordModal () {
-    this.forgotPasswordModal.hide()
+    this.openedForgotPasswordModal.close()
   }
 }