From 9447a8a09f87d6ea2cb62860021c595386668eec Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 20 Feb 2019 22:55:15 +0200 Subject: A lot of work !!! --- .../PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs | 3 ++- .../PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs | 4 ++-- .../PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs | 4 ++-- .../Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs | 8 ++++++-- .../PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs | 14 ++++++++++++-- .../PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs | 4 ++-- .../PPC/Tango.PPC.Common/Web/UploadCompletedRequest.cs | 2 +- .../PPC/Tango.PPC.Common/Web/UploadVersionRequest.cs | 2 +- 8 files changed, 28 insertions(+), 13 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/Web') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs index 8bb8cde54..b98848e4f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs @@ -7,8 +7,9 @@ using Tango.Transport.Web; namespace Tango.PPC.Common.Web { - public class CheckForUpdateRequest : WebRequestSecureMessage + public class CheckForUpdateRequest : WebRequestMessage { + public String SerialNumber { get; set; } public String Version { get; set; } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs index 20d1da3ec..a32d3d497 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs @@ -7,8 +7,8 @@ using Tango.Transport.Web; namespace Tango.PPC.Common.Web { - public class DownloadUpdateRequest : WebRequestSecureMessage + public class DownloadUpdateRequest : WebRequestMessage { - + public String SerialNumber { get; set; } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs index ce8b2f58d..83bec6b07 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs @@ -7,8 +7,8 @@ using Tango.Transport.Web; namespace Tango.PPC.Common.Web { - public class MachineSetupRequest : WebRequestSecureMessage + public class MachineSetupRequest : WebRequestMessage { - + public String SerialNumber { get; set; } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs index 5900dd697..4897efc90 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs @@ -15,16 +15,20 @@ namespace Tango.PPC.Common.Web { } - public PPCWebClient(DeploymentSlot environment, WebToken token) : base(environment, token) + public PPCWebClient(DeploymentSlot environment, string token) : base(environment, token) { } - public PPCWebClient(WebToken token) : this(SettingsManager.Default.GetOrCreate().DeploymentSlot, token) + public PPCWebClient(string token) : this(SettingsManager.Default.GetOrCreate().DeploymentSlot, token) { } public PPCWebClient() : this(null) { } + + public PPCWebClient(string address, string token) : base(address, token) + { + } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs index e5c1beb4a..723e3ffc4 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs @@ -1,7 +1,7 @@ +using System; using System.Threading.Tasks; using Tango.Web; -using Tango.Web.Authentication; namespace Tango.PPC.Common.Web { @@ -16,7 +16,7 @@ namespace Tango.PPC.Common.Web /// /// The environment. /// Existing token. - public PPCWebClientBase(DeploymentSlot environment, WebToken token) : base(environment, "PPC", token) + public PPCWebClientBase(DeploymentSlot environment, String token) : base(environment, "PPC", token) { } @@ -30,6 +30,16 @@ namespace Tango.PPC.Common.Web } + /// + /// Initializes a new instance of the class. + /// + /// The service address. + /// Existing token. + public PPCWebClientBase(String address, String token) : base(address, "PPC", token) + { + + } + /// /// Executes the MachineSetup action and returns Tango.PPC.Common.Web.MachineSetupResponse. /// diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs index 4c9714970..f3b4ccb34 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs @@ -7,8 +7,8 @@ using Tango.Transport.Web; namespace Tango.PPC.Common.Web { - public class UpdateDBRequest : WebRequestSecureMessage + public class UpdateDBRequest : WebRequestMessage { - + public String SerialNumber { get; set; } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadCompletedRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadCompletedRequest.cs index f9674f6c5..b51612603 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadCompletedRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadCompletedRequest.cs @@ -8,7 +8,7 @@ using Tango.Transport.Web; namespace Tango.PPC.Common.Web { - public class UploadCompletedRequest : WebRequestSecureMessage + public class UploadCompletedRequest : WebRequestMessage { public String Token { get; set; } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadVersionRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadVersionRequest.cs index 68643bfe7..d75a94300 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadVersionRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadVersionRequest.cs @@ -8,7 +8,7 @@ using Tango.Transport.Web; namespace Tango.PPC.Common.Web { - public class UploadVersionRequest : WebRequestSecureMessage + public class UploadVersionRequest : WebRequestMessage { public String Version { get; set; } -- cgit v1.3.1