merge

1 files changed, 17 insertions, 27 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
index 324878f25..b718887af 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
@@ -162,11 +162,11 @@ namespace Tango.MachineService.Controllers
                 if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersions))
                 {
                     var latestVersion = db.MachineStudioVersions.ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
-                    Version currentVersion = Version.Parse(request.Version);
+                    Version local_version = Version.Parse(request.Version);
 
-                    if (latestVersion == null || currentVersion > Version.Parse(latestVersion.Version))
+                    if (latestVersion == null || local_version > Version.Parse(latestVersion.Version))
                     {
-                        String newVersionFileName = "Machine Studio Version" + " " + currentVersion.ToString() + ".zip";
+                        String newVersionFileName = "Machine Studio v" + local_version.ToString() + ".zip";
 
                         var manager = new BlobStorageManager();
                         var container = manager.GetContainer(MachineServiceConfig.MACHINE_STUDIO_VERSIONS_CONTAINER);
@@ -175,14 +175,24 @@ namespace Tango.MachineService.Controllers
                         response.Token = Guid.NewGuid().ToString();
                         response.BlobAddress = blob.GenerateWriteSignature(TimeSpan.FromMinutes(30));
 
-                        _pendingUploads.Add(new MachineStudioPendingUpload()
+                        MachineStudioPendingUpload pending_upload = new MachineStudioPendingUpload()
                         {
                             UserGuid = user.Guid,
                             Comments = request.Comments,
                             Token = response.Token,
                             Version = request.Version,
                             BlobName = blob.Name,
-                        });
+                        };
+
+                        if (request.WithInstaller)
+                        {
+                            String installerVersionFileName = "Machine Studio v" + local_version.ToString() + ".exe";
+                            var installerBlob = container.CreateEmptyBlob(installerVersionFileName);
+                            response.InstallerBlobAddress = installerBlob.GenerateWriteSignature(TimeSpan.FromMinutes(30));
+                            pending_upload.InstallerBlobName = installerBlob.Name;
+                        }
+
+                        _pendingUploads.Add(pending_upload);
                     }
                     else
                     {
@@ -206,7 +216,7 @@ namespace Tango.MachineService.Controllers
         /// <exception cref="System.ArgumentException">Invalid Token.</exception>
         [HttpPost]
         [JwtTokenFilter]
-        public UploadCompletedResponse NotifyUploadCompleted(UploadCompletedRequest request)
+        public UploadCompletedResponse NotifyVersionUploadCompleted(UploadCompletedRequest request)
         {
             MachineStudioPendingUpload upload = _pendingUploads.FirstOrDefault(x => x.Token == request.Token);
 
@@ -220,6 +230,7 @@ namespace Tango.MachineService.Controllers
                     {
                         Comments = upload.Comments,
                         BlobName = upload.BlobName,
+                        InstallerBlobName = upload.InstallerBlobName,
                         UserGuid = upload.UserGuid,
                         Version = upload.Version,
                     });
@@ -366,27 +377,6 @@ namespace Tango.MachineService.Controllers
             };
         }
 
-        [HttpPost]
-        [JwtTokenFilter(allowExpired: true)]
-        public RenewTokenResponse Renew(RenewTokenRequest request)
-        {
-            RefreshTokensManager manager = new RefreshTokensManager();
-            var entity = manager.GetToken(request.RefreshToken);
-
-            if (entity.AccessToken != RequestToken.AccessToken)
-            {
-                throw new AuthenticationException("Invalid access token and refresh token combination.");
-            }
-
-            var newToken = RequestToken.Renew(MachineServiceConfig.JWT_TOKEN_SECRET, entity.AccessToken);
-
-            return new RenewTokenResponse()
-            {
-                AccessToken = entity.AccessToken,
-                RefreshToken = entity.RefreshToken,
-            };
-        }
-
         #endregion
     }
 }