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

diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 12c631107..1394d6b58 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -1,5 +1,5 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { Notifier, RedirectService, ServerService } from '@app/core'
+import { Notifier, RedirectService } from '@app/core'
 import { UserService } from '@app/shared'
 import { AuthService } from '../core'
 import { FormReactive } from '../shared'
@@ -7,7 +7,8 @@ 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'
+import { ActivatedRoute } from '@angular/router'
+import { ServerConfig } from '@shared/models/server/server-config.model'
 
 @Component({
   selector: 'my-login',
@@ -21,17 +22,20 @@ export class LoginComponent extends FormReactive implements OnInit {
 
   error: string = null
   forgotPasswordEmail = ''
+  from = {
+    upload: false
+  }
 
   private openedForgotPasswordModal: NgbModalRef
+  private serverConfig: ServerConfig
 
   constructor (
-    public router: Router,
     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 notifier: Notifier,
     private i18n: I18n
@@ -40,14 +44,21 @@ export class LoginComponent extends FormReactive implements OnInit {
   }
 
   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.serverService.getConfig().email.enabled === false
+    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: this.loginValidatorsService.LOGIN_USERNAME,
       password: this.loginValidatorsService.LOGIN_PASSWORD
@@ -78,7 +89,7 @@ export class LoginComponent extends FormReactive implements OnInit {
       .subscribe(
         () => {
           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.notifier.success(message)