X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Flogin%2Flogin.component.ts;h=5db8d3dbb84ddb22f19978585ece05744885b6ca;hb=ebefc902f59be6c5542c19ff706e310d9dddf75f;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..5db8d3dbb 100644 --- a/client/src/app/login/login.component.ts +++ b/client/src/app/login/login.component.ts @@ -1,13 +1,15 @@ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core' -import { RedirectService, ServerService } from '@app/core' +import { Component, ElementRef, OnInit, ViewChild, AfterViewInit } from '@angular/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, RegisteredExternalAuthConfig } from '@shared/models/server/server-config.model' +import { environment } from 'src/environments/environment' @Component({ selector: 'my-login', @@ -15,36 +17,70 @@ import { LOGIN_PASSWORD, LOGIN_USERNAME } from '@app/shared/forms/form-validator styleUrls: [ './login.component.scss' ] }) -export class LoginComponent extends FormReactive implements OnInit { - @ViewChild('forgotPasswordModal') forgotPasswordModal: ModalDirective - @ViewChild('forgotPasswordEmailInput') forgotPasswordEmailInput: ElementRef +export class LoginComponent extends FormReactive implements OnInit, AfterViewInit { + @ViewChild('usernameInput', { static: false }) usernameInput: ElementRef + @ViewChild('forgotPasswordModal', { static: true }) forgotPasswordModal: ElementRef error: string = null forgotPasswordEmail = '' + isAuthenticatedWithExternalAuth = false + externalLogins: string[] = [] + + 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 + } + + isEmailDisabled () { + return this.serverConfig.email.enabled === false } ngOnInit () { + const snapshot = this.route.snapshot + + this.serverConfig = snapshot.data.serverConfig + + if (snapshot.queryParams.externalAuthToken) { + this.loadExternalAuthToken(snapshot.queryParams.username, snapshot.queryParams.externalAuthToken) + return + } + this.buildForm({ - username: LOGIN_USERNAME, - password: LOGIN_PASSWORD + username: this.loginValidatorsService.LOGIN_USERNAME, + password: this.loginValidatorsService.LOGIN_PASSWORD }) } + ngAfterViewInit () { + if (this.usernameInput) { + this.usernameInput.nativeElement.focus() + } + } + + getExternalLogins () { + return this.serverConfig.plugin.registeredExternalAuths + } + + getAuthHref (auth: RegisteredExternalAuthConfig) { + return environment.apiUrl + `/plugins/${auth.name}/${auth.version}/auth/${auth.authName}` + } + login () { this.error = null @@ -52,37 +88,53 @@ 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 => this.handleError(err) ) } 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() + } + + private loadExternalAuthToken (username: string, token: string) { + this.isAuthenticatedWithExternalAuth = true + + this.authService.login(username, null, token) + .subscribe( + () => this.redirectService.redirectToPreviousRoute(), + + err => { + this.handleError(err) + this.isAuthenticatedWithExternalAuth = false + } + ) + } + + private handleError (err: any) { + 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 } }