r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

WIP - Mixed content error for Issue #543 (#661)

Browse source 
* Set trust proxy option on Express app.

* Fix replacement of filePath for full screen and embed sketches.

* Use const rather than let because  is never reassigned.
This commit is contained in:
Jared Donovan 2018-07-04 06:02:46 +10:00 committed by Cassie Tarakajian
parent 9a0c044884
commit 903713e705
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/server.js
View file

@ -45,6 +45,8 @@ if (process.env.NODE_ENV === 'development') {
corsOriginsWhitelist.push(/localhost/); corsOriginsWhitelist.push(/localhost/);
} }
app.set('trust proxy', true);
// Enable Cross-Origin Resource Sharing (CORS) for all origins // Enable Cross-Origin Resource Sharing (CORS) for all origins
const corsMiddleware = cors({ const corsMiddleware = cors({
credentials: true, credentials: true,

3
server/utils/previewGeneration.js
View file

@ -29,7 +29,8 @@ function resolveLinksInString(content, files, projectId) {
while (resolvedFilePath.startsWith('/')) { while (resolvedFilePath.startsWith('/')) {
resolvedFilePath = resolvedFilePath.substr(1); resolvedFilePath = resolvedFilePath.substr(1);
} }
newContent = newContent.replace(filePath, `/sketches/${projectId}/assets/${resolvedFilePath}`); const replacement = `/sketches/${projectId}/assets/${resolvedFilePath}`;
newContent = newContent.replace(filePath, replacement);
} }
} }
} }