1 files changed, 36 insertions, 25 deletions

diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index 13941ec79..11eaa8521 100644
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -1,22 +1,25 @@
-import { Component, OnInit } from '@angular/core'
+import { Component } from '@angular/core'
 import { AuthService, Notifier, RedirectService, ServerService } from '@app/core'
-import { UserCreate } from '../../../../shared'
-import { FormReactive, UserService, UserValidatorsService } from '../shared'
+import { UserService, UserValidatorsService } from '../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
+import { UserRegister } from '@shared/models/users/user-register.model'
+import { FormGroup } from '@angular/forms'
 
 @Component({
   selector: 'my-signup',
   templateUrl: './signup.component.html',
   styleUrls: [ './signup.component.scss' ]
 })
-export class SignupComponent extends FormReactive implements OnInit {
+export class SignupComponent {
   info: string = null
   error: string = null
+  success: string = null
   signupDone = false
 
+  formStepUser: FormGroup
+  formStepChannel: FormGroup
+
   constructor (
-    protected formValidatorService: FormValidatorService,
     private authService: AuthService,
     private userValidatorsService: UserValidatorsService,
     private notifier: Notifier,
@@ -25,47 +28,55 @@ export class SignupComponent extends FormReactive implements OnInit {
     private redirectService: RedirectService,
     private i18n: I18n
   ) {
-    super()
-  }
-
-  get instanceHost () {
-    return window.location.host
   }
 
   get requiresEmailVerification () {
     return this.serverService.getConfig().signup.requiresEmailVerification
   }
 
-  ngOnInit () {
-    this.buildForm({
-      username: this.userValidatorsService.USER_USERNAME,
-      password: this.userValidatorsService.USER_PASSWORD,
-      email: this.userValidatorsService.USER_EMAIL,
-      terms: this.userValidatorsService.USER_TERMS
-    })
+  hasSameChannelAndAccountNames () {
+    return this.getUsername() === this.getChannelName()
+  }
+
+  getUsername () {
+    if (!this.formStepUser) return undefined
+
+    return this.formStepUser.value['username']
+  }
+
+  getChannelName () {
+    if (!this.formStepChannel) return undefined
+
+    return this.formStepChannel.value['name']
+  }
+
+  onUserFormBuilt (form: FormGroup) {
+    this.formStepUser = form
+  }
+
+  onChannelFormBuilt (form: FormGroup) {
+    this.formStepChannel = form
   }
 
   signup () {
     this.error = null
 
-    const userCreate: UserCreate = this.form.value
+    const body: UserRegister = Object.assign(this.formStepUser.value, this.formStepChannel.value)
 
-    this.userService.signup(userCreate).subscribe(
+    this.userService.signup(body).subscribe(
       () => {
         this.signupDone = true
 
         if (this.requiresEmailVerification) {
-          this.info = this.i18n('Welcome! Now please check your emails to verify your account and complete signup.')
+          this.info = this.i18n('Now please check your emails to verify your account and complete signup.')
           return
         }
 
         // Auto login
-        this.authService.login(userCreate.username, userCreate.password)
+        this.authService.login(body.username, body.password)
             .subscribe(
               () => {
-                this.notifier.success(this.i18n('You are now logged in as {{username}}!', { username: userCreate.username }))
-
-                this.redirectService.redirectToHomepage()
+                this.success = this.i18n('You are now logged in as {{username}}!', { username: body.username })
               },
 
               err => this.error = err.message