From d8c9996ce2b4de3ef1f2d36f63e461006bab58ed Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 16 Nov 2018 17:02:21 +0100
Subject: Improve message visibility on signup

---
 client/src/app/signup/signup.component.html |  3 ++-
 client/src/app/signup/signup.component.ts   | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'client/src/app/signup')

diff --git a/client/src/app/signup/signup.component.html b/client/src/app/signup/signup.component.html
index 531a97814..0207a166e 100644
--- a/client/src/app/signup/signup.component.html
+++ b/client/src/app/signup/signup.component.html
@@ -4,6 +4,7 @@
     Create an account
   </div>
 
+  <div *ngIf="info" class="alert alert-info">{{ info }}</div>
   <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
 
   <div class="d-flex justify-content-left flex-wrap">
@@ -59,7 +60,7 @@
         </div>
       </div>
 
-      <input type="submit" i18n-value value="Signup" [disabled]="!form.valid">
+      <input type="submit" i18n-value value="Signup" [disabled]="!form.valid || signupDone">
     </form>
 
     <div>
diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index cf2657b85..607d64893 100644
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -12,7 +12,9 @@ import { FormValidatorService } from '@app/shared/forms/form-validators/form-val
   styleUrls: [ './signup.component.scss' ]
 })
 export class SignupComponent extends FormReactive implements OnInit {
+  info: string = null
   error: string = null
+  signupDone = false
 
   constructor (
     protected formValidatorService: FormValidatorService,
@@ -50,17 +52,17 @@ export class SignupComponent extends FormReactive implements OnInit {
 
     this.userService.signup(userCreate).subscribe(
       () => {
+        this.signupDone = true
+
         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.info = this.i18n('Welcome! Now please check your emails to verify your account and complete signup.')
+          return
         }
+
+        this.notificationsService.success(
+          this.i18n('Success'),
+          this.i18n('Registration for {{username}} complete.', { username: userCreate.username })
+        )
         this.redirectService.redirectToHomepage()
       },
 
-- 
cgit v1.2.3


From 43e9d2af7d3525bc709e4c6d15fe85f65795f5fa Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 16 Nov 2018 17:06:19 +0100
Subject: Auto login user on signup

---
 client/src/app/signup/signup.component.ts | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'client/src/app/signup')

diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index 607d64893..3341d4e09 100644
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'
 import { NotificationsService } from 'angular2-notifications'
 import { UserCreate } from '../../../../shared'
 import { FormReactive, UserService, UserValidatorsService } from '../shared'
-import { RedirectService, ServerService } from '@app/core'
+import { AuthService, RedirectService, ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 
@@ -18,6 +18,7 @@ export class SignupComponent extends FormReactive implements OnInit {
 
   constructor (
     protected formValidatorService: FormValidatorService,
+    private authService: AuthService,
     private userValidatorsService: UserValidatorsService,
     private notificationsService: NotificationsService,
     private userService: UserService,
@@ -59,11 +60,20 @@ export class SignupComponent extends FormReactive implements OnInit {
           return
         }
 
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('Registration for {{username}} complete.', { username: userCreate.username })
-        )
-        this.redirectService.redirectToHomepage()
+        // Auto login
+        this.authService.login(userCreate.username, userCreate.password)
+            .subscribe(
+              () => {
+                this.notificationsService.success(
+                  this.i18n('Success'),
+                  this.i18n('You are now logged in as {{username}}!', { username: userCreate.username })
+                )
+
+                this.redirectService.redirectToHomepage()
+              },
+
+              err => this.error = err.message
+            )
       },
 
       err => this.error = err.message
-- 
cgit v1.2.3