MERGE.

3 files changed, 100 insertions, 24 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index 72ab5aca9..f50b734f4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -4,26 +4,58 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Tango.Core.Threading;
+using Tango.DAL.Observables;
 using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common.Navigation;
+using Tango.MachineStudio.Common.Notifications;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
     public class LoadingViewVM : ViewModel
     {
-        public LoadingViewVM(INavigationManager navigationManager, IStudioModuleLoader studioModuleLoader)
+        private INotificationProvider _notificationProvider;
+        private INavigationManager _navigationManager;
+        private IStudioModuleLoader _studioModuleLoader;
+
+        public LoadingViewVM(INavigationManager navigationManager, IStudioModuleLoader studioModuleLoader, INotificationProvider notificationProvider)
+        {
+            _navigationManager = navigationManager;
+            _studioModuleLoader = studioModuleLoader;
+            _notificationProvider = notificationProvider;
+            Load();
+        }
+
+        private void Load()
         {
-            Task.Factory.StartNew(() =>
+            StaThreadHelper.StartStaThread(() =>
             {
                 Thread.Sleep(3000);
-            }).ContinueWith((x) => 
-            {
-
-                studioModuleLoader.LoadModules();
-                navigationManager.NavigateTo(NavigationView.LoginView);
-
-            }, TaskScheduler.FromCurrentSynchronizationContext());
+                try
+                {
+                    ObservablesEntitiesAdapter.Instance.Initialize();
+                    InvokeUI(() =>
+                    {
+                        _studioModuleLoader.LoadModules();
+                        _navigationManager.NavigateTo(NavigationView.LoginView);
+                    });
+                }
+                catch (Exception ex)
+                {
+                    InvokeUINow(() =>
+                    {
+                        if (_notificationProvider.ShowQuestion("An error occurred while trying to connect to Twine database." + Environment.NewLine + "Would you like to try again?"))
+                        {
+                            Load();
+                        }
+                        else
+                        {
+                            Environment.Exit(0);
+                        }
+                    });
+                }
+            });
         }
     }
 }
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..6fe90fa99 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,17 @@
 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.Core.Cryptography;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Navigation;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.Settings;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.UI.ViewModels
@@ -16,34 +20,59 @@ namespace Tango.MachineStudio.UI.ViewModels
     {
         private IAuthenticationProvider _authenticationProvider;
         private INavigationManager _navigationManager;
+        private INotificationProvider _notificationProvider;
+        private Rfc2898Cryptographer cryptographer;
 
         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; }
+        private bool _rememberMe;
 
-        public LoginViewVM(IAuthenticationProvider authenticationProvider, INavigationManager navigationManager)
+        public bool RememberMe
         {
+            get { return _rememberMe; }
+            set { _rememberMe = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        public RelayCommand<String> LoginCommand { get; set; }
+
+        public LoginViewVM(IAuthenticationProvider authenticationProvider, INavigationManager navigationManager, INotificationProvider notificationProvider)
+        {
+            _notificationProvider = notificationProvider;
             _navigationManager = navigationManager;
             _authenticationProvider = authenticationProvider;
-            LoginCommand = new RelayCommand<PasswordBox>(Login);
+            LoginCommand = new RelayCommand<String>(Login);
+
+            cryptographer = new Rfc2898Cryptographer();
+            Email = SettingsManager.Default.MachineStudio.LastLoginEmail;
+            RememberMe = SettingsManager.Default.MachineStudio.RememberMe;
         }
 
-        private void Login(PasswordBox passwordBox)
+        private void Login(String password)
         {
-            String password = passwordBox.Password;
-            try
-            {
-                _authenticationProvider.Login(Email, password);
-                _navigationManager.NavigateTo(NavigationView.MainView);
-            }
-            catch (Exception ex)
+            if (Validate())
             {
-                MessageBox.Show("Failed");
+                try
+                {
+                    _authenticationProvider.Login(Email, password);
+                    _navigationManager.NavigateTo(NavigationView.MainView);
+                    SettingsManager.Default.MachineStudio.LastLoginEmail = Email;
+                    SettingsManager.Default.MachineStudio.RememberMe = RememberMe;
+
+                    SettingsManager.Default.MachineStudio.LastLoginPassword = RememberMe ? cryptographer.Encrypt(password) : null;
+                    SettingsManager.SaveDefaultSettings();
+                }
+                catch
+                {
+                    _notificationProvider.ShowError("Invalid credentials. Please try again.");
+                }
             }
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 213d1a83d..7ef47fabd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -10,6 +10,7 @@ using Tango.Core.Commands;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Modules;
+using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.UI.SupervisingController;
 using Tango.SharedUI;
 
@@ -52,10 +53,24 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { _studioModuleLoader = value; RaisePropertyChangedAuto(); }
         }
 
-        public MainViewVM(IMainView view, IAuthenticationProvider authenticationProvider, IStudioModuleLoader studioModuleLoader) : base(view)
+        private INotificationProvider _notificationProvider;
+
+        public INotificationProvider NotificationProvider
+        {
+            get { return _notificationProvider; }
+            set { _notificationProvider = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        public MainViewVM(
+            IMainView view,
+            IAuthenticationProvider authenticationProvider,
+            IStudioModuleLoader studioModuleLoader,
+            INotificationProvider notificationProvider) : base(view)
         {
             AuthenticationProvider = authenticationProvider;
             StudioModuleLoader = studioModuleLoader;
+            NotificationProvider = notificationProvider;
 
             StartModuleCommand = new RelayCommand<IStudioModule>(StartModule);