merge conflicts

1 files changed, 85 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
index dd8401570..da5ce16f7 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
@@ -23,6 +23,10 @@ using Tango.Web.ActiveDirectory;
 using Tango.MachineService.Filters;
 using Tango.MachineService.Security;
 using Tango.Web.SQLServer;
+using Tango.Core;
+using Tango.Web.SMO;
+using Tango.Core.DB;
+using System.Threading.Tasks;
 
 namespace Tango.MachineService.Controllers
 {
@@ -99,6 +103,11 @@ namespace Tango.MachineService.Controllers
 
                     response.BlobAddress = blob.GenerateReadSignature(TimeSpan.FromMinutes(60));
 
+                    if (!String.IsNullOrWhiteSpace(MachineServiceConfig.CDN_ENDPOINT))
+                    {
+                        response.CdnAddress = MachineServiceConfig.CDN_ENDPOINT + blob.Uri.AbsolutePath;
+                    }
+
                     response.IsUpdateAvailable = true;
                     response.Version = latestVersion.Version;
                     response.Comments = latestVersion.Comments;
@@ -133,6 +142,11 @@ namespace Tango.MachineService.Controllers
                     var container = manager.GetContainer(MachineServiceConfig.MACHINE_STUDIO_VERSIONS_CONTAINER);
                     var blob = container.GetBlockBlobReference(latestVersion.BlobName);
 
+                    if (!String.IsNullOrWhiteSpace(MachineServiceConfig.CDN_ENDPOINT))
+                    {
+                        response.CdnAddress = MachineServiceConfig.CDN_ENDPOINT + blob.Uri.AbsolutePath;
+                    }
+
                     response.BlobAddress = blob.GenerateReadSignature(TimeSpan.FromMinutes(60));
                     response.Version = latestVersion.Version;
                 }
@@ -271,7 +285,16 @@ namespace Tango.MachineService.Controllers
         [HttpPost]
         public LoginResponse Login(LoginRequest request)
         {
-            var authResult = _ad_manager.ValidateUserCredentials(request.Email, request.Password);
+            AuthenticationResult authResult = null;
+
+            try
+            {
+                authResult = _ad_manager.ValidateUserCredentials(request.Email, request.Password);
+            }
+            catch (Exception ex)
+            {
+                throw new AuthenticationException(ex.FlattenMessage());
+            }
 
             if (!_ad_manager.CanUserAccessCurrentEnvironment(request.Email))
             {
@@ -415,6 +438,67 @@ namespace Tango.MachineService.Controllers
             };
         }
 
+        [HttpPost]
+        [JwtTokenFilter]
+        public DownloadLatestPPCVersionResponse DownloadLatestPPCVersion(DownloadLatestPPCVersionRequest request)
+        {
+            DownloadLatestPPCVersionResponse response = new DownloadLatestPPCVersionResponse();
+
+            using (ObservablesContext db = ObservablesContextHelper.CreateContext())
+            {
+                var machine = db.Machines.SingleOrDefault(x => x.SerialNumber == request.SerialNumber);
+
+                if (machine == null)
+                {
+                    throw new AuthenticationException("The specified serial number could not be found.");
+                }
+
+                var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
+
+                var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
+
+                response.Version = latest_machine_version.Version;
+
+                var manager = new BlobStorageManager();
+                var container = manager.GetContainer(MachineServiceConfig.TANGO_VERSIONS_CONTAINER);
+                var blob = container.GetBlockBlobReference(latest_machine_version.BlobName);
+
+                response.BlobAddress = blob.GenerateReadSignature(TimeSpan.FromMinutes(60));
+
+                if (!String.IsNullOrWhiteSpace(MachineServiceConfig.CDN_ENDPOINT))
+                {
+                    response.CdnAddress = MachineServiceConfig.CDN_ENDPOINT + blob.Uri.AbsolutePath;
+                }
+
+                DbCredentials credentials = new DbCredentials();
+
+                using (SmoManager smo = new SmoManager())
+                {
+                    credentials = smo.CreateRandomLoginAndUser();
+
+                    Task.Delay(TimeSpan.FromMinutes(PPCController.SQL_TEMP_CREDENTIALS_EXP_MINUTS)).ContinueWith((x) =>
+                    {
+                        using (SmoManager m = new SmoManager())
+                        {
+                            m.DeleteLoginAndUser(credentials.UserName);
+                        }
+                    });
+                }
+
+                response.DataSource = new DataSource()
+                {
+                    Address = MachineServiceConfig.DB_ADDRESS,
+                    Catalog = MachineServiceConfig.DB_CATALOG,
+                    UserName = credentials.UserName,
+                    Password = credentials.Password,
+                    IntegratedSecurity = false,
+                    Type = DataSourceType.SQLServer,
+                };
+            }
+
+            return response;
+        }
+
         #endregion
     }
 }