Add email to users

4 files changed, 27 insertions, 4 deletions

diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index f6d360e09..a92f9c231 100644
--- a/client/src/app/+admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
@@ -14,9 +14,10 @@ export class UserService {
     private restExtractor: RestExtractor
   ) {}
 
-  addUser(username: string, password: string) {
+  addUser(username: string, password: string, email: string) {
     const body = {
       username,
+      email,
       password
     };
 
diff --git a/client/src/app/+admin/users/user-add/user-add.component.html b/client/src/app/+admin/users/user-add/user-add.component.html
index 9b76c7c1b..105760f48 100644
--- a/client/src/app/+admin/users/user-add/user-add.component.html
+++ b/client/src/app/+admin/users/user-add/user-add.component.html
@@ -15,6 +15,17 @@
   </div>
 
   <div class="form-group">
+    <label for="email">Email</label>
+    <input
+      type="text" class="form-control" id="email" placeholder="Email"
+      formControlName="email"
+    >
+    <div *ngIf="formErrors.email" class="alert alert-danger">
+      {{ formErrors.email }}
+    </div>
+  </div>
+
+  <div class="form-group">
     <label for="password">Password</label>
     <input
       type="password" class="form-control" id="password" placeholder="Password"
diff --git a/client/src/app/+admin/users/user-add/user-add.component.ts b/client/src/app/+admin/users/user-add/user-add.component.ts
index a851fee44..f1d2fde80 100644
--- a/client/src/app/+admin/users/user-add/user-add.component.ts
+++ b/client/src/app/+admin/users/user-add/user-add.component.ts
@@ -5,7 +5,12 @@ import { Router } from '@angular/router';
 import { NotificationsService } from 'angular2-notifications';
 
 import { UserService } from '../shared';
-import { FormReactive, USER_USERNAME, USER_PASSWORD } from '../../../shared';
+import {
+  FormReactive,
+  USER_USERNAME,
+  USER_EMAIL,
+  USER_PASSWORD
+} from '../../../shared';
 
 @Component({
   selector: 'my-user-add',
@@ -17,10 +22,12 @@ export class UserAddComponent extends FormReactive implements OnInit {
   form: FormGroup;
   formErrors = {
     'username': '',
+    'email': '',
     'password': ''
   };
   validationMessages = {
     'username': USER_USERNAME.MESSAGES,
+    'email': USER_EMAIL.MESSAGES,
     'password': USER_PASSWORD.MESSAGES,
   };
 
@@ -36,6 +43,7 @@ export class UserAddComponent extends FormReactive implements OnInit {
   buildForm() {
     this.form = this.formBuilder.group({
       username: [ '', USER_USERNAME.VALIDATORS ],
+      email:    [ '', USER_EMAIL.VALIDATORS ],
       password: [ '', USER_PASSWORD.VALIDATORS ],
     });
 
@@ -49,9 +57,9 @@ export class UserAddComponent extends FormReactive implements OnInit {
   addUser() {
     this.error = null;
 
-    const { username, password } = this.form.value;
+    const { username, password, email } = this.form.value;
 
-    this.userService.addUser(username, password).subscribe(
+    this.userService.addUser(username, password, email).subscribe(
       () => {
         this.notificationsService.success('Success', `User ${username} created.`);
         this.router.navigate([ '/admin/users/list' ]);
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts
index c27b96e28..69ae4353d 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/users/user-list/user-list.component.ts
@@ -40,6 +40,9 @@ export class UserListComponent {
       username: {
         title: 'Username'
       },
+      email: {
+        title: 'Email'
+      },
       role: {
         title: 'Role',
         sort: false