1 files changed, 15 insertions, 17 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index 256804f67..369248c7b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -40,6 +40,7 @@ namespace Tango.PPC.Common.MachineSetup
         private IRemoteAssistanceProvider _remoteAssistance;
         private IUnifiedWriteFilterManager _uwf;
         private IOperationSystemManager _windows_manager;
+        private PPCWebClient _client;
 
         #region Events
 
@@ -72,8 +73,9 @@ namespace Tango.PPC.Common.MachineSetup
         /// Initializes a new instance of the <see cref="MachineSetupManager"/> class.
         /// </summary>
         /// <param name="remoteAssistance">The remote assistance.</param>
-        public MachineSetupManager(IRemoteAssistanceProvider remoteAssistance, IUnifiedWriteFilterManager unifiedWriterFilterManager, IOperationSystemManager operationSystemManager)
+        public MachineSetupManager(PPCWebClient ppcWebClient, IRemoteAssistanceProvider remoteAssistance, IUnifiedWriteFilterManager unifiedWriterFilterManager, IOperationSystemManager operationSystemManager)
         {
+            _client = ppcWebClient;
             _remoteAssistance = remoteAssistance;
             _uwf = unifiedWriterFilterManager;
             _windows_manager = operationSystemManager;
@@ -83,18 +85,16 @@ namespace Tango.PPC.Common.MachineSetup
 
         #region Private Methods
 
-        private Task<String> Login(String serialNumber)
+        private Task Login(String serialNumber)
         {
-            return Task.Factory.StartNew<String>(() =>
+            return Task.Factory.StartNew(() =>
             {
-                using (var client = new PPCWebService())
+                return _client.Login(new LoginRequest()
                 {
-                    return client.Login(new LoginRequest()
-                    {
-                        Mode = LoginMode.Machine,
-                        SerialNumber = serialNumber,
-                    }).Result.AccessToken;
-                }
+                    Mode = LoginMode.Machine,
+                    SerialNumber = serialNumber,
+                }).Result;
+
             });
         }
 
@@ -108,7 +108,7 @@ namespace Tango.PPC.Common.MachineSetup
         /// <param name="serialNumber">The serial number.</param>
         /// <param name="machineServiceAddress">The machine service address.</param>
         /// <returns></returns>
-        public async Task<MachineSetupResult> Setup(string serialNumber, string machineServiceAddress)
+        public async Task<MachineSetupResult> Setup(string serialNumber)
         {
             TaskCompletionSource<MachineSetupResult> result = new TaskCompletionSource<MachineSetupResult>();
 
@@ -116,6 +116,8 @@ namespace Tango.PPC.Common.MachineSetup
             {
                 LogManager.Log($"Starting machine setup for serial number {serialNumber}...");
 
+                var machineServiceAddress = SettingsManager.Default.GetOrCreate<PPCSettings>().GetMachineServiceAddress();
+
                 IMachineOperator op = null;
 
                 var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
@@ -125,19 +127,15 @@ namespace Tango.PPC.Common.MachineSetup
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                var accessToken = await Login(serialNumber);
+                Login(serialNumber).Wait();
 
                 MachineSetupRequest request = new MachineSetupRequest();
-                request.AccessToken = accessToken;
 
                 MachineSetupResponse setup_response = null;
 
                 try
                 {
-                    using (var client = new PPCWebService())
-                    {
-                        setup_response = await client.MachineSetup(request);
-                    }
+                    setup_response = await _client.MachineSetup(request);
                 }
                 catch (Exception ex)
                 {