From b57f99763d0f53e4bda9afd47841e9245784c224 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sat, 16 Dec 2017 14:25:47 +0200
Subject: Implemented login remember me. Implemented database connection while
 loading screen + error handling.

---
 .../MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml    | 2 +-
 .../MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml      | 3 ++-
 .../MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs   | 7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
index 13a705895..459c8fde8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
@@ -6,7 +6,7 @@
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" DataContext="{Binding LoadingViewVM, Source={StaticResource Locator}}" Background="White">
+             d:DesignHeight="720" d:DesignWidth="1280" Cursor="Wait" DataContext="{Binding LoadingViewVM, Source={StaticResource Locator}}" Background="White">
     <Grid>
         <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
             <StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml
index 046c34183..1531370af 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml
@@ -33,7 +33,8 @@
                 <materialDesign:PackIcon Margin="0 0 0 0" Width="20" Height="20" VerticalAlignment="Top" Foreground="{Binding ElementName=txtPass, Path=BorderBrush}" Kind="Key" />
                 <PasswordBox x:Name="txtPass" PasswordChanged="txtPass_PasswordChanged" Margin="5 0 0 0" materialDesign:HintAssist.FloatingScale="0.50" materialDesign:HintAssist.Hint="Password" materialDesign:TextFieldAssist.TextBoxViewMargin="1 0 1 0" FontSize="20" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}" AutomationProperties.IsRequiredForForm="True" />
             </DockPanel>
-            <Button Margin="0 40 0 0" Height="50" Command="{Binding LoginCommand}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Password}" Content="LOGIN">
+            <CheckBox Margin="25 20 0 0" IsChecked="{Binding RememberMe}">Remember me</CheckBox>
+            <Button Margin="25 20 0 0" Height="50" Command="{Binding LoginCommand}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Password}" Content="LOGIN">
 
             </Button>
         </StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs
index 9ad7b03a2..027e37682 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs
@@ -15,6 +15,7 @@ using System.Windows.Shapes;
 using static Tango.SharedUI.Controls.MultiTransitionControl;
 using SimpleValidator.Extensions;
 using Tango.Settings;
+using Tango.Core.Cryptography;
 
 namespace Tango.MachineStudio.UI.Views
 {
@@ -23,9 +24,13 @@ namespace Tango.MachineStudio.UI.Views
     /// </summary>
     public partial class LoginView : UserControl, ITransitionView
     {
+        private Rfc2898Cryptographer cryptographer;
+
         public LoginView()
         {
             InitializeComponent();
+
+            cryptographer = new Rfc2898Cryptographer();
         }
 
         public String Password
@@ -45,7 +50,7 @@ namespace Tango.MachineStudio.UI.Views
                 txtPass.Focus();
             }
 
-            txtPass.Password = SettingsManager.Default.MachineStudio.LastLoginPassword;
+            txtPass.Password = cryptographer.Decrypt(SettingsManager.Default.MachineStudio.LastLoginPassword);
         }
 
         private void txtPass_PasswordChanged(object sender, RoutedEventArgs e)
-- 
cgit v1.3.1