aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-01-24 13:28:53 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-01-24 13:28:53 +0200
commit7fff53b4e158212572dd0d83b5628e799e05ba01 (patch)
tree05932505d589d261515657241d53072af381d108 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication
parentecb6665c860f8d7270af9cf8eefaf9ff05e54d62 (diff)
downloadTango-7fff53b4e158212572dd0d83b5628e799e05ba01.tar.gz
Tango-7fff53b4e158212572dd0d83b5628e799e05ba01.zip
Implemented forced environment version in machine studio.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/AuthenticationLoginResult.cs15
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginRequest.cs1
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs2
4 files changed, 19 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/AuthenticationLoginResult.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/AuthenticationLoginResult.cs
new file mode 100644
index 000000000..78f5365a5
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/AuthenticationLoginResult.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.MachineStudio.Common.Authentication
+{
+ public class AuthenticationLoginResult
+ {
+ public User User { get; set; }
+ public LoginResponse Response { get; set; }
+ }
+}
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 785dc1523..7cc2b5b51 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
@@ -33,7 +33,7 @@ namespace Tango.MachineStudio.Common.Authentication
/// <param name="email">The email.</param>
/// <param name="password">The password.</param>
/// <returns></returns>
- User Login(String email, String password);
+ AuthenticationLoginResult Login(String email, String password);
/// <summary>
/// Logs-out the current logged-in user.
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginRequest.cs
index 762fb5dd5..94fe7f5e2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginRequest.cs
@@ -9,6 +9,7 @@ namespace Tango.MachineStudio.Common.Authentication
{
public class LoginRequest : WebRequestMessage
{
+ public String Version { get; set; }
public String Email { get; set; }
public String Password { get; set; }
}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs
index 3da033b9f..e1d9c615a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs
@@ -12,5 +12,7 @@ namespace Tango.MachineStudio.Common.Authentication
{
public DataSource DataSource { get; set; }
public String Token { get; set; }
+ public bool VersionChangeRequired { get; set; }
+ public String RequiredVersion { get; set; }
}
}