A lot of work !!!

8 files changed, 28 insertions, 13 deletions

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<PPCSettings>().DeploymentSlot, token)
+        public PPCWebClient(string token) : this(SettingsManager.Default.GetOrCreate<PPCSettings>().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
         /// </summary>
         /// <param name="environment">The environment.</param>
         /// <param name="token">Existing token.</param>
-        public PPCWebClientBase(DeploymentSlot environment, WebToken token) : base(environment, "PPC", token)
+        public PPCWebClientBase(DeploymentSlot environment, String token) : base(environment, "PPC", token)
         {
 
         }
@@ -31,6 +31,16 @@ namespace Tango.PPC.Common.Web
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="PPCWebClientBase"/> class.
+        /// </summary>
+        /// <param name="address">The service address.</param>
+        /// <param name="token">Existing token.</param>
+        public PPCWebClientBase(String address, String token) : base(address, "PPC", token)
+        {
+
+        }
+
+        /// <summary>
         /// Executes the MachineSetup action and returns Tango.PPC.Common.Web.MachineSetupResponse.
         /// </summary>
         /// <returns></returns>
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; }