1 files changed, 22 insertions, 13 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
index 67c116790..c3fc16db5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -1,13 +1,16 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using Tango.Core.Commands;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Navigation;
+using Tango.MachineStudio.Common.Notifications;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.UI.ViewModels
@@ -16,34 +19,40 @@ namespace Tango.MachineStudio.UI.ViewModels
     {
         private IAuthenticationProvider _authenticationProvider;
         private INavigationManager _navigationManager;
+        private INotificationProvider _notificationProvider;
 
         private String _email;
+        [Required(ErrorMessage = "Email is required")]
+        [EmailAddress(ErrorMessage = "Please enter a valid email")]
         public String Email
         {
             get { return _email; }
             set { _email = value; RaisePropertyChangedAuto(); }
         }
 
-        public RelayCommand<PasswordBox> LoginCommand { get; set; }
+        public RelayCommand<String> LoginCommand { get; set; }
 
-        public LoginViewVM(IAuthenticationProvider authenticationProvider, INavigationManager navigationManager)
+        public LoginViewVM(IAuthenticationProvider authenticationProvider, INavigationManager navigationManager, INotificationProvider notificationProvider)
         {
+            _notificationProvider = notificationProvider;
             _navigationManager = navigationManager;
             _authenticationProvider = authenticationProvider;
-            LoginCommand = new RelayCommand<PasswordBox>(Login);
+            LoginCommand = new RelayCommand<String>(Login);
         }
 
-        private void Login(PasswordBox passwordBox)
+        private void Login(String password)
         {
-            String password = passwordBox.Password;
-            try
+            if (Validate())
             {
-                _authenticationProvider.Login(Email, password);
-                _navigationManager.NavigateTo(NavigationView.MainView);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Failed");
+                try
+                {
+                    _authenticationProvider.Login(Email, password);
+                    _navigationManager.NavigateTo(NavigationView.MainView);
+                }
+                catch
+                {
+                    _notificationProvider.ShowError("Invalid credentials. Please try again.");
+                }
             }
         }
     }