From 7fff53b4e158212572dd0d83b5628e799e05ba01 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 24 Jan 2019 13:28:53 +0200 Subject: Implemented forced environment version in machine studio. --- .../Authentication/AuthenticationLoginResult.cs | 15 +++++++++++++++ .../Authentication/IAuthenticationProvider.cs | 2 +- .../Authentication/LoginRequest.cs | 1 + .../Authentication/LoginResponse.cs | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/AuthenticationLoginResult.cs (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication') 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 /// The email. /// The password. /// - User Login(String email, String password); + AuthenticationLoginResult Login(String email, String password); /// /// 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; } } } -- cgit v1.3.1