Develop internal server

12 files changed, 11 insertions, 252 deletions

diff --git a/src/server/README.md b/src/server/README.md
index 833d9643e..0074f2314 100644
--- a/src/server/README.md
+++ b/src/server/README.md
@@ -5,23 +5,8 @@
 # ferdi-internal-server
 Internal Ferdi Server used for storing settings without logging into an external server.
 
-npm i @adonisjs/ace @adonisjs/auth @adonisjs/bodyparser @adonisjs/cors @adonisjs/drive @adonisjs/fold @adonisjs/framework @adonisjs/ignitor @adonisjs/lucid @adonisjs/session @adonisjs/shield @adonisjs/validator atob btoa fs-extra  node-fetch sqlite3 uuid targz
-
-### Manual setup
-1. Clone this repository
-2. Install the [AdonisJS CLI](https://adonisjs.com/)
-3. Run the database migrations with
-    ```js
-    adonis migration:run
-    ```
-4. Start the server with
-    ```js
-    adonis serve --dev
-    ```
-
 ## Configuration
-franz-server's configuration is saved inside the `.env` file. Besides AdonisJS's settings, ferdi-server has the following custom settings:
-- `IS_CREATION_ENABLED` (`true` or `false`, default: `true`): Whether to enable the [creation of custom recipes](#creating-and-using-custom-recipes)
+franz-server's configuration is saved inside the `env.ini` file. Besides AdonisJS's settings, ferdi-internal-server has the following custom settings:
 - `CONNECT_WITH_FRANZ` (`true` or `false`, default: `true`): Whether to enable connections to the Franz server. By enabling this option, ferdi-server can:
   - Show the full Franz recipe library instead of only custom recipes
   - Import Franz accounts
@@ -30,21 +15,3 @@ franz-server's configuration is saved inside the `.env` file. Besides AdonisJS's
 ferdi-server allows you to import your full Franz account, including all its settings.
 
 To import your Franz account, open `http://localhost:45569/import` in your browser and login using your Franz account details. ferdi-server will create a new user with the same credentials and copy your Franz settings, services and workspaces.
-
-## Creating and using custom recipes
-ferdi-server allows to extends the Franz recipe catalogue with custom Ferdi recipes.
-
-For documentation on how to create a recipe, please visit [the official guide by Franz](https://github.com/meetfranz/plugins/blob/master/docs/integration.md).
-
-To add your recipe to ferdi-server, open `http://localhost:45569/new` in your browser. You can now define the following settings:
-- `Author`: Author who created the recipe
-- `Name`: Name for your new service. Can contain spaces and unicode characters
-- `Service ID`: Unique ID for this recipe. Does not contain spaces or special characters (e.g. `google-drive`)
-- `Link to PNG/SVG image`: Direct link to a 1024x1024 PNG image and SVG that is used as a logo inside the store. Please use jsDelivr when using a file uploaded to GitHub as raw.githubusercontent files won't load
-- `Recipe files`: Recipe files that you created using the [Franz recipe creation guide](https://github.com/meetfranz/plugins/blob/master/docs/integration.md). Please do *not* package your files beforehand - upload the raw files (you can drag and drop multiple files). ferdi-server will automatically package and store the recipe in the right format. Please also do not drag and drop or select the whole folder, select the individual files.
-
-### Listing custom recipes
-Inside Ferdi, searching for `ferdi:custom` will list all your custom recipes.
-
-## License
-ferdi-server is licensed under the MIT License
diff --git a/src/server/app/Controllers/Http/DashboardController.js b/src/server/app/Controllers/Http/DashboardController.js
deleted file mode 100644
index 69af16227..000000000
--- a/src/server/app/Controllers/Http/DashboardController.js
+++ /dev/null
@@ -1,38 +0,0 @@
-class DashboardController {
-  async data({
-    auth,
-    view,
-  }) {
-    const general = auth.user;
-    const services = (await auth.user.services().fetch()).toJSON();
-    const workspaces = (await auth.user.workspaces().fetch()).toJSON();
-
-    return view.render('dashboard.data', {
-      username: general.username,
-      mail: general.email,
-      created: general.created_at,
-      updated: general.updated_at,
-      services,
-      workspaces,
-    });
-  }
-
-  logout({
-    auth,
-    response,
-  }) {
-    auth.authenticator('session').logout();
-    return response.redirect('/user/login');
-  }
-
-  delete({
-    auth,
-    response,
-  }) {
-    auth.user.delete();
-    auth.authenticator('session').logout();
-    return response.redirect('/user/login');
-  }
-}
-
-module.exports = DashboardController;
diff --git a/src/server/app/Controllers/Http/RecipeController.js b/src/server/app/Controllers/Http/RecipeController.js
index 5ed21122a..c887ea00e 100644
--- a/src/server/app/Controllers/Http/RecipeController.js
+++ b/src/server/app/Controllers/Http/RecipeController.js
@@ -8,29 +8,15 @@ const {
 const Env = use('Env');
 
 const fetch = require('node-fetch');
-const targz = require('targz');
 const path = require('path');
 const fs = require('fs-extra');
 
-const compress = (src, dest) => new Promise((resolve, reject) => {
-  targz.compress({
-    src,
-    dest,
-  }, (err) => {
-    if (err) {
-      reject(err);
-    } else {
-      resolve(dest);
-    }
-  });
-});
-
 class RecipeController {
   // List official and custom recipes
   async list({
     response,
   }) {
-    const officialRecipes = JSON.parse(await (await fetch('https://api.franzinfra.com/v1/recipes')).text());
+    const officialRecipes = JSON.parse(await (await fetch('https://api.getferdi.com/v1/recipes')).text());
     const customRecipesArray = (await Recipe.all()).rows;
     const customRecipes = customRecipesArray.map(recipe => ({
       id: recipe.recipeId,
@@ -46,77 +32,6 @@ class RecipeController {
     return response.send(recipes);
   }
 
-  // Create a new recipe using the new.html page
-  async create({
-    request,
-    response,
-  }) {
-    // Check if recipe creation is enabled
-    if (Env.get('IS_CREATION_ENABLED') == 'false') { // eslint-disable-line eqeqeq
-      return response.send('This server doesn\'t allow the creation of new recipes.');
-    }
-
-    // Validate user input
-    const validation = await validateAll(request.all(), {
-      name: 'required|string',
-      id: 'required|unique:recipes,recipeId',
-      author: 'required|accepted',
-      png: 'required|url',
-      svg: 'required|url',
-    });
-    if (validation.fails()) {
-      return response.status(401).send({
-        message: 'Invalid POST arguments',
-        messages: validation.messages(),
-        status: 401,
-      });
-    }
-
-    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`);
-
-    compress(
-      source,
-      destination,
-    );
-
-    // Create recipe in db
-    await Recipe.create({
-      name: data.name,
-      recipeId: data.id,
-      data: JSON.stringify({
-        author: data.author,
-        featured: false,
-        version: '1.0.0',
-        icons: {
-          png: data.png,
-          svg: data.svg,
-        },
-      }),
-    });
-
-    return response.send('Created new recipe');
-  }
-
   // Search official and custom recipes
   async search({
     request,
@@ -149,7 +64,7 @@ class RecipeController {
     } else {
       let remoteResults = [];
       if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
-        remoteResults = JSON.parse(await (await fetch(`https://api.franzinfra.com/v1/recipes/search?needle=${encodeURIComponent(needle)}`)).text());
+        remoteResults = JSON.parse(await (await fetch(`https://api.getferdi.com/v1/recipes/search?needle=${encodeURIComponent(needle)}`)).text());
       }
       const localResultsArray = (await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()).toJSON();
       const localResults = localResultsArray.map(recipe => ({
@@ -195,7 +110,7 @@ class RecipeController {
     if (await Drive.exists(`${service}.tar.gz`)) {
       return response.send(await Drive.get(`${service}.tar.gz`));
     } if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
-      return response.redirect(`https://api.franzinfra.com/v1/recipes/download/${service}`);
+      return response.redirect(`https://api.getferdi.com/v1/recipes/download/${service}`);
     }
     return response.status(400).send({
       message: 'Recipe not found',
diff --git a/src/server/app/Exceptions/Handler.js b/src/server/app/Exceptions/Handler.js
index cb9e10bbe..e8d2d2ee2 100644
--- a/src/server/app/Exceptions/Handler.js
+++ b/src/server/app/Exceptions/Handler.js
@@ -22,8 +22,6 @@ class ExceptionHandler extends BaseExceptionHandler {
   async handle(error, { response }) {
     if (error.name === 'ValidationException') {
       return response.status(400).send('Invalid arguments');
-    } if (error.name === 'InvalidSessionException') {
-      return response.status(401).redirect('/user/login');
     }
 
     return response.status(error.status).send(error.message);
diff --git a/src/server/app/Models/User.js b/src/server/app/Models/User.js
index 9783cbe45..907710d8d 100644
--- a/src/server/app/Models/User.js
+++ b/src/server/app/Models/User.js
@@ -1,4 +1,4 @@
-
+// File is required by AdonisJS but not used by the server
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
diff --git a/src/server/database/ferdi.sqlite b/src/server/database/ferdi.sqlite
deleted file mode 100644
index db5425ee6..000000000
--- a/src/server/database/ferdi.sqlite
+++ /dev/null
diff --git a/src/server/logo.png b/src/server/logo.png
index 587e0b86e..4145a077a 100644
--- a/src/server/logo.png
+++ b/src/server/logo.png
diff --git a/src/server/public/js/new.js b/src/server/public/js/new.js
deleted file mode 100644
index beaa36da6..000000000
--- a/src/server/public/js/new.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* eslint-env browser */
-const elDrop = document.getElementById('dropzone');
-const submitBtn = document.getElementById('submitbutton');
-const fileInput = document.getElementById('files');
-
-elDrop.addEventListener('dragover', (event) => {
-  event.preventDefault();
-});
-
-elDrop.addEventListener('drop', async (event) => {
-  event.preventDefault();
-
-  submitBtn.disabled = true;
-
-  fileInput.files = event.dataTransfer.files;
-
-  elDrop.innerText = `✓ ${fileInput.files.length} files selected`;
-  elDrop.style.height = 'inherit';
-
-  submitBtn.disabled = false;
-});
-elDrop.addEventListener('click', () => {
-  fileInput.click();
-});
diff --git a/src/server/resources/views/others/import.edge b/src/server/resources/views/import.edge
index b890bbb2a..f7b52b179 100644
--- a/src/server/resources/views/others/import.edge
+++ b/src/server/resources/views/import.edge
@@ -2,7 +2,7 @@
 
 @section('content')
 <h1>Import a Franz account</h1>
-<p>Please login using your Franz account. We will create a new Ferdi account with the same credentials.</p>
+<p>Please login using your Franz account. We will import your services and workspaces.</p>
 <form action="import" method="post">
   <label for="email">E-Mail address</label><br />
   <input type="email" name="email" placeholder="joe@example.com" required><br />
@@ -11,9 +11,5 @@
   <input type="password" name="password" placeholder="********" required><br />
 
   <button type="submit" id="submitbutton">Import Franz account</button>
-  <small>
-    By importing your Franz account, you accept the <a href="/terms">Terms of service</a> and <a href="/privacy">Privacy
-      policy</a>
-  </small>
 </form>
 @endsection
diff --git a/src/server/resources/views/others/index.edge b/src/server/resources/views/index.edge
index c594d3142..3e0198a09 100644
--- a/src/server/resources/views/others/index.edge
+++ b/src/server/resources/views/index.edge
@@ -8,22 +8,16 @@
   }
 
 </style>
-<h1>ferdi-server</h1>
-<p>You are accessing a custom <a href="https://github.com/kytwb/ferdi">Ferdi</a> server.</p>
+<h1>Internal Ferdi Server</h1>
+<p>You are accessing the local server instance of your Ferdi application. This server is used to enable Ferdi's "Use without an Account" feature.</p>
 <p>
   To use this server in your Ferdi client, <a href="ferdi://settings/app">open Ferdi's settings</a> and as the
   <code>server</code>, enter <code id="server"></code>
 </p>
 <p>
-  Alternatively, you can manage your account in the <a href="/user/account">account dashboard</a>.
+  Alternatively, you can <a href="/import">import your Franz account</a>.
 </p>
 
-<br />
-<small>
-  <a href="https://github.com/vantezzen/ferdi-server">ferdi-server</a> is a project by <a
-    href="https://vantezzen.io">vantezzen</a>.
-</small>
-
 <script>
   // Get server URL for current location
   let server = location.href.replace('/index.html', '');
diff --git a/src/server/resources/views/others/new.edge b/src/server/resources/views/others/new.edge
deleted file mode 100644
index 1b54558fc..000000000
--- a/src/server/resources/views/others/new.edge
+++ /dev/null
@@ -1,40 +0,0 @@
-@layout('layouts.main')
-
-@section('content')
-<h1>Create a new recipe</h1>
-<p>Please create a recipe using <a href="https://github.com/meetfranz/plugins/blob/master/docs/integration.md">the
-    official Franz guide</a>, then publish it here.</p>
-<form action="new" method="post" enctype="multipart/form-data">
-  <label for="author">Author</label><br />
-  <input type="text" name="author" placeholder="Jon Doe" required><br />
-
-  <label for="name">Name</label><br />
-  <input type="text" name="name" placeholder="Sample Service" required><br />
-
-  <label for="id">Service ID</label><br />
-  <input type="text" name="id" placeholder="sample-service" required><br />
-
-  <label for="png">Link to PNG image*</label><br />
-  <input type="text" name="png" placeholder="https://.../logo.png" required><br />
-
-  <label for="svg">Link to SVG image*</label><br />
-  <input type="text" name="svg" placeholder="https://.../logo.svg" required><br />
-  *These images must be publicly availible and have CORS enabled in order to work.<br /><br />
-
-  <label for="package">Recipe files</label><br />
-  <div id="dropzone" effectAllowed="move">
-    <div>
-      Drop recipe files here<br />or click here to select files
-      <p>
-        Drag and drop your recipe files into this area.<br />
-        Please do not select the folder that contains the files but rather the files itself.
-      </p>
-    </div>
-  </div>
-  <input type="file" name="files[]" id="files" value="" multiple required><br /><br />
-
-  <button type="submit" id="submitbutton">Create recipe</button>
-</form>
-
-<script src="js/new.js"></script>
-@endsection
diff --git a/src/server/start/routes.js b/src/server/start/routes.js
index f3896bfa3..ec2e79a7c 100644
--- a/src/server/start/routes.js
+++ b/src/server/start/routes.js
@@ -57,18 +57,9 @@ Route.group(() => {
   Route.get('announcements/:version', 'StaticController.announcement');
 }).prefix('v1');
 
-// Recipe creation
-Route.post('new', 'RecipeController.create');
-Route.get('new', ({ response, view }) => {
-  if (Env.get('IS_CREATION_ENABLED') == 'false') { // eslint-disable-line eqeqeq
-    return response.send('This server doesn\'t allow the creation of new recipes.\n\nIf you are the server owner, please set IS_CREATION_ENABLED to true to enable recipe creation.');
-  }
-  return view.render('others.new');
-});
-
 // Franz account import
 Route.post('import', 'UserController.import');
-Route.get('import', ({ view }) => view.render('others.import'));
+Route.get('import', ({ view }) => view.render('import'));
 
 // Index
-Route.get('/', ({ view }) => view.render('others.index'));
+Route.get('/', ({ view }) => view.render('index'));