X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Flogin%2Flogin.component.ts;h=1394d6b5856be98c7ac63591dd478151d409534b;hb=000eb0e40d74e914f6691305511c44e89cd8bf07;hp=f7aad06e89075a56283dc492d46ace00f70793d7;hpb=d18d64787b3ea174f7dc2740c8c8c9555625047e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index f7aad06e8..1394d6b58 100644
--- 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 { RedirectService, ServerService } from '@app/core'
+import { Notifier, RedirectService } 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 { LOGIN_PASSWORD, LOGIN_USERNAME } from '@app/shared/forms/form-validators/login'
+import { LoginValidatorsService } from '@app/shared/forms/form-validators/login-validators.service'
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
+import { ActivatedRoute } from '@angular/router'
+import { ServerConfig } from '@shared/models/server/server-config.model'
 
 @Component({
   selector: 'my-login',
@@ -16,33 +17,54 @@ import { LOGIN_PASSWORD, LOGIN_USERNAME } from '@app/shared/forms/form-validator
 })
 
 export class LoginComponent extends FormReactive implements OnInit {
-  @ViewChild('forgotPasswordModal') forgotPasswordModal: ModalDirective
-  @ViewChild('forgotPasswordEmailInput') forgotPasswordEmailInput: ElementRef
+  @ViewChild('emailInput', { static: true }) input: ElementRef
+  @ViewChild('forgotPasswordModal', { static: true }) forgotPasswordModal: ElementRef
 
   error: string = null
   forgotPasswordEmail = ''
+  from = {
+    upload: false
+  }
+
+  private openedForgotPasswordModal: NgbModalRef
+  private serverConfig: ServerConfig
 
   constructor (
     protected formValidatorService: FormValidatorService,
+    private route: ActivatedRoute,
+    private modalService: NgbModal,
+    private loginValidatorsService: LoginValidatorsService,
     private authService: AuthService,
     private userService: UserService,
-    private serverService: ServerService,
     private redirectService: RedirectService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private i18n: I18n
   ) {
     super()
   }
 
   get signupAllowed () {
-    return this.serverService.getConfig().signup.allowed === true
+    return this.serverConfig.signup.allowed === true
+  }
+
+  get instancesIndexUrl () {
+    return this.serverConfig.followings.instance.autoFollowIndex.indexUrl || 'https://instances.joinpeertube.org'
+  }
+
+  isEmailDisabled () {
+    return this.serverConfig.email.enabled === false
   }
 
   ngOnInit () {
+    this.serverConfig = this.route.snapshot.data.serverConfig
+    this.from.upload = Boolean(this.route.snapshot.paramMap.get('fromUpload'))
+
     this.buildForm({
-      username: LOGIN_USERNAME,
-      password: LOGIN_PASSWORD
+      username: this.loginValidatorsService.LOGIN_USERNAME,
+      password: this.loginValidatorsService.LOGIN_PASSWORD
     })
+
+    this.input.nativeElement.focus()
   }
 
   login () {
@@ -52,37 +74,37 @@ export class LoginComponent extends FormReactive implements OnInit {
 
     this.authService.login(username, password)
       .subscribe(
-        () => this.redirectService.redirectToHomepage(),
+        () => 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 = 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}}. The link will expire within 1 hour.',
             { email: this.forgotPasswordEmail }
           )
-          this.notificationsService.success(this.i18n('Success'), message)
+          this.notifier.success(message)
           this.hideForgotPasswordModal()
         },
 
-        err => this.notificationsService.error(this.i18n('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()
   }
 }