From 13cea5de4abfa38528ba74d9542734e133acaa81 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 23 Jul 2019 13:13:25 +0300 Subject: Improved user login errors. Added machine counters to connected machine view. --- .../DefaultAuthenticationProvider.cs | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs index 7aa9ae890..951a40870 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs @@ -17,6 +17,7 @@ using Tango.MachineStudio.Common.StudioApplication; using Tango.Core.Helpers; using Tango.MachineStudio.Common.Web; using Tango.BL.Builders; +using System.Data.Entity.Core; namespace Tango.MachineStudio.UI.Authentication { @@ -70,14 +71,24 @@ namespace Tango.MachineStudio.UI.Authentication var settings = SettingsManager.Default.GetOrCreate(); _client.Environment = settings.DeploymentSlot; - var response = _client.Login(new LoginRequest() + + LoginResponse response = null; + + try { + response = _client.Login(new LoginRequest() + { - Email = email, - Password = password, - Version = AssemblyHelper.GetCurrentAssemblyVersion().ToString(), + Email = email, + Password = password, + Version = AssemblyHelper.GetCurrentAssemblyVersion().ToString(), - }).Result; + }).Result; + } + catch (Exception ex) + { + throw new AggregateException(new AuthenticationException("Error logging in to machine service."), ex); + } if (settings.Environment == MachineStudioSettings.WorkingEnvironment.Remote) { @@ -88,10 +99,9 @@ namespace Tango.MachineStudio.UI.Authentication { ObservablesStaticCollections.Instance.Initialize(); } - catch (System.Data.Entity.Core.MetadataException) + catch (Exception ex) { - ObservablesContext.ClearModelStore(); - ObservablesStaticCollections.Instance.Initialize(); + throw new AggregateException(new MetadataException("Error initializing database connection."), ex); } using (ObservablesContext db = ObservablesContext.CreateDefault()) -- cgit v1.3.1