Merge pull request #311 from Developer-Autodesk/er/INVGEN-45169-pdf-for-authd-user

INVGEN-45169: for download of Drawing Pdf for authorized user

Author: erymski

WebApplication/Controllers/DownloadController.cs

@@ -29,6 +29,11 @@
 
 namespace WebApplication.Controllers
 {
+    // The app is not keeping user session, so it's necessary to pass auth token
+    // for authenticated users to resolve the downloaded item correctly.
+    // By implementation the token will be appended by client-side to the end of download URL, so
+    // the download route should contain optional `token` argument, which will be extracted
+    // and applied to the execution context by `RouteTokenPipeline` middleware.
     [ApiController]
     [Route("download")]
     [MiddlewareFilter(typeof(RouteTokenPipeline))]
@@ -67,11 +72,12 @@ public async Task<ActionResult> BOM(string projectName, string hash, string toke
             return File(stream, "text/csv", "bom.csv");
         }
 
-        [HttpGet("{projectName}/{hash}/{fileName}")]
-        public async Task<ActionResult> DrawingViewables(string projectName, string hash, string fileName)
+        // viewer expects PDF extension, so `drawing.pdf` is a piece of the route
+        [HttpGet("{projectName}/{hash}/drawing.pdf/{token?}")]
+        public async Task<ActionResult> DrawingPdf(string projectName, string hash, string token = null)
         {
-            string localFileName = await _userResolver.EnsureLocalFile(projectName, fileName, hash);
-            return new PhysicalFileResult(localFileName, "application/pdf");
+            string localFileName = await _userResolver.EnsureLocalFile(projectName, LocalName.DrawingPdf, hash);
+            return new PhysicalFileResult(localFileName, "application/pdf") { FileDownloadName = LocalName.DrawingPdf };
         }
 
         [HttpGet("{projectName}/{hash}/drawing/{token?}")]

WebApplication/Controllers/ProjectsController.cs

@@ -93,7 +93,11 @@ public async Task<ActionResult<ProjectDTO>> CreateProject([FromForm]NewProjectMo
             // Check if project already exists
             foreach (var existingProjectName in await GetProjectNamesAsync(bucket))
             {
-                if (projectName == existingProjectName) return Conflict();
+                if (projectName == existingProjectName)
+                {
+                    _logger.LogError($"Found existing '{projectName}' project");
+                    return Conflict();
+                }
             }
 
             var projectInfo = new ProjectInfo

WebApplication/Job/ExportDrawingPdfJobItem.cs

@@ -52,11 +52,14 @@ public override async Task ProcessJobAsync(IResultSender resultSender)
             if (stats != null)
             {
                 url = _linkGenerator.GetPathByAction(controller: "Download",
-                                                                action: "DrawingViewables",
-                                                                values: new { projectName = ProjectId, fileName = "drawing.pdf", hash = _hash });
+                                                                action: "DrawingPdf",
+                                                                values: new { projectName = ProjectId, hash = _hash });
 
                 // when local url starts with slash, it does not work, because it is doubled in url
-                url = url.IndexOf("/") == 0 ? url.Substring(1) : url;
+                if (url.StartsWith('/'))
+                {
+                    url = url.Substring(1);
+                }
             }
 
             await resultSender.SendSuccessAsync(url, stats);

WebApplication/Middleware/RouteTokenHandler.cs

@@ -22,7 +22,6 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;
 using WebApplication.Services;
-using WebApplication.State;
 
 namespace WebApplication.Middleware
 {