Merge pull request #1896 from processing/bug/embed-sketches-slug

[#1893] Enable slug urls for embed sketches

Author: catarak

server/controllers/embed.controller.js

@@ -9,36 +9,41 @@ import {
 import { get404Sketch } from '../views/404Page';
 
 export function serveProject(req, res) {
-  Project.findById(req.params.project_id).exec((err, project) => {
-    if (err || !project) {
-      get404Sketch((html) => res.send(html));
-      return;
-    }
-    // TODO this does not parse html
-    const { files } = project;
-    const htmlFile = files.find((file) => file.name.match(/\.html$/i)).content;
-    const filesToInject = files.filter((file) =>
-      file.name.match(/\.(js|css)$/i)
-    );
-    injectMediaUrls(filesToInject, files, req.params.project_id);
+  const projectId = req.params.project_id;
+  Project.findOne(
+    { $or: [{ _id: projectId }, { slug: projectId }] },
+    (err, project) => {
+      if (err || !project) {
+        get404Sketch((html) => res.send(html));
+        return;
+      }
+      // TODO this does not parse html
+      const { files } = project;
+      const htmlFile = files.find((file) => file.name.match(/\.html$/i))
+        .content;
+      const filesToInject = files.filter((file) =>
+        file.name.match(/\.(js|css)$/i)
+      );
+      injectMediaUrls(filesToInject, files, req.params.project_id);
 
-    jsdom.env(htmlFile, (innerErr, window) => {
-      const sketchDoc = window.document;
+      jsdom.env(htmlFile, (innerErr, window) => {
+        const sketchDoc = window.document;
 
-      const base = sketchDoc.createElement('base');
-      const fullUrl = `//${req.get('host')}${req.originalUrl}`;
-      base.href = `${fullUrl}/`;
-      sketchDoc.head.appendChild(base);
+        const base = sketchDoc.createElement('base');
+        const fullUrl = `//${req.get('host')}${req.originalUrl}`;
+        base.href = `${fullUrl}/`;
+        sketchDoc.head.appendChild(base);
 
-      resolvePathsForElementsWithAttribute('src', sketchDoc, files);
-      resolvePathsForElementsWithAttribute('href', sketchDoc, files);
-      resolveScripts(sketchDoc, files);
-      resolveStyles(sketchDoc, files);
+        resolvePathsForElementsWithAttribute('src', sketchDoc, files);
+        resolvePathsForElementsWithAttribute('href', sketchDoc, files);
+        resolveScripts(sketchDoc, files);
+        resolveStyles(sketchDoc, files);
 
-      res.setHeader('Cache-Control', 'public, max-age=0');
-      res.send(serializeDocument(sketchDoc));
-    });
-  });
+        res.setHeader('Cache-Control', 'public, max-age=0');
+        res.send(serializeDocument(sketchDoc));
+      });
+    }
+  );
 }
 
 export default serveProject;

server/controllers/file.controller.js

@@ -141,26 +141,30 @@ export function deleteFile(req, res) {
 }
 
 export function getFileContent(req, res) {
-  Project.findById(req.params.project_id, (err, project) => {
-    if (err || project === null) {
-      res.status(404).send({
-        success: false,
-        message: 'Project with that id does not exist.'
-      });
-      return;
-    }
-    const filePath = req.params[0];
-    const resolvedFile = resolvePathToFile(filePath, project.files);
-    if (!resolvedFile) {
-      res.status(404).send({
-        success: false,
-        message: 'File with that name and path does not exist.'
-      });
-      return;
+  const projectId = req.params.project_id;
+  Project.findOne(
+    { $or: [{ _id: projectId }, { slug: projectId }] },
+    (err, project) => {
+      if (err || project === null) {
+        res.status(404).send({
+          success: false,
+          message: 'Project with that id does not exist.'
+        });
+        return;
+      }
+      const filePath = req.params[0];
+      const resolvedFile = resolvePathToFile(filePath, project.files);
+      if (!resolvedFile) {
+        res.status(404).send({
+          success: false,
+          message: 'File with that name and path does not exist.'
+        });
+        return;
+      }
+      const contentType =
+        mime.lookup(resolvedFile.name) || 'application/octet-stream';
+      res.set('Content-Type', contentType);
+      res.send(resolvedFile.content);
     }
-    const contentType =
-      mime.lookup(resolvedFile.name) || 'application/octet-stream';
-    res.set('Content-Type', contentType);
-    res.send(resolvedFile.content);
-  });
+  );
 }

server/controllers/project.controller.js

@@ -123,7 +123,8 @@ export function getProjectsForUserId(userId) {
 }
 
 export function getProjectAsset(req, res) {
-  Project.findById(req.params.project_id)
+  const projectId = req.params.project_id;
+  Project.findOne({ $or: [{ _id: projectId }, { slug: projectId }] })
     .populate('user', 'username')
     .exec(async (err, project) => { // eslint-disable-line
       if (err) {