From 0e9bbdc4d8927644046ba3dfeec61c54824c52c5 Mon Sep 17 00:00:00 2001
From: Cassie Tarakajian <ctarakajian@gmail.com>
Date: Wed, 19 Jun 2019 16:56:55 -0400
Subject: [PATCH 1/2] fixes #498

---
 server/controllers/aws.controller.js | 34 +++++++++++++++++-----------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/server/controllers/aws.controller.js b/server/controllers/aws.controller.js
index 09c1480ebe..86928f41c0 100644
--- a/server/controllers/aws.controller.js
+++ b/server/controllers/aws.controller.js
@@ -126,21 +126,29 @@ export function listObjectsInS3ForUser(req, res) {
       .on('end', () => {
         const projectAssets = [];
         getProjectsForUserId(userId).then((projects) => {
-          projects.forEach((project) => {
-            project.files.forEach((file) => {
-              if (!file.url) return;
-
-              const foundAsset = assets.find(asset => file.url.includes(asset.key));
-              if (!foundAsset) return;
-              projectAssets.push({
-                name: file.name,
-                sketchName: project.name,
-                sketchId: project.id,
-                url: file.url,
-                key: foundAsset.key,
-                size: foundAsset.size
+          assets.forEach((asset) => {
+            let name = asset.key.split('/').pop();
+            let foundAsset = {
+              key: asset.key,
+              name: name,
+              size: asset.size,
+              url: `${process.env.S3_BUCKET_URL_BASE}${asset.key}`
+            };
+            projects.some((project) => {
+              let found = false;
+              project.files.some((file) => {
+                if (!file.url) return false;
+                if (file.url.includes(asset.key)) {
+                  found = true;
+                  foundAsset.name = file.name;
+                  foundAsset.sketchName = project.name;
+                  foundAsset.sketchId = project.id;
+                  foundAsset.url = file.url;
+                }
               });
+              return found;
             });
+            projectAssets.push(foundAsset);
           });
           res.json({ assets: projectAssets });
         });

From 9bc26eba5a288ba385b785c41132b6e1aabcab9c Mon Sep 17 00:00:00 2001
From: Cassie Tarakajian <ctarakajian@gmail.com>
Date: Wed, 19 Jun 2019 17:00:20 -0400
Subject: [PATCH 2/2] fix linting errors

---
 server/controllers/aws.controller.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/controllers/aws.controller.js b/server/controllers/aws.controller.js
index 86928f41c0..4e94e24ea6 100644
--- a/server/controllers/aws.controller.js
+++ b/server/controllers/aws.controller.js
@@ -127,10 +127,10 @@ export function listObjectsInS3ForUser(req, res) {
         const projectAssets = [];
         getProjectsForUserId(userId).then((projects) => {
           assets.forEach((asset) => {
-            let name = asset.key.split('/').pop();
-            let foundAsset = {
+            const name = asset.key.split('/').pop();
+            const foundAsset = {
               key: asset.key,
-              name: name,
+              name,
               size: asset.size,
               url: `${process.env.S3_BUCKET_URL_BASE}${asset.key}`
             };
@@ -144,7 +144,9 @@ export function listObjectsInS3ForUser(req, res) {
                   foundAsset.sketchName = project.name;
                   foundAsset.sketchId = project.id;
                   foundAsset.url = file.url;
+                  return true;
                 }
+                return false;
               });
               return found;
             });