From 2dff84b33f9e9c8a2371e903d22abae40a8e41cb Mon Sep 17 00:00:00 2001
From: kiswa <kiswa.com@gmail.com>
Date: Fri, 22 Jul 2016 20:21:07 +0000
Subject: [PATCH] Change Email functional, create and add UserOptions model

---
 .../user-settings/user-settings.component.ts  | 32 ++++++++++---------
 .../user-settings/user-settings.service.ts    |  9 +++++-
 src/app/shared/models/index.ts                |  1 +
 src/app/shared/models/user-options.model.ts   |  8 +++++
 4 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 src/app/shared/models/user-options.model.ts

diff --git a/src/app/settings/user-settings/user-settings.component.ts b/src/app/settings/user-settings/user-settings.component.ts
index 2f401c6..813ee7a 100644
--- a/src/app/settings/user-settings/user-settings.component.ts
+++ b/src/app/settings/user-settings/user-settings.component.ts
@@ -1,15 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 
 import { UserSettingsService } from './user-settings.service';
-import {
-    PassForm,
-    UsernameForm,
-    EmailForm
-} from './user-settings.models';
+import { PassForm, UsernameForm, EmailForm } from './user-settings.models';
 import {
     AuthService,
     NotificationsService,
     User,
+    UserOptions,
     Notification,
     ApiResponse
 } from '../../shared/index';
@@ -21,14 +18,21 @@ import {
 })
 export class UserSettings implements OnInit {
     private user: User;
+    private userOptions: UserOptions;
     private changePassword: PassForm;
     private changeUsername: UsernameForm;
-    private changeEmail: EmailForm
+    private changeEmail: EmailForm;
 
     constructor(private auth: AuthService,
             private notes: NotificationsService,
             private userService: UserSettingsService) {
-        auth.userChanged.subscribe(user => this.user = user);
+        this.changeEmail = new EmailForm();
+
+        auth.userChanged.subscribe(user => {
+            this.user = user;
+            this.changeEmail.newEmail = user.email;
+            this.userOptions = auth.userOptions;
+        });
     }
 
     ngOnInit() {
@@ -42,9 +46,8 @@ export class UserSettings implements OnInit {
             return;
         }
 
-        this.userService
-            .changePassword(this.changePassword.current,
-                    this.changePassword.newPass)
+        this.userService.changePassword(this.changePassword.current,
+                this.changePassword.newPass)
             .subscribe((response: ApiResponse) => {
                 this.addAlerts(response.alerts);
                 this.resetPasswordForm();
@@ -63,8 +66,7 @@ export class UserSettings implements OnInit {
             return;
         }
 
-        this.userService
-            .changeUsername(this.changeUsername.newName)
+        this.userService.changeUsername(this.changeUsername.newName)
             .subscribe((response: ApiResponse) => {
                 this.addAlerts(response.alerts);
                 this.resetUsernameForm();
@@ -75,7 +77,8 @@ export class UserSettings implements OnInit {
     updateEmail() {
         this.changeEmail.submitted = true;
 
-        let emailRegex = /^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i;
+        // https://davidcel.is/posts/stop-validating-email-addresses-with-regex/
+        let emailRegex = /.+@.+\..+/i;
         let match = this.changeEmail.newEmail.match(emailRegex);
 
         if (!match && this.changeEmail.newEmail !== '') {
@@ -86,8 +89,7 @@ export class UserSettings implements OnInit {
             return;
         }
 
-        this.userService
-            .changeEmail(this.changeEmail.newEmail)
+        this.userService.changeEmail(this.changeEmail.newEmail)
             .subscribe((response: ApiResponse) => {
                 this.addAlerts(response.alerts);
                 this.resetEmailForm();
diff --git a/src/app/settings/user-settings/user-settings.service.ts b/src/app/settings/user-settings/user-settings.service.ts
index ca1f837..44732af 100644
--- a/src/app/settings/user-settings/user-settings.service.ts
+++ b/src/app/settings/user-settings/user-settings.service.ts
@@ -64,12 +64,19 @@ export class UserSettingsService {
     }
 
     changeEmail(newEmail: string): Observable<ApiResponse> {
-        let json = JSON.stringify(this.activeUser);
+        let updateUser = this.activeUser;
+        updateUser.email = newEmail;
+
+        let json = JSON.stringify(updateUser);
 
         return this.http.post('api/users/' + this.activeUser.id, json)
             .map(res => {
                 let response: ApiResponse = res.json();
                 return response;
+            })
+            .catch((res, caught) => {
+                let response: ApiResponse = res.json();
+                return Observable.of(response);
             });
     }
 }
diff --git a/src/app/shared/models/index.ts b/src/app/shared/models/index.ts
index dd86c21..944f6dc 100644
--- a/src/app/shared/models/index.ts
+++ b/src/app/shared/models/index.ts
@@ -1,4 +1,5 @@
 export * from './user.model';
 export * from './api-response.model';
 export * from './notification.model';
+export * from './user-options.model';
 
diff --git a/src/app/shared/models/user-options.model.ts b/src/app/shared/models/user-options.model.ts
new file mode 100644
index 0000000..83c0cc2
--- /dev/null
+++ b/src/app/shared/models/user-options.model.ts
@@ -0,0 +1,8 @@
+export interface UserOptions {
+    id: number;
+    new_tasks_at_bottom: boolean;
+    show_animations: boolean;
+    show_assignee: boolean;
+    multiple_tasks_per_row: boolean;
+}
+