19 files changed, 114 insertions, 137 deletions

diff --git a/app/Controllers/Http/Api/Static/AnnouncementsController.ts b/app/Controllers/Http/Api/Static/AnnouncementsController.ts
index c20707b..85aed4d 100644
--- a/app/Controllers/Http/Api/Static/AnnouncementsController.ts
+++ b/app/Controllers/Http/Api/Static/AnnouncementsController.ts
@@ -1,12 +1,13 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import Application from '@ioc:Adonis/Core/Application';
+import type { HttpContext } from '@adonisjs/core/http';
+import app from '@adonisjs/core/services/app';
 import path from 'node:path';
 import fs from 'fs-extra';
 
 export default class AnnouncementsController {
-  public async show({ response, params }: HttpContextContract) {
+  public async show({ response, params }: HttpContext) {
     const announcement = path.join(
-      Application.resourcesPath(),
+      app.appRoot.host,
+      'resources',
       'announcements',
       `${params.version}.json`,
     );
diff --git a/app/Controllers/Http/Api/Static/EmptyController.ts b/app/Controllers/Http/Api/Static/EmptyController.ts
index a07790e..80d70b7 100644
--- a/app/Controllers/Http/Api/Static/EmptyController.ts
+++ b/app/Controllers/Http/Api/Static/EmptyController.ts
@@ -1,7 +1,7 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
+import type { HttpContext } from '@adonisjs/core/http';
 
 export default class EmptyController {
-  public async show({ response }: HttpContextContract) {
+  public async show({ response }: HttpContext) {
     return response.send([]);
   }
 }
diff --git a/app/Controllers/Http/Api/Static/FeaturesController.ts b/app/Controllers/Http/Api/Static/FeaturesController.ts
index d471b11..ce964de 100644
--- a/app/Controllers/Http/Api/Static/FeaturesController.ts
+++ b/app/Controllers/Http/Api/Static/FeaturesController.ts
@@ -1,7 +1,7 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
+import type { HttpContext } from '@adonisjs/core/http';
 
 export default class FeaturesController {
-  public async show({ response }: HttpContextContract) {
+  public async show({ response }: HttpContext) {
     return response.send({
       isServiceProxyEnabled: true,
       isWorkspaceEnabled: true,
diff --git a/app/Controllers/Http/Dashboard/AccountController.ts b/app/Controllers/Http/Dashboard/AccountController.ts
index 3c4e919..a748c75 100644
--- a/app/Controllers/Http/Dashboard/AccountController.ts
+++ b/app/Controllers/Http/Dashboard/AccountController.ts
@@ -1,12 +1,12 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { schema, rules, validator } from '@ioc:Adonis/Core/Validator';
+import type { HttpContext } from '@adonisjs/core/http';
+import { schema, rules, validator } from '@adonisjs/validator';
 import crypto from 'node:crypto';
 
 export default class AccountController {
   /**
    * Shows the user account page
    */
-  public async show({ auth, view }: HttpContextContract) {
+  public async show({ auth, view }: HttpContext) {
     return view.render('dashboard/account', {
       username: auth.user?.username,
       email: auth.user?.email,
@@ -17,13 +17,7 @@ export default class AccountController {
   /**
    * Stores user account data
    */
-  public async store({
-    auth,
-    request,
-    response,
-    session,
-    view,
-  }: HttpContextContract) {
+  public async store({ auth, request, response, session, view }: HttpContext) {
     try {
       await validator.validate({
         schema: schema.create({
diff --git a/app/Controllers/Http/Dashboard/DataController.ts b/app/Controllers/Http/Dashboard/DataController.ts
index f77702f..5f22979 100644
--- a/app/Controllers/Http/Dashboard/DataController.ts
+++ b/app/Controllers/Http/Dashboard/DataController.ts
@@ -1,10 +1,10 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
+import type { HttpContext } from '@adonisjs/core/http';
 
 export default class DataController {
   /**
    * Display the data page
    */
-  public async show({ view, auth }: HttpContextContract) {
+  public async show({ view, auth }: HttpContext) {
     const { user } = auth;
 
     const services = await user?.related('services').query();
diff --git a/app/Controllers/Http/Dashboard/DeleteController.ts b/app/Controllers/Http/Dashboard/DeleteController.ts
index ef8188c..76e41ca 100644
--- a/app/Controllers/Http/Dashboard/DeleteController.ts
+++ b/app/Controllers/Http/Dashboard/DeleteController.ts
@@ -1,17 +1,17 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
+import type { HttpContext } from '@adonisjs/core/http';
 
 export default class DeleteController {
   /**
    * Display the delete page
    */
-  public async show({ view }: HttpContextContract) {
+  public async show({ view }: HttpContext) {
     return view.render('dashboard/delete');
   }
 
   /**
    * Delete user and session
    */
-  public async delete({ auth, response }: HttpContextContract) {
+  public async delete({ auth, response }: HttpContext) {
     auth.user?.delete();
     auth.use('web').logout();
 
diff --git a/app/Controllers/Http/Dashboard/ExportController.ts b/app/Controllers/Http/Dashboard/ExportController.ts
index 7155eab..6b20a82 100644
--- a/app/Controllers/Http/Dashboard/ExportController.ts
+++ b/app/Controllers/Http/Dashboard/ExportController.ts
@@ -1,4 +1,4 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
+import type { HttpContext } from '@adonisjs/core/http';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function deepParseToJSON(obj: any): Record<string, unknown> {
@@ -35,7 +35,7 @@ export default class ExportController {
   /**
    * Display the export page
    */
-  public async show({ auth, response }: HttpContextContract) {
+  public async show({ auth, response }: HttpContext) {
     const user = auth.user!;
     const services = await user.related('services').query();
     const workspaces = await user.related('workspaces').query();
diff --git a/app/Controllers/Http/Dashboard/ForgotPasswordController.ts b/app/Controllers/Http/Dashboard/ForgotPasswordController.ts
index da05bbd..1878c4d 100644
--- a/app/Controllers/Http/Dashboard/ForgotPasswordController.ts
+++ b/app/Controllers/Http/Dashboard/ForgotPasswordController.ts
@@ -1,19 +1,19 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { schema, rules, validator } from '@ioc:Adonis/Core/Validator';
-import User from 'App/Models/User';
+import type { HttpContext } from '@adonisjs/core/http';
+import { schema, rules, validator } from '@adonisjs/validator';
+import User from '#app/Models/User';
 
 export default class ForgotPasswordController {
   /**
    * Display the forgot password form
    */
-  public async show({ view }: HttpContextContract) {
+  public async show({ view }: HttpContext) {
     return view.render('dashboard/forgotPassword');
   }
 
   /**
    * Send forget password email to user
    */
-  public async forgotPassword({ view, request }: HttpContextContract) {
+  public async forgotPassword({ view, request }: HttpContext) {
     try {
       await validator.validate({
         schema: schema.create({
diff --git a/app/Controllers/Http/Dashboard/LogOutController.ts b/app/Controllers/Http/Dashboard/LogOutController.ts
index 41cbd31..f085d00 100644
--- a/app/Controllers/Http/Dashboard/LogOutController.ts
+++ b/app/Controllers/Http/Dashboard/LogOutController.ts
@@ -1,10 +1,10 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
+import type { HttpContext } from '@adonisjs/core/http';
 
 export default class LogOutController {
   /**
    * Login a user
    */
-  public async logout({ auth, response }: HttpContextContract) {
+  public async logout({ auth, response }: HttpContext) {
     auth.logout();
 
     return response.redirect('/user/login');
diff --git a/app/Controllers/Http/Dashboard/LoginController.ts b/app/Controllers/Http/Dashboard/LoginController.ts
index ffb9eeb..3367a2f 100644
--- a/app/Controllers/Http/Dashboard/LoginController.ts
+++ b/app/Controllers/Http/Dashboard/LoginController.ts
@@ -1,26 +1,21 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { schema, rules, validator } from '@ioc:Adonis/Core/Validator';
-import User from 'App/Models/User';
+import type { HttpContext } from '@adonisjs/core/http';
+import { schema, rules, validator } from '@adonisjs/validator';
+import User from '#app/Models/User';
 import crypto from 'node:crypto';
-import { handleVerifyAndReHash } from '../../../../helpers/PasswordHash';
+import { handleVerifyAndReHash } from '../../../../helpers/PasswordHash.js';
 
 export default class LoginController {
   /**
    * Display the login form
    */
-  public async show({ view }: HttpContextContract) {
+  public async show({ view }: HttpContext) {
     return view.render('dashboard/login');
   }
 
   /**
    * Login a user
    */
-  public async login({
-    request,
-    response,
-    auth,
-    session,
-  }: HttpContextContract) {
+  public async login({ request, response, auth, session }: HttpContext) {
     try {
       await validator.validate({
         schema: schema.create({
diff --git a/app/Controllers/Http/Dashboard/ResetPasswordController.ts b/app/Controllers/Http/Dashboard/ResetPasswordController.ts
index 0b9053f..261d773 100644
--- a/app/Controllers/Http/Dashboard/ResetPasswordController.ts
+++ b/app/Controllers/Http/Dashboard/ResetPasswordController.ts
@@ -1,6 +1,6 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { schema, rules, validator } from '@ioc:Adonis/Core/Validator';
-import Token from 'App/Models/Token';
+import type { HttpContext } from '@adonisjs/core/http';
+import { schema, rules, validator } from '@adonisjs/validator';
+import Token from '#app/Models/Token';
 import moment from 'moment';
 import crypto from 'node:crypto';
 
@@ -8,7 +8,7 @@ export default class ResetPasswordController {
   /**
    * Display the reset password form
    */
-  public async show({ view, request }: HttpContextContract) {
+  public async show({ view, request }: HttpContext) {
     const { token } = request.qs();
 
     if (token) {
@@ -29,7 +29,7 @@ export default class ResetPasswordController {
     request,
     session,
     view,
-  }: HttpContextContract) {
+  }: HttpContext) {
     try {
       await validator.validate({
         schema: schema.create({
diff --git a/app/Controllers/Http/Dashboard/TransferController.ts b/app/Controllers/Http/Dashboard/TransferController.ts
index b113e50..ab50bcf 100644
--- a/app/Controllers/Http/Dashboard/TransferController.ts
+++ b/app/Controllers/Http/Dashboard/TransferController.ts
@@ -1,7 +1,7 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { schema, validator } from '@ioc:Adonis/Core/Validator';
-import Service from 'App/Models/Service';
-import Workspace from 'App/Models/Workspace';
+import type { HttpContext } from '@adonisjs/core/http';
+import { schema, validator } from '@adonisjs/validator';
+import Service from '#app/Models/Service';
+import Workspace from '#app/Models/Workspace';
 import { v4 as uuidv4 } from 'uuid';
 
 const importSchema = schema.create({
@@ -16,17 +16,11 @@ export default class TransferController {
   /**
    * Display the transfer page
    */
-  public async show({ view }: HttpContextContract) {
+  public async show({ view }: HttpContext) {
     return view.render('dashboard/transfer');
   }
 
-  public async import({
-    auth,
-    request,
-    response,
-    session,
-    view,
-  }: HttpContextContract) {
+  public async import({ auth, request, response, session, view }: HttpContext) {
     let file;
     try {
       file = await validator.validate({
diff --git a/app/Controllers/Http/DashboardController.ts b/app/Controllers/Http/DashboardController.ts
index a6f5b44..2a9fb13 100644
--- a/app/Controllers/Http/DashboardController.ts
+++ b/app/Controllers/Http/DashboardController.ts
@@ -1,4 +1,4 @@
-// import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
+// import type { HttpContext } from '@adonisjs/core/http';
 
 export default class DashboardController {}
 
diff --git a/app/Controllers/Http/HomeController.ts b/app/Controllers/Http/HomeController.ts
index dbe9fbd..bae3bc2 100644
--- a/app/Controllers/Http/HomeController.ts
+++ b/app/Controllers/Http/HomeController.ts
@@ -1,4 +1,4 @@
-// import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
+// import type { HttpContext } from '@adonisjs/core/http'
 
 export default class HomeController {
   public async index() {
diff --git a/app/Controllers/Http/RecipeController.ts b/app/Controllers/Http/RecipeController.ts
index 5186a11..fd3c57e 100644
--- a/app/Controllers/Http/RecipeController.ts
+++ b/app/Controllers/Http/RecipeController.ts
@@ -1,10 +1,10 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
+import type { HttpContext } from '@adonisjs/core/http';
 import fs from 'fs-extra';
-import Application from '@ioc:Adonis/Core/Application';
+import app from '@adonisjs/core/services/app';
 import path from 'node:path';
-import Recipe from 'App/Models/Recipe';
-import { isCreationEnabled } from 'Config/app';
-import { validator, schema, rules } from '@ioc:Adonis/Core/Validator';
+import Recipe from '#app/Models/Recipe';
+import { isCreationEnabled } from '#config/app';
+import { validator, schema, rules } from '@adonisjs/validator';
 import targz from 'targz';
 import semver from 'semver';
 import Drive from '@ioc:Adonis/Core/Drive';
@@ -49,9 +49,9 @@ const compress = (src: string, dest: string) =>
 
 export default class RecipesController {
   // List official and custom recipes
-  public async list({ response }: HttpContextContract) {
+  public async list({ response }: HttpContext) {
     const officialRecipes = fs.readJsonSync(
-      path.join(Application.appRoot, 'recipes', 'all.json'),
+      path.join(app.appRoot.host, 'recipes', 'all.json'),
     );
     const customRecipesArray = await Recipe.all();
     const customRecipes = customRecipesArray.map(recipe => ({
@@ -69,11 +69,11 @@ export default class RecipesController {
 
   // TODO: Test this endpoint
   // Create a new recipe using the new.html page
-  public async create({ request, response }: HttpContextContract) {
+  public async create({ request, response }: HttpContext) {
     // Check if recipe creation is enabled
     if (isCreationEnabled === 'false') {
       return response.send(
-        'This server doesn\'t allow the creation of new recipes.',
+        "This server doesn't allow the creation of new recipes.",
       );
     }
 
@@ -101,19 +101,19 @@ export default class RecipesController {
     }
 
     // Clear temporary recipe folder
-    await fs.emptyDir(Application.tmpPath('recipe'));
+    await fs.emptyDir(app.tmpPath('recipe'));
 
     // Move uploaded files to temporary path
     const files = request.file('files');
     if (!files) {
       return response.abort('Error processsing files.');
     }
-    await files.move(Application.tmpPath('recipe'));
+    await files.move(app.tmpPath('recipe'));
 
     // Compress files to .tar.gz file
-    const source = Application.tmpPath('recipe');
+    const source = app.tmpPath('recipe');
     const destination = path.join(
-      Application.appRoot,
+      app.appRoot.host,
       `/recipes/archives/${data.id}.tar.gz`,
     );
 
@@ -138,7 +138,7 @@ export default class RecipesController {
   }
 
   // Search official and custom recipes
-  public async search({ request, response }: HttpContextContract) {
+  public async search({ request, response }: HttpContext) {
     // Validate user input
     let data;
     try {
@@ -183,21 +183,21 @@ export default class RecipesController {
     return response.send(results);
   }
 
-  public popularRecipes({ response }: HttpContextContract) {
+  public popularRecipes({ response }: HttpContext) {
     return response.send(
       fs
-        .readJsonSync(path.join(Application.appRoot, 'recipes', 'all.json'))
+        .readJsonSync(path.join(app.appRoot.host, 'recipes', 'all.json'))
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .filter((recipe: any) => recipe.featured),
     );
   }
 
   // TODO: test this endpoint
-  public update({ request, response }: HttpContextContract) {
+  public update({ request, response }: HttpContext) {
     const updates = [];
     const recipes = request.all();
     const allJson = fs.readJsonSync(
-      path.join(Application.appRoot, 'recipes', 'all.json'),
+      path.join(app.appRoot.host, 'recipes', 'all.json'),
     );
 
     for (const recipe of Object.keys(recipes)) {
@@ -216,7 +216,7 @@ export default class RecipesController {
 
   // TODO: test this endpoint
   // Download a recipe
-  public async download({ response, params }: HttpContextContract) {
+  public async download({ response, params }: HttpContext) {
     // Validate user input
     let data;
     try {
diff --git a/app/Controllers/Http/ServiceController.ts b/app/Controllers/Http/ServiceController.ts
index 76e72e4..df5f623 100644
--- a/app/Controllers/Http/ServiceController.ts
+++ b/app/Controllers/Http/ServiceController.ts
@@ -1,11 +1,11 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { schema } from '@ioc:Adonis/Core/Validator';
-import Service from 'App/Models/Service';
-import { url } from 'Config/app';
+import type { HttpContext } from '@adonisjs/core/http';
+import { schema } from '@adonisjs/validator';
+import Service from '#app/Models/Service';
+import { url } from '#config/app';
 import { v4 as uuid } from 'uuid';
 import * as fs from 'fs-extra';
 import path from 'node:path';
-import Application from '@ioc:Adonis/Core/Application';
+import app from '@adonisjs/core/services/app';
 import sanitize from 'sanitize-filename';
 
 const createSchema = schema.create({
@@ -15,7 +15,7 @@ const createSchema = schema.create({
 
 export default class ServiceController {
   // Create a new service for user
-  public async create({ request, response, auth }: HttpContextContract) {
+  public async create({ request, response, auth }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -76,7 +76,7 @@ export default class ServiceController {
   }
 
   // List all services a user has created
-  public async list({ request, response, auth }: HttpContextContract) {
+  public async list({ request, response, auth }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -110,7 +110,7 @@ export default class ServiceController {
         iconUrl: settings.iconId
           ? `${url}/v1/icon/${settings.iconId}`
           : // eslint-disable-next-line unicorn/no-null
-          null,
+            null,
         id: service.serviceId,
         name: service.name,
         recipeId: service.recipeId,
@@ -121,12 +121,7 @@ export default class ServiceController {
     return response.send(servicesArray);
   }
 
-  public async delete({
-    request,
-    params,
-    auth,
-    response,
-  }: HttpContextContract) {
+  public async delete({ request, params, auth, response }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -147,7 +142,7 @@ export default class ServiceController {
   }
 
   // TODO: Test if icon upload works
-  public async edit({ request, response, auth, params }: HttpContextContract) {
+  public async edit({ request, response, auth, params }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -182,11 +177,11 @@ export default class ServiceController {
         iconId = uuid() + uuid();
       } while (
         // eslint-disable-next-line no-await-in-loop
-        await fs.exists(path.join(Application.tmpPath('uploads'), iconId))
+        await fs.exists(path.join(app.tmpPath('uploads'), iconId))
       );
       iconId = `${iconId}.${icon.extname}`;
 
-      await icon.move(Application.tmpPath('uploads'), {
+      await icon.move(app.tmpPath('uploads'), {
         name: iconId,
         overwrite: true,
       });
@@ -235,11 +230,11 @@ export default class ServiceController {
     };
 
     if (settings.customIcon === 'delete') {
-      fs.remove(
-        path.join(Application.tmpPath('uploads'), settings.iconId),
-      ).catch(error => {
-        console.error(error);
-      });
+      fs.remove(path.join(app.tmpPath('uploads'), settings.iconId)).catch(
+        error => {
+          console.error(error);
+        },
+      );
 
       settings.iconId = undefined;
       settings.customIconVersion = undefined;
@@ -274,7 +269,7 @@ export default class ServiceController {
   }
 
   // TODO: Test if this works
-  public async reorder({ request, response, auth }: HttpContextContract) {
+  public async reorder({ request, response, auth }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -333,7 +328,7 @@ export default class ServiceController {
         iconUrl: settings.iconId
           ? `${url}/v1/icon/${settings.iconId}`
           : // eslint-disable-next-line unicorn/no-null
-          null,
+            null,
         id: service.serviceId,
         name: service.name,
         recipeId: service.recipeId,
@@ -345,24 +340,24 @@ export default class ServiceController {
   }
 
   // TODO: Test if this works
-  public async icon({ params, response }: HttpContextContract) {
+  public async icon({ params, response }: HttpContext) {
     let { id } = params;
 
     id = sanitize(id);
     if (id === '') {
       return response.status(404).send({
-        status: 'Icon doesn\'t exist',
+        status: "Icon doesn't exist",
       });
     }
 
-    const iconPath = path.join(Application.tmpPath('uploads'), id);
+    const iconPath = path.join(app.tmpPath('uploads'), id);
 
     try {
       await fs.access(iconPath);
     } catch {
       // File not available.
       return response.status(404).send({
-        status: 'Icon doesn\'t exist',
+        status: "Icon doesn't exist",
       });
     }
 
diff --git a/app/Controllers/Http/StaticsController.ts b/app/Controllers/Http/StaticsController.ts
index e221177..a94a9ba 100644
--- a/app/Controllers/Http/StaticsController.ts
+++ b/app/Controllers/Http/StaticsController.ts
@@ -1,3 +1,3 @@
-// import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
+// import type { HttpContext } from '@adonisjs/core/http'
 
 export default class StaticsController {}
diff --git a/app/Controllers/Http/UserController.ts b/app/Controllers/Http/UserController.ts
index ef7cfdd..bcf0171 100644
--- a/app/Controllers/Http/UserController.ts
+++ b/app/Controllers/Http/UserController.ts
@@ -1,15 +1,17 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { schema, rules } from '@ioc:Adonis/Core/Validator';
-import User from 'App/Models/User';
-import { connectWithFranz, isRegistrationEnabled } from '../../../config/app';
+import type { HttpContext } from '@adonisjs/core/http';
+import { schema, rules } from '@adonisjs/validator';
+import User from '#app/Models/User';
+import {
+  connectWithFranz,
+  isRegistrationEnabled,
+} from '../../../config/app.js';
 import crypto from 'node:crypto';
 import { v4 as uuid } from 'uuid';
-import Workspace from 'App/Models/Workspace';
-import Service from 'App/Models/Service';
-import fetch from 'node-fetch';
+import Workspace from '#app/Models/Workspace';
+import Service from '#app/Models/Service';
 
 // TODO: This file needs to be refactored and cleaned up to include types
-import { handleVerifyAndReHash } from '../../../helpers/PasswordHash';
+import { handleVerifyAndReHash } from '../../../helpers/PasswordHash.js';
 
 const newPostSchema = schema.create({
   firstname: schema.string(),
@@ -54,7 +56,7 @@ const franzRequest = (route: any, method: any, auth: any) =>
 
 export default class UsersController {
   // Register a new user
-  public async signup({ request, response, auth }: HttpContextContract) {
+  public async signup({ request, response, auth }: HttpContext) {
     if (isRegistrationEnabled === 'false') {
       return response.status(401).send({
         message: 'Registration is disabled on this server',
@@ -100,7 +102,7 @@ export default class UsersController {
   }
 
   // Login using an existing user
-  public async login({ request, response, auth }: HttpContextContract) {
+  public async login({ request, response, auth }: HttpContext) {
     if (!request.header('Authorization')) {
       return response.status(401).send({
         message: 'Please provide authorization',
@@ -149,7 +151,7 @@ export default class UsersController {
   }
 
   // Return information about the current user
-  public async me({ request, response, auth }: HttpContextContract) {
+  public async me({ request, response, auth }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -179,7 +181,7 @@ export default class UsersController {
     });
   }
 
-  public async updateMe({ request, response, auth }: HttpContextContract) {
+  public async updateMe({ request, response, auth }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -220,7 +222,7 @@ export default class UsersController {
     });
   }
 
-  public async newToken({ request, response, auth }: HttpContextContract) {
+  public async newToken({ request, response, auth }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -235,7 +237,7 @@ export default class UsersController {
     });
   }
 
-  public async import({ request, response, view }: HttpContextContract) {
+  public async import({ request, response, view }: HttpContext) {
     if (isRegistrationEnabled === 'false') {
       return response.status(401).send({
         message: 'Registration is disabled on this server',
@@ -290,7 +292,8 @@ export default class UsersController {
           'x-franz-source': 'Web',
         },
       });
-      const content = await rawResponse.json();
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const content: any = await rawResponse.json();
 
       if (!content.message || content.message !== 'Successfully logged in') {
         const errorMessage =
diff --git a/app/Controllers/Http/WorkspaceController.ts b/app/Controllers/Http/WorkspaceController.ts
index 70af343..6cecf69 100644
--- a/app/Controllers/Http/WorkspaceController.ts
+++ b/app/Controllers/Http/WorkspaceController.ts
@@ -1,6 +1,6 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { validator, schema } from '@ioc:Adonis/Core/Validator';
-import Workspace from 'App/Models/Workspace';
+import type { HttpContext } from '@adonisjs/core/http';
+import { validator, schema } from '@adonisjs/validator';
+import Workspace from '#app/Models/Workspace';
 import { v4 as uuid } from 'uuid';
 
 const createSchema = schema.create({
@@ -17,7 +17,7 @@ const deleteSchema = schema.create({
 
 export default class WorkspaceController {
   // Create a new workspace for user
-  public async create({ request, response, auth }: HttpContextContract) {
+  public async create({ request, response, auth }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -67,7 +67,7 @@ export default class WorkspaceController {
     });
   }
 
-  public async edit({ request, response, auth, params }: HttpContextContract) {
+  public async edit({ request, response, auth, params }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -113,12 +113,7 @@ export default class WorkspaceController {
     });
   }
 
-  public async delete({
-    request,
-    response,
-    auth,
-    params,
-  }: HttpContextContract) {
+  public async delete({ request, response, auth, params }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;
 
@@ -155,7 +150,7 @@ export default class WorkspaceController {
   }
 
   // List all workspaces a user has created
-  public async list({ request, response, auth }: HttpContextContract) {
+  public async list({ request, response, auth }: HttpContext) {
     // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
     const user = auth.user ?? request.user;