Merge branch 'develop' into chinese

Author: peilingjiang

kubernetes_app.yml

@@ -8,20 +8,18 @@ spec:
   backend:
     serviceName: web-editor-node
     servicePort: 8000
-## TODO uncomment from prod
-## adding this in just to make a new commit
-# ---
-# apiVersion: extensions/v1beta1
-# kind: Ingress
-# metadata:
-#   name: preview-editor-ingress
-#   annotations:
-#     # need to make another global static ip
-#     kubernetes.io/ingress.global-static-ip-name: "preview-editor-ip"
-# spec:
-#   backend:
-#     serviceName: web-editor-node
-#     servicePort: 8002
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: preview-editor-ingress
+  annotations:
+    # need to make another global static ip
+    kubernetes.io/ingress.global-static-ip-name: "preview-editor-ip"
+spec:
+  backend:
+    serviceName: web-editor-node
+    servicePort: 8002
 ---
 apiVersion: v1
 kind: Service
@@ -36,10 +34,11 @@ spec:
   type: NodePort
   ports:
   - port: 8000
+    name: editor-port
     targetPort: 8000
-  ## TODO uncommment for prod
-  # - port: 8002
-  #   targetPort: 8002
+  - port: 8002
+    name: preview-port
+    targetPort: 8002
   selector:
     app: web-editor
 ---
@@ -146,7 +145,7 @@ metadata:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: staging-editor-ingress-with-auth
+  name: staging-editor-ingress
   namespace: staging
   annotations:
     kubernetes.io/ingress.global-static-ip-name: "web-editor-staging-ip"
@@ -158,7 +157,7 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: staging-editor-ingress-with-auth
+  name: staging-preview-ingress
   namespace: staging
   annotations:
     kubernetes.io/ingress.global-static-ip-name: "preview-staging-ip"
@@ -181,8 +180,10 @@ spec:
   type: NodePort
   ports:
   - port: 8001
+    name: editor-port
     targetPort: 8000
   - port: 8003
+    name: preview-port
     targetPort: 8002
   selector:
     app: web-editor

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) {