aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2020-01-19 16:10:55 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2020-01-19 16:10:55 +0200
commit7ffd0bab3c6f397936f8ef9f6829cdf33b850efa (patch)
treec2fb5b6cef2d04fe529b284a734657749880abf9 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
parent09d432566f696f0eeb3fce97d2c870cfd1c91f89 (diff)
downloadTango-7ffd0bab3c6f397936f8ef9f6829cdf33b850efa.tar.gz
Tango-7ffd0bab3c6f397936f8ef9f6829cdf33b850efa.zip
Implemented new ms user creation + PASSWORD_CHANGE_REQUIRED.
Improved ms login design + password change. Improved ms main menu and current user design.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs135
1 files changed, 131 insertions, 4 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 dce469dbd..c00caf72a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -22,6 +22,9 @@ using Tango.MachineStudio.UI.Messages;
using Tango.Settings;
using Tango.SharedUI;
using Tango.Web;
+using SimpleValidator.Extensions;
+using Tango.BL.Entities;
+using System.Data.Entity;
namespace Tango.MachineStudio.UI.ViewModels
{
@@ -38,6 +41,7 @@ namespace Tango.MachineStudio.UI.ViewModels
private Rfc2898Cryptographer cryptographer;
private MachineStudioSettings _settings;
private MachineStudioWebClient _machineStudioWebClient;
+ private TaskCompletionSource<object> _updatePasswordCompletionSource;
private String _email;
/// <summary>
@@ -82,6 +86,14 @@ namespace Tango.MachineStudio.UI.ViewModels
set { _isLogging = value; RaisePropertyChangedAuto(); }
}
+ private bool _showLogginDetails;
+ public bool ShowLoggingDetails
+ {
+ get { return _showLogginDetails; }
+ set { _showLogginDetails = value; RaisePropertyChangedAuto(); }
+ }
+
+
private bool _rememberMe;
/// <summary>
/// Gets or sets a value indicating whether to remember the last user email and password.
@@ -123,12 +135,38 @@ namespace Tango.MachineStudio.UI.ViewModels
set { _progressLog = value; RaisePropertyChangedAuto(); }
}
+ private bool _isChangingPassword;
+ public bool IsChangingPassword
+ {
+ get { return _isChangingPassword; }
+ set { _isChangingPassword = value; RaisePropertyChangedAuto(); }
+ }
+
+ private String _newPassword1;
+ public String NewPassword1
+ {
+ get { return _newPassword1; }
+ set { _newPassword1 = value; RaisePropertyChangedAuto(); }
+ }
+
+ private String _newPassword2;
+ public String NewPassword2
+ {
+ get { return _newPassword2; }
+ set { _newPassword2 = value; RaisePropertyChangedAuto(); }
+ }
+
/// <summary>
/// Gets or sets the login command.
/// </summary>
public RelayCommand LoginCommand { get; set; }
/// <summary>
+ /// Gets or sets the update password command.
+ /// </summary>
+ public RelayCommand UpdatePasswordCommand { get; set; }
+
+ /// <summary>
/// Initializes a new instance of the <see cref="LoginViewVM"/> class.
/// </summary>
/// <param name="authenticationProvider">The authentication provider.</param>
@@ -137,6 +175,7 @@ namespace Tango.MachineStudio.UI.ViewModels
public LoginViewVM(MachineStudioWebClient machineStudioWebClient, IAuthenticationProvider authenticationProvider, INavigationManager navigationManager, INotificationProvider notificationProvider, IEventLogger eventLogger)
{
EnableSlotSelection = true;
+ ShowLoggingDetails = true;
_machineStudioWebClient = machineStudioWebClient;
_settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
@@ -146,6 +185,7 @@ namespace Tango.MachineStudio.UI.ViewModels
_authenticationProvider = authenticationProvider;
_eventLogger = eventLogger;
LoginCommand = new RelayCommand(Login, () => !IsLogging);
+ UpdatePasswordCommand = new RelayCommand(UpdatePassword, () => IsChangingPassword);
cryptographer = new Rfc2898Cryptographer();
Email = _settings.LastLoginEmail;
@@ -181,6 +221,10 @@ namespace Tango.MachineStudio.UI.ViewModels
try
{
IsLogging = true;
+ ShowLoggingDetails = false;
+ NewPassword1 = String.Empty;
+ NewPassword2 = String.Empty;
+
InvalidateRelayCommands();
LoginMethod loginMethod = IsActiveDirectory ? LoginMethod.ActiveDirectory : LoginMethod.StandardUser;
@@ -190,9 +234,9 @@ namespace Tango.MachineStudio.UI.ViewModels
_settings.DeploymentSlot = DeploymentSlot;
LoginResponse result = _authenticationProvider.Login(Email, Password, loginMethod, _settings.ByPassEnvironmentVersionCheck, (progress) =>
- {
- ProgressLog = progress;
- }).Response;
+ {
+ ProgressLog = progress;
+ }).Response;
if (result.VersionChangeRequired && !_settings.ByPassEnvironmentVersionCheck)
{
@@ -211,6 +255,14 @@ namespace Tango.MachineStudio.UI.ViewModels
return;
}
+ if (result.PasswordChangeRequired)
+ {
+ StartUpdatePassword().Task.GetAwaiter().GetResult();
+ Password = NewPassword1;
+ Login();
+ return;
+ }
+
_eventLogger.Log(EventTypes.APPLICATION_STARTED, "Application Started!");
_navigationManager.NavigateTo(NavigationView.MainView);
@@ -224,19 +276,94 @@ namespace Tango.MachineStudio.UI.ViewModels
_eventLogger.Log("User logged in.");
EnableSlotSelection = false;
+
+ IsLogging = false;
+ ShowLoggingDetails = true;
+ IsChangingPassword = false;
+ InvalidateRelayCommands();
});
}
catch (Exception ex)
{
+ IsLogging = false;
+ ShowLoggingDetails = true;
+ IsChangingPassword = false;
+ InvalidateRelayCommands();
LogManager.Log(ex, "Login Error.");
_notificationProvider.ShowError($"An error occurred while trying to perform the log-in operation.\n{ex.FlattenMessage()}");
}
- finally
+ }
+ }
+
+ private TaskCompletionSource<object> StartUpdatePassword()
+ {
+ _updatePasswordCompletionSource = new TaskCompletionSource<object>();
+
+ IsChangingPassword = true;
+ ShowLoggingDetails = false;
+ IsLogging = false;
+ InvalidateRelayCommands();
+
+ return _updatePasswordCompletionSource;
+ }
+
+ private async void UpdatePassword()
+ {
+ await Task.Factory.StartNew(() =>
+ {
+ try
+ {
+ if (!Validate())
+ {
+ return;
+ }
+
+ ProgressLog = "Updating your password...";
+ IsChangingPassword = false;
+ IsLogging = true;
+ InvalidateRelayCommands();
+
+ using (var db = ObservablesContext.CreateDefault())
+ {
+ var user = db.Users.SingleOrDefault(x => x.Email == Email);
+ user.PasswordChangeRequired = false;
+ user.Password = User.GetPasswordHash(NewPassword1);
+ db.SaveChanges();
+ }
+
+ _updatePasswordCompletionSource.SetResult(true);
+ }
+ catch (Exception ex)
{
IsLogging = false;
+ IsChangingPassword = false;
+ ShowLoggingDetails = true;
+ InvalidateRelayCommands();
+ _updatePasswordCompletionSource.SetException(ex);
+ }
+ finally
+ {
InvalidateRelayCommands();
}
+ });
+ }
+
+ protected override void OnValidating()
+ {
+ if (IsChangingPassword)
+ {
+ if (!NewPassword1.IsBetweenLength(6, 8))
+ {
+ InsertError(nameof(NewPassword1), "Password must be 6 to 8 characters long");
+ }
+
+ if (NewPassword1 != NewPassword2)
+ {
+ InsertError(nameof(NewPassword2), "Passwords do not match");
+ }
}
+
+ base.OnValidating();
}
}
}