From bbecd8fdb673b64e3b2e2290dd990fe636acec38 Mon Sep 17 00:00:00 2001 From: Vijay Aravamudhan Date: Tue, 10 May 2022 20:27:03 -0500 Subject: Revert "Eventually get remote recipes updates in internal server" (#134) This reverts commit 1101eb3801fb265221baee91428ba1c9a19f6150. --- .../app/Controllers/Http/RecipeController.js | 24 ++++++++-------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'src/internal-server/app/Controllers/Http') diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js index 5f7c32d70..e88a89a0b 100644 --- a/src/internal-server/app/Controllers/Http/RecipeController.js +++ b/src/internal-server/app/Controllers/Http/RecipeController.js @@ -85,17 +85,10 @@ class RecipeController { return response.send(results); } - async update({ request, response }) { - // eslint-disable-next-line eqeqeq - if (Env.get('CONNECT_WITH_FRANZ') == 'true') { - const body = request.all(); - const remoteUpdates = await fetch(`${RECIPES_URL}/update`, { - method: 'POST', - body: JSON.stringify(body), - headers: {'Content-Type': 'application/json'} - }); - return response.send(await remoteUpdates.json()); - } + // Return an empty array + update({ + response, + }) { return response.send([]); } @@ -123,18 +116,19 @@ class RecipeController { const service = params.recipe; - // eslint-disable-next-line eqeqeq - if (Env.get('CONNECT_WITH_FRANZ') == 'true') { - return response.redirect(`${RECIPES_URL}/download/${service}`); - } // Check for invalid characters if (/\.+/.test(service) || /\/+/.test(service)) { return response.send('Invalid recipe name'); } + // Check if recipe exists in recipes folder if (await Drive.exists(`${service}.tar.gz`)) { return response.send(await Drive.get(`${service}.tar.gz`)); } + // eslint-disable-next-line eqeqeq + if (Env.get('CONNECT_WITH_FRANZ') == 'true') { + return response.redirect(`${RECIPES_URL}/download/${service}`); + } return response.status(400).send({ message: 'Recipe not found', code: 'recipe-not-found', -- cgit v1.2.3-54-g00ecf