1 files changed, 12 insertions, 10 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
index 8485cd67d..8d46ed7d9 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
@@ -11,11 +11,13 @@ using Tango.BL.Builders;
 using Tango.BL.Entities;
 using Tango.BL.Enumerations;
 using Tango.Core.Cryptography;
-using Tango.MachineService.Helpers;
 using Tango.MachineService.Models;
 using Tango.MachineStudio.Common.Authentication;
 using System.Data.Entity;
 using Tango.MachineStudio.Common.Update;
+using Tango.Web.Controllers;
+using Tango.Web.Helpers;
+using Tango.Web.Storage;
 
 namespace Tango.MachineService.Controllers
 {
@@ -70,11 +72,11 @@ namespace Tango.MachineService.Controllers
 
                     if (latestVersion != null && Version.Parse(latestVersion.Version) > currentVersion)
                     {
-                        var client = StorageHelper.GetStorageBlobClient();
-                        var container = StorageHelper.GetMachineStudioVersionsContainer(client);
+                        var manager = new StorageManager();
+                        var container = manager.GetContainer(MachineServiceConfig.MACHINE_STUDIO_VERSIONS_CONTAINER);
                         var blob = container.GetBlockBlobReference(latestVersion.BlobName);
 
-                        response.BlobAddress = StorageHelper.GenerateBlobReadSignature(blob, TimeSpan.FromMinutes(60));
+                        response.BlobAddress = blob.GenerateReadSignature(TimeSpan.FromMinutes(60));
 
                         response.IsUpdateAvailable = true;
                         response.Version = latestVersion.Version;
@@ -116,12 +118,12 @@ namespace Tango.MachineService.Controllers
                     {
                         String newVersionFileName = "Machine Studio Version" + " " + currentVersion.ToString() + ".zip";
 
-                        var client = StorageHelper.GetStorageBlobClient();
-                        var container = StorageHelper.GetMachineStudioVersionsContainer(client);
-                        var blob = StorageHelper.CreateEmptyBlob(container, newVersionFileName);
+                        var manager = new StorageManager();
+                        var container = manager.GetContainer(MachineServiceConfig.MACHINE_STUDIO_VERSIONS_CONTAINER);
+                        var blob = container.CreateEmptyBlob(newVersionFileName);
 
                         response.Token = Guid.NewGuid().ToString();
-                        response.BlobAddress = StorageHelper.GenerateBlobWriteSignature(blob, TimeSpan.FromMinutes(30));
+                        response.BlobAddress = blob.GenerateWriteSignature(TimeSpan.FromMinutes(30));
 
                         _pendingUploads.Add(new MachineStudioPendingUpload()
                         {
@@ -237,8 +239,8 @@ namespace Tango.MachineService.Controllers
             {
                 DataSource = new Core.DataSource()
                 {
-                    Address = Config.DB_ADDRESS,
-                    Catalog = Config.DB_CATALOG,
+                    Address = MachineServiceConfig.DB_ADDRESS,
+                    Catalog = MachineServiceConfig.DB_CATALOG,
                     Type = Core.DataSourceType.Azure,
                     IntegratedSecurity = false,
                     UserName = request.Email,