From b9c104e259ca24d2ae7ca82387209779fefddd34 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Sun, 19 Jan 2020 00:30:23 +0200
Subject: Implemented machine studio connection via access token WORKING!.
 Implemented machine studio login method selection.

---
 .../ViewModels/LoginViewVM.cs                      | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

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

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 cf34764d9..9c2367f93 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -102,6 +102,21 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { _enableSlotSelection = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isActiveDirectory;
+        public bool IsActiveDirectory
+        {
+            get { return _isActiveDirectory; }
+            set { _isActiveDirectory = value; RaisePropertyChangedAuto(); if (value) IsStandardUser = false; }
+        }
+
+        private bool _isStandardUser;
+        public bool IsStandardUser
+        {
+            get { return _isStandardUser; }
+            set { _isStandardUser = value; RaisePropertyChangedAuto(); if (value) IsActiveDirectory = false; }
+        }
+
+
 
         /// <summary>
         /// Gets or sets the login command.
@@ -131,6 +146,15 @@ namespace Tango.MachineStudio.UI.ViewModels
             Email = _settings.LastLoginEmail;
             DeploymentSlot = _settings.DeploymentSlot;
             RememberMe = _settings.RememberMe;
+            
+            if (_settings.LastLoginMethod == LoginMethod.ActiveDirectory)
+            {
+                IsActiveDirectory = true;
+            }
+            else
+            {
+                IsStandardUser = true;
+            }
 
             try
             {
@@ -154,11 +178,13 @@ namespace Tango.MachineStudio.UI.ViewModels
                     IsLogging = true;
                     InvalidateRelayCommands();
 
+                    LoginMethod loginMethod = IsActiveDirectory ? LoginMethod.ActiveDirectory : LoginMethod.StandardUser;
+
                     await Task.Factory.StartNew(() =>
                     {
                         _settings.DeploymentSlot = DeploymentSlot;
 
-                        LoginResponse result = _authenticationProvider.Login(Email, Password, _settings.ByPassEnvironmentVersionCheck).Response;
+                        LoginResponse result = _authenticationProvider.Login(Email, Password, loginMethod, _settings.ByPassEnvironmentVersionCheck).Response;
 
                         if (result.VersionChangeRequired && !_settings.ByPassEnvironmentVersionCheck)
                         {
@@ -183,6 +209,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                         _settings.LastLoginEmail = Email;
                         _settings.RememberMe = RememberMe;
+                        _settings.LastLoginMethod = loginMethod;
                         _settings.LastLoginPassword = RememberMe ? cryptographer.Encrypt(Password) : null;
                         _settings.Save();
 
-- 
cgit v1.3.1