X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Flogin%2Flogin.component.ts;h=fc2442c0e9bb4cddae72e66d487a0d66bec530b5;hb=0ba5f5baade94a051710d9d9d408ac8083c14ac6;hp=22e8c77dd44f4817c6367e5937c80732d6d882ac;hpb=ecb4e35f4e6c7304cb274593c13cb47fd5078b75;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 22e8c77dd..fc2442c0e 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -1,11 +1,13 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { FormBuilder, FormGroup, Validators } from '@angular/forms'
-import { Router } from '@angular/router'
+import { Notifier, 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',
@@ -14,47 +16,44 @@ import { FormReactive } from '../shared'
 })
 
 export class LoginComponent extends FormReactive implements OnInit {
-  @ViewChild('forgotPasswordModal') forgotPasswordModal: ModalDirective
-  @ViewChild('forgotPasswordEmailInput') forgotPasswordEmailInput: ElementRef
+  @ViewChild('emailInput') input: ElementRef
+  @ViewChild('forgotPasswordModal') forgotPasswordModal: 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 notificationsService: NotificationsService,
-    private formBuilder: FormBuilder,
-    private router: Router
+    private serverService: ServerService,
+    private redirectService: RedirectService,
+    private notifier: Notifier,
+    private i18n: I18n
   ) {
     super()
   }
 
-  buildForm () {
-    this.form = this.formBuilder.group({
-      username: [ '', Validators.required ],
-      password: [ '', Validators.required ]
-    })
+  get signupAllowed () {
+    return this.serverService.getConfig().signup.allowed === true
+  }
 
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
+  isEmailDisabled () {
+    return this.serverService.getConfig().email.enabled === false
   }
 
   ngOnInit () {
-    this.buildForm()
+    this.buildForm({
+      username: this.loginValidatorsService.LOGIN_USERNAME,
+      password: this.loginValidatorsService.LOGIN_PASSWORD
+    })
+
+    this.input.nativeElement.focus()
   }
 
   login () {
@@ -62,35 +61,39 @@ export class LoginComponent extends FormReactive implements OnInit {
 
     const { username, password } = this.form.value
 
-    this.authService.login(username, password).subscribe(
-      () => this.router.navigate(['/videos/list']),
+    this.authService.login(username, password)
+      .subscribe(
+        () => this.redirectService.redirectToPreviousRoute(),
 
-      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
+        }
+      )
   }
 
   askResetPassword () {
     this.userService.askResetPassword(this.forgotPasswordEmail)
       .subscribe(
-        res => {
-          const message = `An email with the reset password instructions will be sent to ${this.forgotPasswordEmail}.`
-          this.notificationsService.success('Success', message)
+        () => {
+          const message = this.i18n(
+            'An email with the reset password instructions will be sent to {{email}}.',
+            { email: this.forgotPasswordEmail }
+          )
+          this.notifier.success(message)
           this.hideForgotPasswordModal()
         },
 
-        err => this.notificationsService.error('Error', err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
-  onForgotPasswordModalShown () {
-    this.forgotPasswordEmailInput.nativeElement.focus()
-  }
-
   openForgotPasswordModal () {
-    this.forgotPasswordModal.show()
+    this.openedForgotPasswordModal = this.modalService.open(this.forgotPasswordModal)
   }
 
   hideForgotPasswordModal () {
-    this.forgotPasswordModal.hide()
+    this.openedForgotPasswordModal.close()
   }
 }