6 files changed, 231 insertions, 127 deletions

diff --git a/start/env.ts b/start/env.ts
new file mode 100644
index 0000000..5b40fd8
--- /dev/null
+++ b/start/env.ts
@@ -0,0 +1,43 @@
+/*
+|--------------------------------------------------------------------------
+| Validating Environment Variables
+|--------------------------------------------------------------------------
+|
+| In this file we define the rules for validating environment variables.
+| By performing validation we ensure that your application is running in
+| a stable environment with correct configuration values.
+|
+| This file is read automatically by the framework during the boot lifecycle
+| and hence do not rename or move this file to a different location.
+|
+*/
+import { Env } from '@adonisjs/core/env';
+
+export default await Env.create(new URL('../', import.meta.url), {
+  NODE_ENV: Env.schema.enum(['development', 'production', 'test'] as const),
+  PORT: Env.schema.number(),
+  APP_KEY: Env.schema.string(),
+  HOST: Env.schema.string({ format: 'host' }),
+  LOG_LEVEL: Env.schema.string(),
+
+  /*
+  |----------------------------------------------------------
+  | Variables for configuring session package
+  |----------------------------------------------------------
+  */
+  SESSION_DRIVER: Env.schema.enum(['cookie', 'memory'] as const),
+
+  /*
+  |----------------------------------------------------------
+  | Variables for configuring the mail package
+  |----------------------------------------------------------
+  */
+  // SMTP_HOST: Env.schema.string(),
+  // SMTP_PORT: Env.schema.string(),
+  // SES_ACCESS_KEY: Env.schema.string(),
+  // SES_ACCESS_SECRET: Env.schema.string(),
+  // SES_REGION: Env.schema.string(),
+  // MAILGUN_API_KEY: Env.schema.string(),
+  // MAILGUN_DOMAIN: Env.schema.string(),
+  // SPARKPOST_API_KEY: Env.schema.string(),
+});
diff --git a/start/events.ts b/start/events.ts
index 11e63e5..b3667db 100644
--- a/start/events.ts
+++ b/start/events.ts
@@ -1,6 +1,6 @@
-import Config from '@ioc:Adonis/Core/Config';
-import Event from '@ioc:Adonis/Core/Event';
-import Mail from '@ioc:Adonis/Addons/Mail';
+import emitter from '@adonisjs/core/services/emitter';
+import mail from '@adonisjs/mail/services/main';
+import config from '@adonisjs/core/services/config';
 
 /*
 |--------------------------------------------------------------------------
@@ -11,17 +11,17 @@ import Mail from '@ioc:Adonis/Addons/Mail';
 | boot.
 |
 */
-Event.on('forgot::password', async ({ user, token }) => {
+emitter.on('forgot::password', async ({ user, token }) => {
   try {
     // eslint-disable-next-line no-console
     console.log('Sending message');
-    await Mail.send(message => {
+    await mail.send(message => {
       message
         .subject('[Ferdium] Forgot Password')
         .to(user.email)
-        .from(Config.get('dasshboard.mailFrom'))
+        .from(config.get('dasshboard.mailFrom'))
         .textView('emails.forgot-password', {
-          appUrl: Config.get('app.url'),
+          appUrl: config.get('app.url'),
           username: user.username,
           token,
         });
diff --git a/start/kernel.ts b/start/kernel.ts
index 1c5c92b..4bd783c 100644
--- a/start/kernel.ts
+++ b/start/kernel.ts
@@ -1,49 +1,48 @@
 /*
 |--------------------------------------------------------------------------
-| Application middleware
+| HTTP kernel file
 |--------------------------------------------------------------------------
 |
-| This file is used to define middleware for HTTP requests. You can register
-| middleware as a `closure` or an IoC container binding. The bindings are
-| preferred, since they keep this file clean.
+| The HTTP kernel file is used to register the middleware with the server
+| or the router.
 |
 */
 
-import Server from '@ioc:Adonis/Core/Server';
+import router from '@adonisjs/core/services/router';
+import server from '@adonisjs/core/services/server';
 
-/*
-|--------------------------------------------------------------------------
-| Global middleware
-|--------------------------------------------------------------------------
-|
-| An array of global middleware, that will be executed in the order they
-| are defined for every HTTP requests.
-|
-*/
-Server.middleware.register([
-  () => import('@ioc:Adonis/Core/BodyParser'),
-  () => import('@ioc:Adonis/Addons/Shield'),
+/**
+ * The error handler is used to convert an exception
+ * to a HTTP response.
+ */
+server.errorHandler(() => import('#exceptions/handler'));
+
+/**
+ * The server middleware stack runs middleware on all the HTTP
+ * requests, even if there is no route registered for
+ * the request URL.
+ */
+server.use([
+  () => import('@adonisjs/core/bodyparser_middleware'),
+  () => import('@adonisjs/shield/shield_middleware'),
+  () => import('@adonisjs/cors/cors_middleware'),
+  () => import('#middleware/container_bindings_middleware'),
+  () => import('#middleware/force_json_response_middleware'),
 ]);
 
-/*
-|--------------------------------------------------------------------------
-| Named middleware
-|--------------------------------------------------------------------------
-|
-| Named middleware are defined as key-value pair. The value is the namespace
-| or middleware function and key is the alias. Later you can use these
-| alias on individual routes. For example:
-|
-| { auth: () => import('App/Middleware/Auth') }
-|
-| and then use it as follows
-|
-| Route.get('dashboard', 'UserController.dashboard').middleware('auth')
-|
-*/
-Server.middleware.registerNamed({
-  auth: () => import('App/Middleware/Auth'),
-  dashboard: () => import('App/Middleware/Dashboard'),
-  guest: () => import('App/Middleware/AllowGuestOnly'),
-  shield: () => import('@ioc:Adonis/Addons/Shield'),
+/**
+ * The router middleware stack runs middleware on all the HTTP
+ * requests with a registered route.
+ */
+router.use([() => import('@adonisjs/core/bodyparser_middleware')]);
+
+/**
+ * Named middleware collection must be explicitly assigned to
+ * the routes or the routes group.
+ */
+export const middleware = router.named({
+  auth: () => import('#app/Middleware/Auth'),
+  dashboard: () => import('#app/Middleware/Dashboard'),
+  guest: () => import('#app/Middleware/AllowGuestOnly'),
+  shield: () => import('@adonisjs/shield/shield_middleware'),
 });
diff --git a/start/routes.ts b/start/routes.ts
index 75cef72..ea090c9 100644
--- a/start/routes.ts
+++ b/start/routes.ts
@@ -18,5 +18,5 @@
 |
 */
 
-import './routes/api';
-import './routes/web';
+import './routes/api.js';
+import './routes/web.js';
diff --git a/start/routes/api.ts b/start/routes/api.ts
index 78282f0..37f7859 100644
--- a/start/routes/api.ts
+++ b/start/routes/api.ts
@@ -1,51 +1,80 @@
 // As this is currently a rebuild of the initial API we it is grouped in /v2/
 
-import Route from '@ioc:Adonis/Core/Route';
+import { middleware } from '#start/kernel';
+import router from '@adonisjs/core/services/router';
+const UserController = () => import('#controllers/Http/UserController');
+const ServiceController = () => import('#controllers/Http/ServiceController');
+const RecipeController = () => import('#controllers/Http/RecipeController');
+const WorkspaceController = () =>
+  import('#controllers/Http/WorkspaceController');
+const FeaturesController = () =>
+  import('#controllers/Http/Api/Static/FeaturesController');
+const EmptyController = () =>
+  import('#controllers/Http/Api/Static/EmptyController');
+const AnnouncementsController = () =>
+  import('#controllers/Http/Api/Static/AnnouncementsController');
 
-Route.group(() => {
-  // User authentification
-  Route.post('auth/signup', 'UserController.signup').middleware('guest');
-  Route.post('auth/login', 'UserController.login').middleware('guest');
+router
+  .group(() => {
+    // User authentification
+    router
+      .post('auth/signup', [UserController, 'signup'])
+      .use(middleware.guest());
+    router
+      .post('auth/login', [UserController, 'login'])
+      .use(middleware.guest());
 
-  // User info
-  Route.get('me', 'UserController.me').middleware('auth:jwt');
-  Route.put('me', 'UserController.updateMe').middleware('auth:jwt');
-  Route.get('me/newtoken', 'UserController.newToken').middleware('auth:jwt');
+    // User info
+    router.get('me', [UserController, 'me']).use(middleware.auth());
+    router.put('me', [UserController, 'updateMe']).use(middleware.auth());
+    router
+      .get('me/newtoken', [UserController, 'newToken'])
+      .use(middleware.auth());
 
-  // // Service info
-  Route.post('service', 'ServiceController.create').middleware('auth:jwt');
-  Route.put('service/reorder', 'ServiceController.reorder').middleware(
-    'auth:jwt',
-  );
-  Route.put('service/:id', 'ServiceController.edit').middleware('auth:jwt');
-  Route.delete('service/:id', 'ServiceController.delete').middleware(
-    'auth:jwt',
-  );
-  Route.get('me/services', 'ServiceController.list').middleware('auth:jwt');
-  Route.get('recipe', 'ServiceController.list').middleware('auth:jwt');
-  Route.get('icon/:id', 'ServiceController.icon');
+    // // Service info
+    router
+      .post('service', [ServiceController, 'create'])
+      .use(middleware.auth());
+    router
+      .put('service/reorder', [ServiceController, 'reorder'])
+      .use(middleware.auth());
+    router
+      .put('service/:id', [ServiceController, 'edit'])
+      .use(middleware.auth());
+    router
+      .delete('service/:id', [ServiceController, 'delete'])
+      .use(middleware.auth());
+    router
+      .get('me/services', [ServiceController, 'list'])
+      .use(middleware.auth());
+    router.get('recipe', [ServiceController, 'list']).use(middleware.auth());
+    router.get('icon/:id', [ServiceController, 'icon']);
 
-  // Recipe store
-  Route.get('recipes', 'RecipeController.list');
-  Route.get('recipes/search', 'RecipeController.search');
-  Route.get('recipes/popular', 'RecipeController.popularRecipes');
-  Route.get('recipes/download/:recipe', 'RecipeController.download');
-  Route.post('recipes/update', 'RecipeController.update');
+    // Recipe store
+    router.get('recipes', [RecipeController, 'list']);
+    router.get('recipes/search', [RecipeController, 'search']);
+    router.get('recipes/popular', [RecipeController, 'popularRecipes']);
+    router.get('recipes/download/:recipe', [RecipeController, 'download']);
+    router.post('recipes/update', [RecipeController, 'update']);
 
-  // // Workspaces
-  Route.put('workspace/:id', 'WorkspaceController.edit').middleware('auth:jwt');
-  Route.delete('workspace/:id', 'WorkspaceController.delete').middleware(
-    'auth:jwt',
-  );
-  Route.post('workspace', 'WorkspaceController.create').middleware('auth:jwt');
-  Route.get('workspace', 'WorkspaceController.list').middleware('auth:jwt');
+    // // Workspaces
+    router
+      .put('workspace/:id', [WorkspaceController, 'edit'])
+      .use(middleware.auth());
+    router
+      .delete('workspace/:id', [WorkspaceController, 'delete'])
+      .use(middleware.auth());
+    router
+      .post('workspace', [WorkspaceController, 'create'])
+      .use(middleware.auth());
+    router
+      .get('workspace', [WorkspaceController, 'list'])
+      .use(middleware.auth());
 
-  // Static responses
-  Route.get('features/:mode?', 'Api/Static/FeaturesController.show');
-  Route.get('services', 'Api/Static/EmptyController.show');
-  Route.get('news', 'Api/Static/EmptyController.show');
-  Route.get(
-    'announcements/:version',
-    'Api/Static/AnnouncementsController.show',
-  );
-}).prefix('/v1');
+    // Static responses
+    router.get('features/:mode?', [FeaturesController, 'show']);
+    router.get('services', [EmptyController, 'show']);
+    router.get('news', [EmptyController, 'show']);
+    router.get('announcements/:version', [AnnouncementsController, 'show']);
+  })
+  .prefix('/v1');
diff --git a/start/routes/web.ts b/start/routes/web.ts
index 308abec..f78585c 100644
--- a/start/routes/web.ts
+++ b/start/routes/web.ts
@@ -1,54 +1,87 @@
-import Route from '@ioc:Adonis/Core/Route';
+import { middleware } from '#start/kernel';
+import router from '@adonisjs/core/services/router';
+const HealthController = () => import('#controllers/Http/HealthController');
+const LoginController = () =>
+  import('#controllers/Http/Dashboard/LoginController');
+const ForgotPasswordController = () =>
+  import('#controllers/Http/Dashboard/ForgotPasswordController');
+const ResetPasswordController = () =>
+  import('#controllers/Http/Dashboard/ResetPasswordController');
+const AccountController = () =>
+  import('#controllers/Http/Dashboard/AccountController');
+const DataController = () =>
+  import('#controllers/Http/Dashboard/DataController');
+const ExportController = () =>
+  import('#controllers/Http/Dashboard/ExportController');
+const TransferController = () =>
+  import('#controllers/Http/Dashboard/TransferController');
+const DeleteController = () =>
+  import('#controllers/Http/Dashboard/DeleteController');
+const LogOutController = () =>
+  import('#controllers/Http/Dashboard/LogOutController');
+const UserController = () => import('#controllers/Http/UserController');
 
 // Health check
-Route.get('health', 'HealthController.index');
+router.get('health', [HealthController, 'index']);
 
 // Legal documents
-Route.get('terms', ({ response }) => response.redirect('/terms.html'));
-Route.get('privacy', ({ response }) => response.redirect('/privacy.html'));
+router.get('terms', ({ response }) => response.redirect('/terms.html'));
+router.get('privacy', ({ response }) => response.redirect('/privacy.html'));
 
 // Index
-Route.get('/', ({ view }) => view.render('others/index'));
+router.get('/', ({ view }) => view.render('others/index'));
 
-Route.group(() => {
-  Route.group(() => {
-    // Guest troutes
-    Route.group(() => {
-      Route.get('login', 'Dashboard/LoginController.show');
-      Route.post('login', 'Dashboard/LoginController.login').as('login');
+router
+  .group(() => {
+    router
+      .group(() => {
+        // Guest troutes
+        router
+          .group(() => {
+            router.get('login', [LoginController, 'show']);
+            router.post('login', [LoginController, 'login']).as('login');
 
-      // Reset password
-      Route.get('forgot', 'Dashboard/ForgotPasswordController.show');
-      Route.post('forgot', 'Dashboard/ForgotPasswordController.forgotPassword');
+            // Reset password
+            router.get('forgot', [ForgotPasswordController, 'show']);
+            router.post('forgot', [ForgotPasswordController, 'forgotPassword']);
 
-      Route.get('reset', 'Dashboard/ResetPasswordController.show');
-      Route.post('reset', 'Dashboard/ResetPasswordController.resetPassword');
-    }).middleware(['dashboard', 'guest']);
+            router.get('reset', [ResetPasswordController, 'show']);
+            router.post('reset', [ResetPasswordController, 'resetPassword']);
+          })
+          .use(middleware.dashboard())
+          .use(middleware.guest());
 
-    // Authenticated routes
-    Route.group(() => {
-      Route.get('account', 'Dashboard/AccountController.show');
-      Route.post('account', 'Dashboard/AccountController.store');
+        // Authenticated routes
+        router
+          .group(() => {
+            router.get('account', [AccountController, 'show']);
+            router.post('account', [AccountController, 'store']);
 
-      Route.get('data', 'Dashboard/DataController.show');
-      Route.get('export', 'Dashboard/ExportController.show');
+            router.get('data', [DataController, 'show']);
+            router.get('export', [ExportController, 'show']);
 
-      Route.get('transfer', 'Dashboard/TransferController.show');
-      Route.post('transfer', 'Dashboard/TransferController.import');
+            router.get('transfer', [TransferController, 'show']);
+            router.post('transfer', [TransferController, 'import']);
 
-      Route.get('delete', 'Dashboard/DeleteController.show');
-      Route.post('delete', 'Dashboard/DeleteController.delete');
+            router.get('delete', [DeleteController, 'show']);
+            router.post('delete', [DeleteController, 'delete']);
 
-      Route.get('logout', 'Dashboard/LogOutController.logout');
+            router.get('logout', [LogOutController, 'logout']);
 
-      Route.get('*', ({ response }) => response.redirect('/user/account'));
-    }).middleware(['dashboard', 'auth:web']);
-  }).prefix('user');
+            router.get('*', ({ response }) =>
+              response.redirect('/user/account'),
+            );
+          })
+          .use(middleware.dashboard())
+          .use(middleware.auth());
+      })
+      .prefix('user');
 
-  // Franz/Ferdi account import
-  Route.get('import', ({ view }) => view.render('others/import'));
-  Route.post('import', 'UserController.import');
+    // Franz/Ferdi account import
+    router.get('import', ({ view }) => view.render('others/import'));
+    router.post('import', [UserController, 'import']);
 
-  // 404 handler
-  Route.get('/*', ({ response }) => response.redirect('/'));
-}).middleware(['dashboard']);
+    // 404 handler
+    router.get('/*', ({ response }) => response.redirect('/'));
+  })
+  .use(middleware.dashboard());