loading works again

EnvelopeGenerator.Web/Handler/FileHandler.cs

@@ -10,7 +10,44 @@ namespace EnvelopeGenerator.Web.Handler
 {
     public class FileHandler
     {
-        public async static Task<IResult> HandleFileDownload(HttpContext ctx, DatabaseService database, LoggingService logging)
+        /// <summary>
+        /// URL: GET /api/envelope/{envelopeKey}
+        /// 
+        /// Returns a
+        /// </summary>
+        /// <returns></returns>
+        public static IResult HandleGetEnvelope(HttpContext ctx, DatabaseService database, LoggingService logging)
+        {
+            var logger = logging.LogConfig.GetLogger("FileHandler");
+
+            try
+            {
+                logger.Info("Handling envelope loading.");
+
+                // Load Envelope from EnvelopeKey
+                string envelopeKey = EnsureValidEnvelopeKey(logger, ctx.Request);
+                EnvelopeResponse r = database.LoadEnvelope(envelopeKey);
+
+                // Return the envelope and additional data as json
+                return Results.Json(r);
+
+            }
+            catch (Exception e)
+            {
+                // Better error handling & reporting
+                logger.Error(e);
+                return Results.Problem(e.Message);
+
+            }
+        }
+
+        /// <summary>
+        /// URL: GET /api/document/{envelopeKey}?index={documentIndex}
+        /// 
+        /// Returns a document for the supplied EnvelopeKey and Document Id / Index
+        /// </summary>
+        /// <returns>file buffer of the requested document</returns>
+        public async static Task<IResult> HandleGetDocument(HttpContext ctx, DatabaseService database, LoggingService logging)
         {
             var logger = logging.LogConfig.GetLogger("FileHandler");
 
@@ -42,7 +79,7 @@ namespace EnvelopeGenerator.Web.Handler
             }
         }
 
-        public async static Task<IResult> HandleFileUpload(HttpContext ctx, DatabaseService database, LoggingService logging)
+        public async static Task<IResult> HandlePostDocument(HttpContext ctx, DatabaseService database, LoggingService logging)
         {
             var logger = logging.LogConfig.GetLogger("FileHandler");
 
@@ -72,13 +109,16 @@ namespace EnvelopeGenerator.Web.Handler
             }
         }
 
-        public async static Task<IResult> HandleGetData(HttpContext ctx, DatabaseService database, LoggingService logging)
+
+
+
+        public async static Task<IResult> HandlePostEnvelope(HttpContext ctx, DatabaseService database, LoggingService logging)
         {
             var logger = logging.LogConfig.GetLogger("FileHandler");
 
             try
             {
-                logger.Info("Handling file download.");
+                logger.Info("Handling envelope saving.");
 
                 // Load Envelope from EnvelopeKey
                 string envelopeKey = EnsureValidEnvelopeKey(logger, ctx.Request);
@@ -88,38 +128,9 @@ namespace EnvelopeGenerator.Web.Handler
                 int documentId = EnsureValidDocumentIndex(logger, ctx.Request);
                 var document = GetDocument(r.Envelope, documentId);
 
-                // Load the document from disk
+                // TODO: Save annotations to database
-                var bytes = await File.ReadAllBytesAsync(document.Filepath);
-                logger.Info("Serving file, size: [{0}]", bytes.Length);
 
-                // Return the envelope and additional data as json
+                return Results.Ok();
-                return Results.Json(r);
-
-            }
-            catch (Exception e)
-            {
-                // Better error handling & reporting
-                logger.Error(e);
-                return Results.Problem();
-
-            }
-        }
-
-        public async static Task<IResult> HandlePostData(HttpContext ctx, DatabaseService database, LoggingService logging)
-        {
-            var logger = logging.LogConfig.GetLogger("FileHandler");
-
-            try
-            {
-                logger.Info("Handling file download.");
-
-                // Load Envelope from EnvelopeKey
-                string envelopeKey = EnsureValidEnvelopeKey(logger, ctx.Request);
-                EnvelopeResponse r = database.LoadEnvelope(envelopeKey);
-
-                // Get the document Index
-                int documentId = EnsureValidDocumentIndex(logger, ctx.Request);
-                var document = GetDocument(r.Envelope, documentId);
             }
             catch (Exception e)
             {
@@ -128,17 +139,7 @@ namespace EnvelopeGenerator.Web.Handler
                 return Results.Problem();
             }      
 
-            var envelopeKey = ctx.Request.RouteValues["envelopeKey"] as string;
-            var documentIdString = ctx.Request.RouteValues["documentId"] as string;
            
-            if (int.TryParse(documentIdString, out int documentId) == false)
-            {
-                return Results.Problem();
-            }
-
-            database.LoadDocument(documentId);
-
-            return Results.Ok();
         }
 
         private static int EnsureValidDocumentIndex(Logger logger, HttpRequest request)
@@ -192,8 +193,5 @@ namespace EnvelopeGenerator.Web.Handler
 
             return document;
         }
-
-     
-
     }
 }

EnvelopeGenerator.Web/Pages/ShowEnvelope.razor

@@ -15,7 +15,7 @@
         if (firstRender)
         {
             var module = await JS.InvokeAsync<IJSObjectReference>("import", "./js/app.js");
-            await module.InvokeVoidAsync("App.loadPDFFromUrl", "#container", EnvelopeReceiverId);
+            await module.InvokeVoidAsync("App.init", "#container", EnvelopeReceiverId);
         }
     }
 }

EnvelopeGenerator.Web/Program.cs

@@ -35,10 +35,10 @@ app.UseStaticFiles();
 app.UseRouting();
 
 // Add file download endpoint
-app.MapGet("/api/document/{envelopeKey}", FileHandler.HandleFileDownload);
+app.MapGet("/api/document/{envelopeKey}", FileHandler.HandleGetDocument);
-app.MapPost("/api/document/{envelopeKey}/{documentId}", FileHandler.HandleFileUpload);
+app.MapPost("/api/document/{envelopeKey}/{documentId}", FileHandler.HandlePostDocument);
-app.MapGet("/api/envelope/{envelopeKey}", FileHandler.HandleGetData);
+app.MapGet("/api/envelope/{envelopeKey}", FileHandler.HandleGetEnvelope);
-app.MapPost("/api/envelope/{envelopeKey}/{documentId}", FileHandler.HandlePostData);
+app.MapPost("/api/envelope/{envelopeKey}/{documentId}", FileHandler.HandlePostEnvelope);
 
 // Blazor plumbing
 app.MapBlazorHub();

EnvelopeGenerator.Web/Scripts/app.ts

@@ -21,43 +21,41 @@ export class App {
 
     // This function will be called in the ShowEnvelope.razor page
     // and will trigger loading of the Editor Interface
-    public static async loadPDFFromUrl(container: string, envelopeKey: string) {
+    public static async init(container: string, envelopeKey: string) {
+
+        // Initialize classes
+        console.debug("Initializing classes..")
         App.UI = new UI();
         App.Network = new Network();
         App.Annotation = new Annotation();
 
-        console.debug("Loading PSPDFKit..");
+        // Load the envelope from the database
+        console.debug("Loading envelope from database..")
+        const envelopeObject: EnvelopeResponse = await App.Network.getEnvelope(envelopeKey);
+
+        console.debug(envelopeObject)
 
-        const envelopeObject: EnvelopeResponse = await App.Network.loadData(envelopeKey);
         App.envelopeKey = envelopeKey;
         App.currentDocument = envelopeObject.envelope.documents[0];
 
+        // Load the document from the filestore
+        console.debug("Loading document from filestore")
         let arrayBuffer
         try {
-            arrayBuffer = await App.Network.loadDocument(envelopeKey, App.currentDocument.id);
+            arrayBuffer = await App.Network.getDocument(envelopeKey, App.currentDocument.id);
         } catch (e) {
             console.error(e)
         }
 
+        // Load PSPDFKit
+        console.debug("Loading PSPDFKit..")
         App.Instance = await App.UI.loadPSPDFKit(arrayBuffer, container)
         App.UI.configurePSPDFKit(this.Instance, App.handleClick) 
 
-        console.debug(envelopeObject.envelope);
+        // Load annotations into PSPDFKit
-        console.debug("PSPDFKit configured!");
+        console.debug("Loading annotations..")
-
+        const annotations = App.Annotation.createAnnotations(App.currentDocument)
-        const annotations: any[] = [];
-
-        App.currentDocument.elements.forEach(function (element: Element) {
-            console.log("Creating annotation for element", element.id)
-
-            const [annotation, formField] = App.Annotation.createAnnotationFromElement(element)
-            annotations.push(annotation);
-            annotations.push(formField);
-        })
-
         const createdAnnotations = await App.Instance.create(annotations)
-
-        console.debug(createdAnnotations)
     }
 
     public static async handleClick(eventType: string) {
@@ -121,7 +119,33 @@ export class App {
 }
 
 class Annotation {
-    public createAnnotationFromElement(element: Element): [annotation: WidgetAnnotation, formField: SignatureFormFieldType] {
+    public createAnnotations(document: Document): AnnotationsUnion[] {
+        const annotations: any[] = [];
+
+        document.elements.forEach((element: Element) => {
+            console.log("Creating annotation for element", element.id)
+
+            const [annotation, formField] = this.createAnnotationFromElement(element)
+            annotations.push(annotation);
+            annotations.push(formField);
+        })
+
+        return annotations;
+    }
+
+    public async deleteAnnotations(instance: Instance): Promise<any> {
+        let pageAnnotations = (
+            await Promise.all(Array.from({ length: instance.totalPageCount }).map((_, pageIndex) =>
+                instance.getAnnotations(pageIndex)
+            ))
+        ).flatMap((annotations) =>
+            annotations.reduce((acc, annotation) => acc.concat(annotation), [])
+        ).filter((annotation) => !!annotation.isSignature);
+        //deleting all Annotations
+        return await instance.delete(pageAnnotations);
+    }
+
+    private createAnnotationFromElement(element: Element): [annotation: WidgetAnnotation, formField: SignatureFormFieldType] {
         const id = PSPDFKit.generateInstantId()
         const width = this.inchToPoint(element.width)
         const height = this.inchToPoint(element.height)
@@ -140,18 +164,6 @@ class Annotation {
         return [annotation, formField]
     }
 
-    public async deleteAnnotations(instance: Instance): Promise<any> {
-        let pageAnnotations = (
-            await Promise.all(Array.from({ length: instance.totalPageCount }).map((_, pageIndex) =>
-                instance.getAnnotations(pageIndex)
-            ))
-        ).flatMap((annotations) =>
-            annotations.reduce((acc, annotation) => acc.concat(annotation), [])
-        ).filter((annotation) => !!annotation.isSignature);
-        //deleting all Annotations
-        return await instance.delete(pageAnnotations);
-    }
-
     private createSignatureAnnotation(id: string, width: number, height: number, top: number, left: number, pageIndex: number): WidgetAnnotation {
         const annotation = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id,
@@ -169,20 +181,25 @@ class Annotation {
 }
 
 class Network {
-    // Makes a call to the supplied url and fetches the binary response as an array buffer
+    public getEnvelope(envelopeKey: string): Promise<any> {
-    public loadDocument(envelopeKey: string, documentId: number): Promise<ArrayBuffer> {
-        return fetch(`/api/file/${envelopeKey}?id=${documentId}`, { credentials: "include" })
-            .then(res => res.arrayBuffer());
-    }
-
-    // Makes a call to the supplied url and fetches the json response as an object
-    public loadData(envelopeKey): Promise<any> {
         return fetch(`/api/envelope/${envelopeKey}`, { credentials: "include" })
             .then(res => res.json());
     }
 
+    public getDocument(envelopeKey: string, documentId: number): Promise<ArrayBuffer> {
+        return fetch(`/api/document/${envelopeKey}?index=${documentId}`, { credentials: "include" })
+            .then(res => res.arrayBuffer());
+    }
+
     public postDocument(envelopeKey: string, documentId: number, buffer: ArrayBuffer): Promise<any> {
-        return fetch(`/api/upload/${envelopeKey}/${documentId}`, { credentials: "include", method: "POST", body: buffer })
+        return fetch(`/api/document/${envelopeKey}/${documentId}`, { credentials: "include", method: "POST", body: buffer })
+            .then(res => res.json());
+    }
+
+
+
+    public postEnvelope(envelopeKey: string, documentId: number, buffer: ArrayBuffer): Promise<any> {
+        return fetch(`/api/envelope/${envelopeKey}/${documentId}`, { credentials: "include", method: "POST", body: buffer })
             .then(res => res.json());
     }
 }
@@ -236,6 +253,8 @@ class UI {
 
         const toolbarItems = this.getToolbarItems(instance, handler)
         instance.setToolbarItems(toolbarItems)
+
+        console.debug("PSPDFKit configured!");
     }
 
     public getToolbarItems(instance: Instance, handler: any): ToolbarItem[] {

EnvelopeGenerator.Web/wwwroot/js/app.js

@@ -44,25 +44,31 @@ var App = /** @class */ (function () {
     }
     // This function will be called in the ShowEnvelope.razor page
     // and will trigger loading of the Editor Interface
-    App.loadPDFFromUrl = function (container, envelopeKey) {
+    App.init = function (container, envelopeKey) {
         return __awaiter(this, void 0, void 0, function () {
             var envelopeObject, arrayBuffer, e_1, _a, annotations, createdAnnotations;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        // Initialize classes
+                        console.debug("Initializing classes..");
                         App.UI = new UI();
                         App.Network = new Network();
                         App.Annotation = new Annotation();
-                        console.debug("Loading PSPDFKit..");
+                        // Load the envelope from the database
-                        return [4 /*yield*/, App.Network.loadData(envelopeKey)];
+                        console.debug("Loading envelope from database..");
+                        return [4 /*yield*/, App.Network.getEnvelope(envelopeKey)];
                     case 1:
                         envelopeObject = _b.sent();
+                        console.debug(envelopeObject);
                         App.envelopeKey = envelopeKey;
                         App.currentDocument = envelopeObject.envelope.documents[0];
+                        // Load the document from the filestore
+                        console.debug("Loading document from filestore");
                         _b.label = 2;
                     case 2:
                         _b.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, App.Network.loadDocument(envelopeKey, App.currentDocument.id)];
+                        return [4 /*yield*/, App.Network.getDocument(envelopeKey, App.currentDocument.id)];
                     case 3:
                         arrayBuffer = _b.sent();
                         return [3 /*break*/, 5];
@@ -71,24 +77,19 @@ var App = /** @class */ (function () {
                         console.error(e_1);
                         return [3 /*break*/, 5];
                     case 5:
+                        // Load PSPDFKit
+                        console.debug("Loading PSPDFKit..");
                         _a = App;
                         return [4 /*yield*/, App.UI.loadPSPDFKit(arrayBuffer, container)];
                     case 6:
                         _a.Instance = _b.sent();
                         App.UI.configurePSPDFKit(this.Instance, App.handleClick);
-                        console.debug(envelopeObject.envelope);
+                        // Load annotations into PSPDFKit
-                        console.debug("PSPDFKit configured!");
+                        console.debug("Loading annotations..");
-                        annotations = [];
+                        annotations = App.Annotation.createAnnotations(App.currentDocument);
-                        App.currentDocument.elements.forEach(function (element) {
-                            console.log("Creating annotation for element", element.id);
-                            var _a = App.Annotation.createAnnotationFromElement(element), annotation = _a[0], formField = _a[1];
-                            annotations.push(annotation);
-                            annotations.push(formField);
-                        });
                         return [4 /*yield*/, App.Instance.create(annotations)];
                     case 7:
                         createdAnnotations = _b.sent();
-                        console.debug(createdAnnotations);
                         return [2 /*return*/];
                 }
             });
@@ -198,21 +199,16 @@ export { App };
 var Annotation = /** @class */ (function () {
     function Annotation() {
     }
-    Annotation.prototype.createAnnotationFromElement = function (element) {
+    Annotation.prototype.createAnnotations = function (document) {
-        var id = PSPDFKit.generateInstantId();
+        var _this = this;
-        var width = this.inchToPoint(element.width);
+        var annotations = [];
-        var height = this.inchToPoint(element.height);
+        document.elements.forEach(function (element) {
-        var top = this.inchToPoint(element.top) - (height / 2);
+            console.log("Creating annotation for element", element.id);
-        var left = this.inchToPoint(element.left) - (width / 2);
+            var _a = _this.createAnnotationFromElement(element), annotation = _a[0], formField = _a[1];
-        var page = element.page - 1;
+            annotations.push(annotation);
-        var annotation = this.createSignatureAnnotation(id, width, height, top, left, page);
+            annotations.push(formField);
-        console.log(annotation);
-        var formField = new SignatureFormField({
-            name: id,
-            annotationIds: List([annotation.id])
         });
-        console.log(formField);
+        return annotations;
-        return [annotation, formField];
     };
     Annotation.prototype.deleteAnnotations = function (instance) {
         return __awaiter(this, void 0, void 0, function () {
@@ -234,6 +230,22 @@ var Annotation = /** @class */ (function () {
             });
         });
     };
+    Annotation.prototype.createAnnotationFromElement = function (element) {
+        var id = PSPDFKit.generateInstantId();
+        var width = this.inchToPoint(element.width);
+        var height = this.inchToPoint(element.height);
+        var top = this.inchToPoint(element.top) - (height / 2);
+        var left = this.inchToPoint(element.left) - (width / 2);
+        var page = element.page - 1;
+        var annotation = this.createSignatureAnnotation(id, width, height, top, left, page);
+        console.log(annotation);
+        var formField = new SignatureFormField({
+            name: id,
+            annotationIds: List([annotation.id])
+        });
+        console.log(formField);
+        return [annotation, formField];
+    };
     Annotation.prototype.createSignatureAnnotation = function (id, width, height, top, left, pageIndex) {
         var annotation = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id,
@@ -251,18 +263,20 @@ var Annotation = /** @class */ (function () {
 var Network = /** @class */ (function () {
     function Network() {
     }
-    // Makes a call to the supplied url and fetches the binary response as an array buffer
+    Network.prototype.getEnvelope = function (envelopeKey) {
-    Network.prototype.loadDocument = function (envelopeKey, documentId) {
-        return fetch("/api/file/".concat(envelopeKey, "?id=").concat(documentId), { credentials: "include" })
-            .then(function (res) { return res.arrayBuffer(); });
-    };
-    // Makes a call to the supplied url and fetches the json response as an object
-    Network.prototype.loadData = function (envelopeKey) {
         return fetch("/api/envelope/".concat(envelopeKey), { credentials: "include" })
             .then(function (res) { return res.json(); });
     };
+    Network.prototype.getDocument = function (envelopeKey, documentId) {
+        return fetch("/api/document/".concat(envelopeKey, "?index=").concat(documentId), { credentials: "include" })
+            .then(function (res) { return res.arrayBuffer(); });
+    };
     Network.prototype.postDocument = function (envelopeKey, documentId, buffer) {
-        return fetch("/api/upload/".concat(envelopeKey, "/").concat(documentId), { credentials: "include", method: "POST", body: buffer })
+        return fetch("/api/document/".concat(envelopeKey, "/").concat(documentId), { credentials: "include", method: "POST", body: buffer })
+            .then(function (res) { return res.json(); });
+    };
+    Network.prototype.postEnvelope = function (envelopeKey, documentId, buffer) {
+        return fetch("/api/envelope/".concat(envelopeKey, "/").concat(documentId), { credentials: "include", method: "POST", body: buffer })
             .then(function (res) { return res.json(); });
     };
     return Network;
@@ -339,6 +353,7 @@ var UI = /** @class */ (function () {
         }); });
         var toolbarItems = this.getToolbarItems(instance, handler);
         instance.setToolbarItems(toolbarItems);
+        console.debug("PSPDFKit configured!");
     };
     UI.prototype.getToolbarItems = function (instance, handler) {
         var customItems = this.getCustomItems(handler);