X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Flogin%2Flogin.component.ts;h=5db8d3dbb84ddb22f19978585ece05744885b6ca;hb=ebefc902f59be6c5542c19ff706e310d9dddf75f;hp=580f2882210a65fc89303209607ff703aca29d50;hpb=21e6dc811d18637dbadb31c724420361913dbc29;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts index 580f28822..5db8d3dbb 100644 --- a/client/src/app/login/login.component.ts +++ b/client/src/app/login/login.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core' +import { Component, ElementRef, OnInit, ViewChild, AfterViewInit } from '@angular/core' import { Notifier, RedirectService } from '@app/core' import { UserService } from '@app/shared' import { AuthService } from '../core' @@ -8,7 +8,8 @@ import { FormValidatorService } from '@app/shared/forms/form-validators/form-val 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' +import { ServerConfig, RegisteredExternalAuthConfig } from '@shared/models/server/server-config.model' +import { environment } from 'src/environments/environment' @Component({ selector: 'my-login', @@ -16,12 +17,14 @@ import { ServerConfig } from '@shared/models/server/server-config.model' styleUrls: [ './login.component.scss' ] }) -export class LoginComponent extends FormReactive implements OnInit { - @ViewChild('emailInput', { static: true }) input: 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 @@ -49,14 +52,33 @@ export class LoginComponent extends FormReactive implements OnInit { } ngOnInit () { - this.serverConfig = this.route.snapshot.data.serverConfig + 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: this.loginValidatorsService.LOGIN_USERNAME, password: this.loginValidatorsService.LOGIN_PASSWORD }) + } + + ngAfterViewInit () { + if (this.usernameInput) { + this.usernameInput.nativeElement.focus() + } + } + + getExternalLogins () { + return this.serverConfig.plugin.registeredExternalAuths + } - this.input.nativeElement.focus() + getAuthHref (auth: RegisteredExternalAuthConfig) { + return environment.apiUrl + `/plugins/${auth.name}/${auth.version}/auth/${auth.authName}` } login () { @@ -68,11 +90,7 @@ export class LoginComponent extends FormReactive implements OnInit { .subscribe( () => this.redirectService.redirectToPreviousRoute(), - 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 - } + err => this.handleError(err) ) } @@ -99,4 +117,24 @@ export class LoginComponent extends FormReactive implements OnInit { hideForgotPasswordModal () { 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 + } }