diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-01-24 17:29:39 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-01-24 17:29:39 +0200 |
| commit | 5af9cb60feeda4b1dd781c3358418798d828d086 (patch) | |
| tree | 10d76fda2812077022d4ba459652f16fd08daafa /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication | |
| parent | d1807ee5a17bada69c8062d7e218c006fe654a24 (diff) | |
| parent | 6f56066c9d7bca42857792a43063b7eb5a9f47ef (diff) | |
| download | Tango-5af9cb60feeda4b1dd781c3358418798d828d086.tar.gz Tango-5af9cb60feeda4b1dd781c3358418798d828d086.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication')
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; } } } |