X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Flogin%2Flogin.component.ts;h=cf923492a9a9bb2913e07cfdedd223eb78597ab9;hb=ba430d7516bc5b1324b60571ba7594460969b7fb;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..cf923492a 100644 --- a/client/src/app/login/login.component.ts +++ b/client/src/app/login/login.component.ts @@ -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, Router } from '@angular/router' +import { ServerConfig } from '@shared/models' @Component({ selector: 'my-login', @@ -23,10 +24,12 @@ export class LoginComponent extends FormReactive implements OnInit { forgotPasswordEmail = '' private openedForgotPasswordModal: NgbModalRef + private serverConfig: ServerConfig constructor ( - public router: Router, protected formValidatorService: FormValidatorService, + private router: Router, + private route: ActivatedRoute, private modalService: NgbModal, private loginValidatorsService: LoginValidatorsService, private authService: AuthService, @@ -40,14 +43,16 @@ export class LoginComponent extends FormReactive implements OnInit { } get signupAllowed () { - return this.serverService.getConfig().signup.allowed === true + return this.serverConfig.signup.allowed === true } isEmailDisabled () { - return this.serverService.getConfig().email.enabled === false + return this.serverConfig.email.enabled === false } ngOnInit () { + this.serverConfig = this.route.snapshot.data.serverConfig + this.buildForm({ username: this.loginValidatorsService.LOGIN_USERNAME, password: this.loginValidatorsService.LOGIN_PASSWORD @@ -78,7 +83,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)