make sure shaca is loaded before any request

zadam · May 1, 2022 · b3763ee · b3763ee
1 parent f9c0185
commit b3763ee
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/share/routes.js b/src/share/routes.js
@@ -62,16 +62,18 @@ function register(router) {
     });
 
     router.get('/share/:shareId', (req, res, next) => {
-        const {shareId} = req.params;
-
         shacaLoader.ensureLoad();
 
+        const {shareId} = req.params;
+
         const note = shaca.aliasToNote[shareId] || shaca.notes[shareId];
 
         renderNote(note, res);
     });
 
     router.get('/share/api/notes/:noteId', (req, res, next) => {
+        shacaLoader.ensureLoad();
+
         const {noteId} = req.params;
         const note = shaca.getNote(noteId);
 
@@ -85,6 +87,8 @@ function register(router) {
     });
 
     router.get('/share/api/notes/:noteId/download', (req, res, next) => {
+        shacaLoader.ensureLoad();
+
         const {noteId} = req.params;
         const note = shaca.getNote(noteId);
 
@@ -107,6 +111,8 @@ function register(router) {
     });
 
     router.get('/share/api/images/:noteId/:filename', (req, res, next) => {
+        shacaLoader.ensureLoad();
+
         const image = shaca.getNote(req.params.noteId);
 
         if (!image) {
@@ -118,13 +124,15 @@ function register(router) {
 
         addNoIndexHeader(image, res);
 
-        res.set('Content-Type', image.mime);
+        res.setHeader('Content-Type', image.mime);
 
         res.send(image.getContent());
     });
 
     // used for PDF viewing
     router.get('/share/api/notes/:noteId/view', (req, res, next) => {
+        shacaLoader.ensureLoad();
+
         const {noteId} = req.params;
         const note = shaca.getNote(noteId);