Fix recipe store bundling of custom recipes

4 files changed, 26 insertions, 5 deletions

diff --git a/app/Controllers/Http/RecipeController.js b/app/Controllers/Http/RecipeController.js
index 407379e..594c298 100644
--- a/app/Controllers/Http/RecipeController.js
+++ b/app/Controllers/Http/RecipeController.js
@@ -6,7 +6,7 @@ const Drive = use('Drive')
 const fetch = require('node-fetch');
 const targz = require('targz');
 const path = require('path');
-const fs = require('fs');
+const fs = require('fs-extra');
 
 const compress = (src, dest) => {
   return new Promise((resolve, reject) => {
@@ -51,19 +51,29 @@ class RecipeController {
   }) {
     const data = request.all();
 
+    if (!data.id) {
+      return response.send('Please provide an ID');
+    }
+
     // Check for invalid characters
     if (/\.{1,}/.test(data.id) || /\/{1,}/.test(data.id)) {
       return response.send('Invalid recipe name. Your recipe name may not contain "." or "/"');
     }
 
+    // Clear temporary recipe folder
+    await fs.emptyDir(Helpers.tmpPath('recipe'));
+
     // Move uploaded files to temporary path
     const files = request.file('files')
     await files.moveAll(Helpers.tmpPath('recipe'))
 
     // Compress files to .tar.gz file
+    const source = Helpers.tmpPath('recipe');
+    const destination = path.join(Helpers.appRoot(), '/recipes/' + data.id + '.tar.gz');
+    console.log('a', source, destination)
     compress(
-      Helpers.tmpPath('recipe'), 
-      path.join(Helpers.appRoot(), '/recipes/' + data.id + '.tar.gz')
+      source,
+      destination
     );
 
     // Create recipe in db
diff --git a/app/Controllers/Http/UserController.js b/app/Controllers/Http/UserController.js
index f78f28d..5c4d7fb 100644
--- a/app/Controllers/Http/UserController.js
+++ b/app/Controllers/Http/UserController.js
@@ -14,8 +14,9 @@ class UserController {
   }) {
     const data = request.only(['firstname', 'email', 'password']);
 
+    let user;
     try {
-      const user = await User.create({
+      user = await User.create({
         email: data.email,
         password: data.password,
         username: data.firstname
diff --git a/package.json b/package.json
index 327fb8e..27e92df 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "@adonisjs/ignitor": "^2.0.8",
     "@adonisjs/lucid": "^6.1.3",
     "atob": "^2.1.2",
+    "fs-extra": "^8.1.0",
     "node-fetch": "^2.6.0",
     "pg": "^7.12.1",
     "sqlite3": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index f2ebd3d..7020eaf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1377,6 +1377,15 @@ fs-extra@^7.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
@@ -1454,7 +1463,7 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==