Implemented machine studio connection via access token WORKING!.

Implemented machine studio login method selection.

5 files changed, 27 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
index 74969fd27..cb231fa05 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.Common.Authentication
         /// <param name="email">The email.</param>
         /// <param name="password">The password.</param>
         /// <returns></returns>
-        AuthenticationLoginResult Login(String email, String password, bool bypassVersionCheck = false);
+        AuthenticationLoginResult Login(String email, String password, LoginMethod method, bool bypassVersionCheck = false);
 
         /// <summary>
         /// Logs-out the current logged-in user.
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 6ab26028f..91eaa857d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -8,6 +8,7 @@ using System.Windows;
 using Tango.BL;
 using Tango.Integration.Operation;
 using Tango.Logging;
+using Tango.MachineStudio.Common.Web;
 using Tango.PMR.Printing;
 using Tango.Settings;
 using Tango.Web;
@@ -40,6 +41,11 @@ namespace Tango.MachineStudio.Common
         public String LastLoginPassword { get; set; }
 
         /// <summary>
+        /// Gets or sets the last login method.
+        /// </summary>
+        public LoginMethod LastLoginMethod { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether to save the user credentials.
         /// </summary>
         public bool RememberMe { get; set; }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 5e874add1..2df984c7c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -105,6 +105,7 @@
     <Compile Include="Tup\TupFileBuilderProgressEventArgs.cs" />
     <Compile Include="Web\DownloadLatestPPCVersionRequest.cs" />
     <Compile Include="Web\DownloadLatestPPCVersionResponse.cs" />
+    <Compile Include="Web\LoginMethod.cs" />
     <Compile Include="Web\LoginRequest.cs" />
     <Compile Include="Web\LoginResponse.cs" />
     <Compile Include="AutoComplete\MachinesProvider.cs" />
@@ -426,7 +427,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginMethod.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginMethod.cs
new file mode 100644
index 000000000..83f1c0850
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginMethod.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.Common.Web
+{
+    public enum LoginMethod
+    {
+        [Description("Active Directory")]
+        ActiveDirectory,
+        [Description("Standard User")]
+        StandardUser,
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginRequest.cs
index 577f5e208..1727a2c6e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginRequest.cs
@@ -12,5 +12,6 @@ namespace Tango.MachineStudio.Common.Web
         public String Version { get; set; }
         public String Email { get; set; }
         public String Password { get; set; }
+        public LoginMethod Method { get; set; }
     }
 }