X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fsignup%2Fsignup.component.ts;h=16e4446785fbe742412ac11500db52ec3ffc0134;hb=ad76628b17ff8f25d3402d6d669b274116bbf76c;hp=13390a32afc8d25eff5e764bd9d1474ee4a04188;hpb=d235f6b0d1054a2a3451dacade927caefce8f30c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts index 13390a32a..16e444678 100644 --- a/client/src/app/signup/signup.component.ts +++ b/client/src/app/signup/signup.component.ts @@ -1,18 +1,11 @@ import { Component, OnInit } from '@angular/core' -import { FormBuilder, FormGroup, Validators } from '@angular/forms' import { Router } from '@angular/router' - import { NotificationsService } from 'angular2-notifications' - -import { AuthService } from '../core' -import { - FormReactive, - UserService, - USER_USERNAME, - USER_EMAIL, - USER_PASSWORD -} from '../shared' import { UserCreate } from '../../../../shared' +import { FormReactive, UserService, UserValidatorsService } from '../shared' +import { RedirectService, ServerService } from '@app/core' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' @Component({ selector: 'my-signup', @@ -22,39 +15,34 @@ import { UserCreate } from '../../../../shared' export class SignupComponent extends FormReactive implements OnInit { error: string = null - form: FormGroup - formErrors = { - 'username': '', - 'email': '', - 'password': '' - } - validationMessages = { - 'username': USER_USERNAME.MESSAGES, - 'email': USER_EMAIL.MESSAGES, - 'password': USER_PASSWORD.MESSAGES - } - constructor ( - private formBuilder: FormBuilder, + protected formValidatorService: FormValidatorService, + private userValidatorsService: UserValidatorsService, private router: Router, private notificationsService: NotificationsService, - private userService: UserService + private userService: UserService, + private serverService: ServerService, + private redirectService: RedirectService, + private i18n: I18n ) { super() } - buildForm () { - this.form = this.formBuilder.group({ - username: [ '', USER_USERNAME.VALIDATORS ], - email: [ '', USER_EMAIL.VALIDATORS ], - password: [ '', USER_PASSWORD.VALIDATORS ] - }) + get instanceHost () { + return window.location.host + } - this.form.valueChanges.subscribe(data => this.onValueChanged(data)) + get requiresEmailVerification () { + return this.serverService.getConfig().signup.requiresEmailVerification } ngOnInit () { - this.buildForm() + this.buildForm({ + username: this.userValidatorsService.USER_USERNAME, + password: this.userValidatorsService.USER_PASSWORD, + email: this.userValidatorsService.USER_EMAIL, + terms: this.userValidatorsService.USER_TERMS + }) } signup () { @@ -64,8 +52,18 @@ export class SignupComponent extends FormReactive implements OnInit { this.userService.signup(userCreate).subscribe( () => { - this.notificationsService.success('Success', `Registration for ${userCreate.username} complete.`) - this.router.navigate([ '/videos/list' ]) + if (this.requiresEmailVerification) { + this.notificationsService.alert( + this.i18n('Welcome'), + this.i18n('Please check your email to verify your account and complete signup.') + ) + } else { + this.notificationsService.success( + this.i18n('Success'), + this.i18n('Registration for {{username}} complete.', { username: userCreate.username }) + ) + } + this.redirectService.redirectToHomepage() }, err => this.error = err.message