X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Blogin%2Flogin.component.ts;h=96754b7824791b6e25a2405e1316963490c1b252;hb=13e7c3b02a265d2b8ecd1db65b0ae24fdfd620b4;hp=cbc51ee216132fba8e82a6e65647fd394867b7dd;hpb=1942f11d5ee6926ad93dc1b79fae18325ba5de18;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+login/login.component.ts b/client/src/app/+login/login.component.ts index cbc51ee21..96754b782 100644 --- a/client/src/app/+login/login.component.ts +++ b/client/src/app/+login/login.component.ts @@ -1,11 +1,13 @@ -import { environment } from 'src/environments/environment' + import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core' -import { ActivatedRoute } from '@angular/router' -import { AuthService, Notifier, RedirectService, UserService } from '@app/core' +import { ActivatedRoute, Router } from '@angular/router' +import { AuthService, Notifier, RedirectService, SessionStorageService, UserService } from '@app/core' import { HooksService } from '@app/core/plugins/hooks.service' -import { FormReactive, FormValidatorService, LoginValidatorsService } from '@app/shared/shared-forms' -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' -import { I18n } from '@ngx-translate/i18n-polyfill' +import { LOGIN_PASSWORD_VALIDATOR, LOGIN_USERNAME_VALIDATOR } from '@app/shared/form-validators/login-validators' +import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' +import { InstanceAboutAccordionComponent } from '@app/shared/shared-instance' +import { NgbAccordion, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' +import { PluginsManager } from '@root-helpers/plugins-manager' import { RegisteredExternalAuthConfig, ServerConfig } from '@shared/models' @Component({ @@ -15,9 +17,11 @@ import { RegisteredExternalAuthConfig, ServerConfig } from '@shared/models' }) export class LoginComponent extends FormReactive implements OnInit, AfterViewInit { - @ViewChild('usernameInput', { static: false }) usernameInput: ElementRef + private static SESSION_STORAGE_REDIRECT_URL_KEY = 'login-previous-url' + @ViewChild('forgotPasswordModal', { static: true }) forgotPasswordModal: ElementRef + accordion: NgbAccordion error: string = null forgotPasswordEmail = '' @@ -25,6 +29,14 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni externalAuthError = false externalLogins: string[] = [] + instanceInformationPanels = { + terms: true, + administrators: false, + features: false, + moderation: false, + codeOfConduct: false + } + private openedForgotPasswordModal: NgbModalRef private serverConfig: ServerConfig @@ -32,13 +44,13 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni protected formValidatorService: FormValidatorService, private route: ActivatedRoute, private modalService: NgbModal, - private loginValidatorsService: LoginValidatorsService, private authService: AuthService, private userService: UserService, private redirectService: RedirectService, private notifier: Notifier, private hooks: HooksService, - private i18n: I18n + private storage: SessionStorageService, + private router: Router ) { super() } @@ -47,6 +59,15 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni return this.serverConfig.signup.allowed === true } + onTermsClick (event: Event, instanceInformation: HTMLElement) { + event.preventDefault() + + if (this.accordion) { + this.accordion.expand('terms') + instanceInformation.scrollIntoView({ behavior: 'smooth' }) + } + } + isEmailDisabled () { return this.serverConfig.email.enabled === false } @@ -54,6 +75,12 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni ngOnInit () { const snapshot = this.route.snapshot + // Avoid undefined errors when accessing form error properties + this.buildForm({ + username: LOGIN_USERNAME_VALIDATOR, + password: LOGIN_PASSWORD_VALIDATOR + }) + this.serverConfig = snapshot.data.serverConfig if (snapshot.queryParams.externalAuthToken) { @@ -66,17 +93,13 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni return } - this.buildForm({ - username: this.loginValidatorsService.LOGIN_USERNAME, - password: this.loginValidatorsService.LOGIN_PASSWORD - }) + const previousUrl = this.redirectService.getPreviousUrl() + if (previousUrl && previousUrl !== '/') { + this.storage.setItem(LoginComponent.SESSION_STORAGE_REDIRECT_URL_KEY, previousUrl) + } } ngAfterViewInit () { - if (this.usernameInput) { - this.usernameInput.nativeElement.focus() - } - this.hooks.runAction('action:login.init', 'login') } @@ -85,7 +108,7 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni } getAuthHref (auth: RegisteredExternalAuthConfig) { - return environment.apiUrl + `/plugins/${auth.name}/${auth.version}/auth/${auth.authName}` + return PluginsManager.getExternalAuthHref(auth) } login () { @@ -94,27 +117,26 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni const { username, password } = this.form.value this.authService.login(username, password) - .subscribe( - () => this.redirectService.redirectToPreviousRoute(), + .subscribe({ + next: () => this.redirectService.redirectToPreviousRoute(), - err => this.handleError(err) - ) + error: err => this.handleError(err) + }) } askResetPassword () { this.userService.askResetPassword(this.forgotPasswordEmail) - .subscribe( - () => { - const message = this.i18n( - 'An email with the reset password instructions will be sent to {{email}}. The link will expire within 1 hour.', - { email: this.forgotPasswordEmail } - ) + .subscribe({ + next: () => { + const message = $localize`An email with the reset password instructions will be sent to ${this.forgotPasswordEmail}. +The link will expire within 1 hour.` + this.notifier.success(message) this.hideForgotPasswordModal() }, - err => this.notifier.error(err.message) - ) + error: err => this.notifier.error(err.message) + }) } openForgotPasswordModal () { @@ -125,23 +147,39 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni this.openedForgotPasswordModal.close() } + onInstanceAboutAccordionInit (instanceAboutAccordion: InstanceAboutAccordionComponent) { + this.accordion = instanceAboutAccordion.accordion + } + + hasUsernameUppercase () { + return this.form.value['username'].match(/[A-Z]/) + } + private loadExternalAuthToken (username: string, token: string) { this.isAuthenticatedWithExternalAuth = true this.authService.login(username, null, token) - .subscribe( - () => this.redirectService.redirectToPreviousRoute(), + .subscribe({ + next: () => { + const redirectUrl = this.storage.getItem(LoginComponent.SESSION_STORAGE_REDIRECT_URL_KEY) + if (redirectUrl) { + this.storage.removeItem(LoginComponent.SESSION_STORAGE_REDIRECT_URL_KEY) + return this.router.navigateByUrl(redirectUrl) + } + + this.redirectService.redirectToLatestSessionRoute() + }, - err => { - this.handleError(err) - this.isAuthenticatedWithExternalAuth = false - } - ) + error: 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.') + if (err.message.indexOf('credentials are invalid') !== -1) this.error = $localize`Incorrect username or password.` + else if (err.message.indexOf('blocked') !== -1) this.error = $localize`Your account is blocked.` else this.error = err.message } }