Moved all common web components to Tango.Web

Changed app keys names.
Fixed issue with machine studio and the initialization of observables static collections.

2 files changed, 36 insertions, 32 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,
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 68f597fcc..6b4190313 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -23,9 +23,7 @@ using Tango.Core.DB;
 using Tango.Core.Helpers;
 using Tango.Core.IO;
 using Tango.Logging;
-using Tango.MachineService.Helpers;
 using Tango.MachineService.Models;
-using Tango.MachineService.SMO;
 using Tango.PMR.Stubs;
 using Tango.PMR.Synchronization;
 using Tango.PPC.Common.MachineSetup;
@@ -33,6 +31,10 @@ using Tango.PPC.Common.MachineUpdate;
 using Tango.PPC.Common.Update;
 using Tango.Synchronization.Local;
 using Tango.Synchronization.Remote;
+using Tango.Web.Controllers;
+using Tango.Web.Helpers;
+using Tango.Web.SMO;
+using Tango.Web.Storage;
 
 namespace Tango.MachineService.Controllers
 {
@@ -81,17 +83,17 @@ namespace Tango.MachineService.Controllers
 
                 response.Version = latest_machine_version.Version;
 
-                var client = StorageHelper.GetStorageBlobClient();
-                var container = StorageHelper.GetTangoVersionsContainer(client);
+                var manager = new StorageManager();
+                var container = manager.GetContainer(MachineServiceConfig.TANGO_VERSIONS_CONTAINER);
                 var blob = container.GetBlockBlobReference(latest_machine_version.BlobName);
 
-                response.BlobAddress = StorageHelper.GenerateBlobReadSignature(blob, TimeSpan.FromMinutes(60));
+                response.BlobAddress = blob.GenerateReadSignature(TimeSpan.FromMinutes(60));
 
                 DbCredentials credentials = new DbCredentials();
 
-                using (SmoManager manager = new SmoManager())
+                using (SmoManager smo = new SmoManager())
                 {
-                    credentials = manager.CreateRandomLoginAndUser();
+                    credentials = smo.CreateRandomLoginAndUser();
 
                     Task.Delay(TimeSpan.FromMinutes(10)).ContinueWith((x) =>
                     {
@@ -104,8 +106,8 @@ namespace Tango.MachineService.Controllers
 
                 response.DataSource = new DataSource()
                 {
-                    Address = Config.DB_ADDRESS,
-                    Catalog = Config.DB_CATALOG,
+                    Address = MachineServiceConfig.DB_ADDRESS,
+                    Catalog = MachineServiceConfig.DB_CATALOG,
                     UserName = credentials.UserName,
                     Password = credentials.Password,
                     IntegratedSecurity = false,
@@ -147,17 +149,17 @@ namespace Tango.MachineService.Controllers
 
                 response.Version = latest_machine_version.Version;
 
-                var client = StorageHelper.GetStorageBlobClient();
-                var container = StorageHelper.GetTangoVersionsContainer(client);
+                var manager = new StorageManager();
+                var container = manager.GetContainer(MachineServiceConfig.TANGO_VERSIONS_CONTAINER);
                 var blob = container.GetBlockBlobReference(latest_machine_version.BlobName);
 
-                response.BlobAddress = StorageHelper.GenerateBlobReadSignature(blob, TimeSpan.FromMinutes(60));
+                response.BlobAddress = blob.GenerateReadSignature(TimeSpan.FromMinutes(60));
 
                 DbCredentials credentials = new DbCredentials();
 
-                using (SmoManager manager = new SmoManager())
+                using (SmoManager smo = new SmoManager())
                 {
-                    credentials = manager.CreateRandomLoginAndUser();
+                    credentials = smo.CreateRandomLoginAndUser();
 
                     Task.Delay(TimeSpan.FromMinutes(10)).ContinueWith((x) =>
                     {
@@ -170,8 +172,8 @@ namespace Tango.MachineService.Controllers
 
                 response.DataSource = new DataSource()
                 {
-                    Address = Config.DB_ADDRESS,
-                    Catalog = Config.DB_CATALOG,
+                    Address = MachineServiceConfig.DB_ADDRESS,
+                    Catalog = MachineServiceConfig.DB_CATALOG,
                     UserName = credentials.UserName,
                     Password = credentials.Password,
                     IntegratedSecurity = false,
@@ -247,8 +249,8 @@ namespace Tango.MachineService.Controllers
 
                 response.DataSource = new DataSource()
                 {
-                    Address = Config.DB_ADDRESS,
-                    Catalog = Config.DB_CATALOG,
+                    Address = MachineServiceConfig.DB_ADDRESS,
+                    Catalog = MachineServiceConfig.DB_CATALOG,
                     UserName = credentials.UserName,
                     Password = credentials.Password,
                     IntegratedSecurity = false,
@@ -328,12 +330,12 @@ namespace Tango.MachineService.Controllers
                     {
                         String newVersionFileName = "Tango Version" + " " + currentVersion.ToString() + ".zip";
 
-                        var client = StorageHelper.GetStorageBlobClient();
-                        var container = StorageHelper.GetTangoVersionsContainer(client);
-                        var blob = StorageHelper.CreateEmptyBlob(container, newVersionFileName);
+                        var manager = new StorageManager();
+                        var container = manager.GetContainer(MachineServiceConfig.TANGO_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 PPCPendingUpload()
                         {