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

Merge branch 'develop' into login-signup-issue

This commit is contained in:
Cassie Tarakajian 2020-07-16 17:11:05 -04:00
parent b126a69c11 b83824d933
commit f19f52683b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/modules/IDE/actions/project.js
View File

@ -16,6 +16,8 @@ import {
import { clearState, saveState } from '../../../persistState'; import { clearState, saveState } from '../../../persistState';
const ROOT_URL = getConfig('API_URL'); const ROOT_URL = getConfig('API_URL');
const S3_BUCKET_URL_BASE = getConfig('S3_BUCKET_URL_BASE');
const S3_BUCKET = getConfig('S3_BUCKET');
export function setProject(project) { export function setProject(project) {
return { return {
@ -287,7 +289,7 @@ export function cloneProject(id) {
// duplicate all files hosted on S3 // duplicate all files hosted on S3
each(newFiles, (file, callback) => { each(newFiles, (file, callback) => {
if (file.url && file.url.includes('amazonaws')) { if (file.url && (file.url.includes(S3_BUCKET_URL_BASE) || file.url.includes(S3_BUCKET))) {
const formParams = { const formParams = {
url: file.url url: file.url
}; };

2
server/controllers/aws.controller.js
View File

@ -28,7 +28,7 @@ function getExtension(filename) {
export function getObjectKey(url) { export function getObjectKey(url) {
const urlArray = url.split('/'); const urlArray = url.split('/');
let objectKey; let objectKey;
if (urlArray.length === 6) { if (urlArray.length === 5) {
const key = urlArray.pop(); const key = urlArray.pop();
const userId = urlArray.pop(); const userId = urlArray.pop();
objectKey = `${userId}/${key}`; objectKey = `${userId}/${key}`;