From 85220ae55fedec4cead7072aea0e528b6fe23f56 Mon Sep 17 00:00:00 2001 From: Jared Donovan Date: Sun, 1 Jul 2018 22:40:45 +1000 Subject: [PATCH 1/3] Set trust proxy option on Express app. --- server/server.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/server.js b/server/server.js index d186ff4ee0..446326c513 100644 --- a/server/server.js +++ b/server/server.js @@ -45,6 +45,8 @@ if (process.env.NODE_ENV === 'development') { corsOriginsWhitelist.push(/localhost/); } +app.set('trust proxy', true); + // Enable Cross-Origin Resource Sharing (CORS) for all origins const corsMiddleware = cors({ credentials: true, From db6dcdf2e4e92069b84d1be89b7d798c80d241d2 Mon Sep 17 00:00:00 2001 From: Jared Donovan Date: Sun, 1 Jul 2018 22:42:32 +1000 Subject: [PATCH 2/3] Fix replacement of filePath for full screen and embed sketches. --- server/utils/previewGeneration.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/utils/previewGeneration.js b/server/utils/previewGeneration.js index 61d1e5f595..171c6434ee 100644 --- a/server/utils/previewGeneration.js +++ b/server/utils/previewGeneration.js @@ -29,7 +29,8 @@ function resolveLinksInString(content, files, projectId) { while (resolvedFilePath.startsWith('/')) { resolvedFilePath = resolvedFilePath.substr(1); } - newContent = newContent.replace(filePath, `/sketches/${projectId}/assets/${resolvedFilePath}`); + let replacement = `/sketches/${projectId}/assets/${resolvedFilePath}`; + newContent = newContent.replace(filePath, replacement); } } } From 6e2f1314896c71975f89dde1fa11daa6ee2060ec Mon Sep 17 00:00:00 2001 From: Jared Donovan Date: Mon, 2 Jul 2018 11:09:40 +1000 Subject: [PATCH 3/3] Use const rather than let because is never reassigned. --- server/utils/previewGeneration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/utils/previewGeneration.js b/server/utils/previewGeneration.js index 171c6434ee..a8f46e8ddc 100644 --- a/server/utils/previewGeneration.js +++ b/server/utils/previewGeneration.js @@ -29,7 +29,7 @@ function resolveLinksInString(content, files, projectId) { while (resolvedFilePath.startsWith('/')) { resolvedFilePath = resolvedFilePath.substr(1); } - let replacement = `/sketches/${projectId}/assets/${resolvedFilePath}`; + const replacement = `/sketches/${projectId}/assets/${resolvedFilePath}`; newContent = newContent.replace(filePath, replacement); } }