1 files changed, 112 insertions, 127 deletions

diff --git a/app/Controllers/Http/UserController.ts b/app/Controllers/Http/UserController.ts
index ef7cfdd..088f7b1 100644
--- a/app/Controllers/Http/UserController.ts
+++ b/app/Controllers/Http/UserController.ts
@@ -1,134 +1,125 @@
-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 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 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'
 
 // 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(),
   lastname: schema.string(),
-  email: schema.string([
-    rules.email(),
-    rules.unique({ table: 'users', column: 'email' }),
-  ]),
+  email: schema.string([rules.email(), rules.unique({ table: 'users', column: 'email' })]),
   password: schema.string([rules.minLength(8)]),
-});
+})
 
 const franzImportSchema = schema.create({
-  email: schema.string([
-    rules.email(),
-    rules.unique({ table: 'users', column: 'email' }),
-  ]),
+  email: schema.string([rules.email(), rules.unique({ table: 'users', column: 'email' })]),
   password: schema.string([rules.minLength(8)]),
-});
+})
 
 // // TODO: This whole controller needs to be changed such that it can support importing from both Franz and Ferdi
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const franzRequest = (route: any, method: any, auth: any) =>
   new Promise((resolve, reject) => {
-    const base = 'https://api.franzinfra.com/v1/';
+    const base = 'https://api.franzinfra.com/v1/'
     const user =
-      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Franz/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36';
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Franz/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36'
 
     try {
       fetch(base + route, {
         method,
         headers: {
-          Authorization: `Bearer ${auth}`,
+          'Authorization': `Bearer ${auth}`,
           'User-Agent': user,
         },
       })
-        .then(data => data.json())
-        .then(json => resolve(json));
+        .then((data) => data.json())
+        .then((json) => resolve(json))
     } catch {
-      reject();
+      reject()
     }
-  });
+  })
 
 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',
         status: 401,
-      });
+      })
     }
 
     // Validate user input
-    let data;
+    let data
     try {
-      data = await request.validate({ schema: newPostSchema });
+      data = await request.validate({ schema: newPostSchema })
     } catch (error) {
       return response.status(401).send({
         message: 'Invalid POST arguments',
         messages: error.messages,
         status: 401,
-      });
+      })
     }
 
     // Create user in DB
-    let user;
+    let user
     try {
       user = await User.create({
         email: data.email,
         password: data.password,
         username: data.firstname,
         lastname: data.lastname,
-      });
+      })
     } catch {
       return response.status(401).send({
         message: 'E-Mail address already in use',
         status: 401,
-      });
+      })
     }
 
     // Generate new auth token
-    const token = await auth.use('jwt').login(user, { payload: {} });
+    const token = await auth.use('jwt').login(user, { payload: {} })
 
     return response.send({
       message: 'Successfully created account',
       token: token.accessToken,
-    });
+    })
   }
 
   // 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',
         status: 401,
-      });
+      })
     }
 
     // Get auth data from auth token
-    const authHeader = atob(
-      request.header('Authorization')!.replace('Basic ', ''),
-    ).split(':');
+    const authHeader = atob(request.header('Authorization')!.replace('Basic ', '')).split(':')
 
     // Check if user with email exists
-    const user = await User.query().where('email', authHeader[0]).first();
+    const user = await User.query().where('email', authHeader[0]).first()
     if (!user?.email) {
       return response.status(401).send({
         message: 'User credentials not valid',
         code: 'invalid-credentials',
         status: 401,
-      });
+      })
     }
 
     // Verify password
-    let isMatchedPassword = false;
+    let isMatchedPassword = false
     try {
-      isMatchedPassword = await handleVerifyAndReHash(user, authHeader[1]);
+      isMatchedPassword = await handleVerifyAndReHash(user, authHeader[1])
     } catch (error) {
-      return response.internalServerError({ message: error.message });
+      return response.internalServerError({ message: error.message })
     }
 
     if (!isMatchedPassword) {
@@ -136,31 +127,28 @@ export default class UsersController {
         message: 'User credentials not valid',
         code: 'invalid-credentials',
         status: 401,
-      });
+      })
     }
 
     // Generate token
-    const token = await auth.use('jwt').login(user, { payload: {} });
+    const token = await auth.use('jwt').login(user, { payload: {} })
 
     return response.send({
       message: 'Successfully logged in',
       token: token.accessToken,
-    });
+    })
   }
 
   // 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;
+    const user = auth.user ?? request.user
 
     if (!user) {
-      return response.send('Missing or invalid api token');
+      return response.send('Missing or invalid api token')
     }
 
-    const settings =
-      typeof user.settings === 'string'
-        ? JSON.parse(user.settings)
-        : user.settings;
+    const settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings
 
     return response.send({
       accountType: 'individual',
@@ -176,29 +164,29 @@ export default class UsersController {
       lastname: user.lastname,
       locale: 'en-US',
       ...settings,
-    });
+    })
   }
 
-  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;
+    const user = auth.user ?? request.user
 
     if (!user) {
-      return response.send('Missing or invalid api token');
+      return response.send('Missing or invalid api token')
     }
 
-    let settings = user.settings || {};
+    let settings = user.settings || {}
     if (typeof settings === 'string') {
-      settings = JSON.parse(settings);
+      settings = JSON.parse(settings)
     }
 
     const newSettings = {
       ...settings,
       ...request.all(),
-    };
+    }
 
-    user.settings = JSON.stringify(newSettings);
-    await user.save();
+    user.settings = JSON.stringify(newSettings)
+    await user.save()
 
     return response.send({
       data: {
@@ -217,140 +205,137 @@ export default class UsersController {
         ...newSettings,
       },
       status: ['data-updated'],
-    });
+    })
   }
 
-  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;
+    const user = auth.user ?? request.user
 
     if (!user) {
-      return response.send('Missing or invalid api token');
+      return response.send('Missing or invalid api token')
     }
 
-    const token = await auth.use('jwt').generate(user, { payload: {} });
+    const token = await auth.use('jwt').generate(user, { payload: {} })
 
     return response.send({
       token: token.accessToken,
-    });
+    })
   }
 
-  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',
         status: 401,
-      });
+      })
     }
 
     if (connectWithFranz === 'false') {
       return response.send(
-        'We could not import your Franz account data.\n\nIf you are the server owner, please set CONNECT_WITH_FRANZ to true to enable account imports.',
-      );
+        'We could not import your Franz account data.\n\nIf you are the server owner, please set CONNECT_WITH_FRANZ to true to enable account imports.'
+      )
     }
 
     // Validate user input
-    let data;
+    let data
     try {
-      data = await request.validate({ schema: franzImportSchema });
+      data = await request.validate({ schema: franzImportSchema })
     } catch (error) {
       return view.render('others.message', {
         heading: 'Error while importing',
         text: error.messages,
-      });
+      })
     }
 
-    const { email, password } = data;
+    const { email, password } = data
 
-    const hashedPassword = crypto
-      .createHash('sha256')
-      .update(password)
-      .digest('base64');
+    const hashedPassword = crypto.createHash('sha256').update(password).digest('base64')
 
-    const base = 'https://api.franzinfra.com/v1/';
+    const base = 'https://api.franzinfra.com/v1/'
     const userAgent =
-      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Franz/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36';
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Franz/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36'
 
     // Try to get an authentication token
-    let token;
+    let token
     try {
-      const basicToken = btoa(`${email}:${hashedPassword}`);
+      const basicToken = btoa(`${email}:${hashedPassword}`)
       const loginBody = {
         isZendeskLogin: false,
-      };
+      }
 
       const rawResponse = await fetch(`${base}auth/login`, {
         method: 'POST',
         body: JSON.stringify(loginBody),
         headers: {
-          Authorization: `Basic ${basicToken}`,
+          'Authorization': `Basic ${basicToken}`,
           'User-Agent': userAgent,
           'Content-Type': 'application/json',
-          accept: '*/*',
+          'accept': '*/*',
           'x-franz-source': 'Web',
         },
-      });
-      const content = await rawResponse.json();
+      })
+      const content = await rawResponse.json()
 
       if (!content.message || content.message !== 'Successfully logged in') {
         const errorMessage =
-          'Could not login into Franz with your supplied credentials. Please check and try again';
-        return response.status(401).send(errorMessage);
+          'Could not login into Franz with your supplied credentials. Please check and try again'
+        return response.status(401).send(errorMessage)
       }
 
-      token = content.token;
+      token = content.token
     } catch (error) {
       return response.status(401).send({
         message: 'Cannot login to Franz',
         error: error,
-      });
+      })
     }
 
     // Get user information
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let userInf: any = false;
+    let userInf: any = false
     try {
-      userInf = await franzRequest('me', 'GET', token);
+      userInf = await franzRequest('me', 'GET', token)
     } catch (error) {
-      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${error}`;
-      return response.status(401).send(errorMessage);
+      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${error}`
+      return response.status(401).send(errorMessage)
     }
     if (!userInf) {
       const errorMessage =
-        'Could not get your user info from Franz. Please check your credentials or try again later';
-      return response.status(401).send(errorMessage);
+        'Could not get your user info from Franz. Please check your credentials or try again later'
+      return response.status(401).send(errorMessage)
     }
 
     // Create user in DB
-    let user;
+    let user
     try {
       user = await User.create({
         email: userInf.email,
         password: hashedPassword,
         username: userInf.firstname,
         lastname: userInf.lastname,
-      });
+      })
     } catch (error) {
-      const errorMessage = `Could not create your user in our system.\nError: ${error}`;
-      return response.status(401).send(errorMessage);
+      const errorMessage = `Could not create your user in our system.\nError: ${error}`
+      return response.status(401).send(errorMessage)
     }
 
-    const serviceIdTranslation = {};
+    const serviceIdTranslation = {}
 
     // Import services
     try {
-      const services = await franzRequest('me/services', 'GET', token);
+      const services = await franzRequest('me/services', 'GET', token)
 
       // @ts-expect-error
       for (const service of services) {
         // Get new, unused uuid
-        let serviceId;
+        let serviceId
         do {
-          serviceId = uuid();
+          serviceId = uuid()
         } while (
           // eslint-disable-next-line no-await-in-loop, unicorn/no-await-expression-member
           (await Service.query().where('serviceId', serviceId)).length > 0
-        );
+        )
 
         // eslint-disable-next-line no-await-in-loop
         await Service.create({
@@ -359,34 +344,34 @@ export default class UsersController {
           name: service.name,
           recipeId: service.recipeId,
           settings: JSON.stringify(service),
-        });
+        })
 
         // @ts-expect-error
-        serviceIdTranslation[service.id] = serviceId;
+        serviceIdTranslation[service.id] = serviceId
       }
     } catch (error) {
-      const errorMessage = `Could not import your services into our system.\nError: ${error}`;
-      return response.status(401).send(errorMessage);
+      const errorMessage = `Could not import your services into our system.\nError: ${error}`
+      return response.status(401).send(errorMessage)
     }
 
     // Import workspaces
     try {
-      const workspaces = await franzRequest('workspace', 'GET', token);
+      const workspaces = await franzRequest('workspace', 'GET', token)
 
       // @ts-expect-error
       for (const workspace of workspaces) {
-        let workspaceId;
+        let workspaceId
         do {
-          workspaceId = uuid();
+          workspaceId = uuid()
         } while (
           // eslint-disable-next-line unicorn/no-await-expression-member, no-await-in-loop
           (await Workspace.query().where('workspaceId', workspaceId)).length > 0
-        );
+        )
 
         const services = workspace.services.map(
           // @ts-expect-error
-          service => serviceIdTranslation[service],
-        );
+          (service) => serviceIdTranslation[service]
+        )
 
         // eslint-disable-next-line no-await-in-loop
         await Workspace.create({
@@ -396,15 +381,15 @@ export default class UsersController {
           order: workspace.order,
           services: JSON.stringify(services),
           data: JSON.stringify({}),
-        });
+        })
       }
     } catch (error) {
-      const errorMessage = `Could not import your workspaces into our system.\nError: ${error}`;
-      return response.status(401).send(errorMessage);
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${error}`
+      return response.status(401).send(errorMessage)
     }
 
     return response.send(
-      'Your account has been imported. You can now use your Franz/Ferdi account in Ferdium.',
-    );
+      'Your account has been imported. You can now use your Franz/Ferdi account in Ferdium.'
+    )
   }
 }