chore: update outdated node_modules (#1807)

- upgrade 'uuid', '@types/uuid', 'macos-version', 'normalize-url' and 'os-name' dependencies to latest
- updated 'macos-version' imports to named imports

7 files changed, 190 insertions, 145 deletions

diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js
index 887af2903..fc2f9b72d 100644
--- a/src/electron/macOSPermissions.js
+++ b/src/electron/macOSPermissions.js
@@ -1,14 +1,17 @@
 import { systemPreferences, dialog } from 'electron';
 import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra';
-import macosVersion from 'macos-version';
+import { isMacOSVersionGreaterThanOrEqualTo } from 'macos-version';
 import { dirname } from 'path';
 import { askForScreenCaptureAccess } from 'node-mac-permissions';
 import { userDataPath } from '../environment';
 
 const debug = require('debug')('Ferdi:macOSPermissions');
 
-const isExplicitScreenCapturePermissionReqd = macosVersion.isGreaterThanOrEqualTo('10.15');
-debug(`Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`);
+const isExplicitScreenCapturePermissionReqd =
+  isMacOSVersionGreaterThanOrEqualTo('10.15');
+debug(
+  `Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`,
+);
 
 const filePath = userDataPath('.has-app-requested-screen-capture-permissions');
 
diff --git a/src/helpers/userAgent-helpers.ts b/src/helpers/userAgent-helpers.ts
index 73c8bfd03..dea49ad7e 100644
--- a/src/helpers/userAgent-helpers.ts
+++ b/src/helpers/userAgent-helpers.ts
@@ -1,12 +1,17 @@
 import os from 'os';
-import macosVersion from 'macos-version';
+import { macOSVersion } from 'macos-version';
 import { chrome } from 'useragent-generator';
 import {
-  chromeVersion, isMac, isWindows, is64Bit, osArch, osRelease,
+  chromeVersion,
+  isMac,
+  isWindows,
+  is64Bit,
+  osArch,
+  osRelease,
 } from '../environment';
 
 function macOS() {
-  const version = macosVersion() || '';
+  const version = macOSVersion() || '';
   let cpuName = os.cpus()[0].model.split(' ')[0];
   if (cpuName && cpuName.match(/\(/)) {
     cpuName = cpuName.split('(')[0];
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index c76a287f7..dea5a888e 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -2,7 +2,7 @@ const Service = use('App/Models/Service');
 const { validateAll } = use('Validator');
 const Env = use('Env');
 
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 const path = require('path');
 const fs = require('fs-extra');
 const { LOCAL_HOSTNAME } = require('../../../../config');
@@ -156,9 +156,7 @@ class ServiceController {
           id,
           name: service.name,
           ...newSettings,
-          iconUrl: `http://${hostname}:${port}/v1/icon/${
-            newSettings.iconId
-          }`,
+          iconUrl: `http://${hostname}:${port}/v1/icon/${newSettings.iconId}`,
           userId: 1,
         },
         status: ['updated'],
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index a3ad736fa..e387e39c4 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -1,41 +1,38 @@
 const User = use('App/Models/User');
 const Service = use('App/Models/Service');
 const Workspace = use('App/Models/Workspace');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 
 const btoa = require('btoa');
 const fetch = require('node-fetch');
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 const crypto = require('crypto');
 const { DEFAULT_APP_SETTINGS } = require('../../../../environment');
 
-const apiRequest = (url, route, method, auth) => new Promise((resolve, reject) => {
-  const base = `${url}/v1/`;
-  const user = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Ferdi/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36';
+const apiRequest = (url, route, method, auth) =>
+  new Promise((resolve, reject) => {
+    const base = `${url}/v1/`;
+    const user =
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Ferdi/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}`,
-        'User-Agent': user,
-      },
-    })
-      .then(data => data.json())
-      .then(json => resolve(json));
-  } catch (e) {
-    reject();
-  }
-});
+    try {
+      fetch(base + route, {
+        method,
+        headers: {
+          Authorization: `Bearer ${auth}`,
+          'User-Agent': user,
+        },
+      })
+        .then(data => data.json())
+        .then(json => resolve(json));
+    } catch (e) {
+      reject();
+    }
+  });
 
 class UserController {
   // Register a new user
-  async signup({
-    request,
-    response,
-  }) {
+  async signup({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       firstname: 'required',
@@ -52,15 +49,13 @@ class UserController {
 
     return response.send({
       message: 'Successfully created account',
-      token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M',
+      token:
+        'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M',
     });
   }
 
   // Login using an existing user
-  async login({
-    request,
-    response,
-  }) {
+  async login({ request, response }) {
     if (!request.header('Authorization')) {
       return response.status(401).send({
         message: 'Please provide authorization',
@@ -70,17 +65,19 @@ class UserController {
 
     return response.send({
       message: 'Successfully logged in',
-      token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M',
+      token:
+        'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M',
     });
   }
 
   // Return information about the current user
-  async me({
-    response,
-  }) {
+  async me({ response }) {
     const user = await User.find(1);
 
-    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',
@@ -94,14 +91,11 @@ class UserController {
       isSubscriptionOwner: true,
       lastname: 'Application',
       locale: DEFAULT_APP_SETTINGS.fallbackLocale,
-      ...settings || {},
+      ...(settings || {}),
     });
   }
 
-  async updateMe({
-    request,
-    response,
-  }) {
+  async updateMe({ request, response }) {
     const user = await User.find(1);
 
     let settings = user.settings || {};
@@ -132,16 +126,11 @@ class UserController {
         locale: DEFAULT_APP_SETTINGS.fallbackLocale,
         ...newSettings,
       },
-      status: [
-        'data-updated',
-      ],
+      status: ['data-updated'],
     });
   }
 
-  async import({
-    request,
-    response,
-  }) {
+  async import({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       email: 'required|email',
@@ -149,7 +138,8 @@ class UserController {
       server: 'required',
     });
     if (validation.fails()) {
-      let errorMessage = 'There was an error while trying to import your account:\n';
+      let errorMessage =
+        'There was an error while trying to import your account:\n';
       for (const message of validation.messages()) {
         if (message.validation === 'required') {
           errorMessage += `- Please make sure to supply your ${message.field}\n`;
@@ -162,16 +152,16 @@ class UserController {
       return response.status(401).send(errorMessage);
     }
 
-    const {
-      email,
-      password,
-      server,
-    } = request.all();
+    const { email, password, server } = request.all();
 
-    const hashedPassword = crypto.createHash('sha256').update(password).digest('base64');
+    const hashedPassword = crypto
+      .createHash('sha256')
+      .update(password)
+      .digest('base64');
 
     const base = `${server}/v1/`;
-    const userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Ferdi/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36';
+    const userAgent =
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Ferdi/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;
@@ -188,7 +178,8 @@ class UserController {
       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';
+        const errorMessage =
+          'Could not login into Franz with your supplied credentials. Please check and try again';
         return response.status(401).send(errorMessage);
       }
 
@@ -210,7 +201,8 @@ class UserController {
       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';
+      const errorMessage =
+        'Could not get your user info from Franz. Please check your credentials or try again later';
       return response.status(401).send(errorMessage);
     }
 
@@ -225,9 +217,14 @@ class UserController {
         let serviceId;
         do {
           serviceId = uuid();
-        } while ((await Service.query().where('serviceId', serviceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-        await Service.create({ // eslint-disable-line no-await-in-loop
+        } while (
+          // eslint-disable-next-line no-await-in-loop
+          (await Service.query().where('serviceId', serviceId).fetch()).rows
+            .length > 0
+        );
+
+        // eslint-disable-next-line no-await-in-loop
+        await Service.create({
           serviceId,
           name: service.name,
           recipeId: service.recipeId,
@@ -249,11 +246,18 @@ class UserController {
         let workspaceId;
         do {
           workspaceId = uuid();
-        } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-        const services = workspace.services.map(service => serviceIdTranslation[service]);
-
-        await Workspace.create({ // eslint-disable-line no-await-in-loop
+        } while (
+          // eslint-disable-next-line no-await-in-loop
+          (await Workspace.query().where('workspaceId', workspaceId).fetch())
+            .rows.length > 0
+        );
+
+        const services = workspace.services.map(
+          service => serviceIdTranslation[service],
+        );
+
+        // eslint-disable-next-line no-await-in-loop
+        await Workspace.create({
           workspaceId,
           name: workspace.name,
           order: workspace.order,
@@ -266,7 +270,9 @@ class UserController {
       return response.status(401).send(errorMessage);
     }
 
-    return response.send('Your account has been imported. You can now use your Franz account in Ferdi.');
+    return response.send(
+      'Your account has been imported. You can now use your Franz account in Ferdi.',
+    );
   }
 
   // Account import/export
@@ -291,10 +297,7 @@ class UserController {
       .send(exportData);
   }
 
-  async importFerdi({
-    request,
-    response,
-  }) {
+  async importFerdi({ request, response }) {
     const validation = await validateAll(request.all(), {
       file: 'required',
     });
@@ -306,7 +309,9 @@ class UserController {
     try {
       file = JSON.parse(request.input('file'));
     } catch (e) {
-      return response.send('Could not import: Invalid file, could not read file');
+      return response.send(
+        'Could not import: Invalid file, could not read file',
+      );
     }
 
     if (!file || !file.services || !file.workspaces) {
@@ -322,9 +327,14 @@ class UserController {
         let serviceId;
         do {
           serviceId = uuid();
-        } while ((await Service.query().where('serviceId', serviceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-        await Service.create({ // eslint-disable-line no-await-in-loop
+        } while (
+          // eslint-disable-next-line no-await-in-loop
+          (await Service.query().where('serviceId', serviceId).fetch()).rows
+            .length > 0
+        );
+
+        // eslint-disable-next-line no-await-in-loop
+        await Service.create({
           serviceId,
           name: service.name,
           recipeId: service.recipeId,
@@ -344,13 +354,19 @@ class UserController {
         let workspaceId;
         do {
           workspaceId = uuid();
-        } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-        const services = (workspace.services && typeof (workspace.services) === 'object') ?
-          workspace.services.map((service) => serviceIdTranslation[service]) :
-          [];
-
-        await Workspace.create({ // eslint-disable-line no-await-in-loop
+        } while (
+          // eslint-disable-next-line no-await-in-loop
+          (await Workspace.query().where('workspaceId', workspaceId).fetch())
+            .rows.length > 0
+        );
+
+        const services =
+          workspace.services && typeof workspace.services === 'object'
+            ? workspace.services.map(service => serviceIdTranslation[service])
+            : [];
+
+        // eslint-disable-next-line no-await-in-loop
+        await Workspace.create({
           workspaceId,
           name: workspace.name,
           order: workspace.order,
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 4189fbcdd..f1a5ddf2b 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -1,16 +1,11 @@
 const Workspace = use('App/Models/Workspace');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 
 class WorkspaceController {
   // Create a new workspace for user
-  async create({
-    request,
-    response,
-  }) {
+  async create({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -29,7 +24,10 @@ class WorkspaceController {
     let workspaceId;
     do {
       workspaceId = uuid();
-    } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+    } while (
+      (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows
+        .length > 0
+    ); // eslint-disable-line no-await-in-loop
 
     const order = (await Workspace.all()).rows.length;
 
@@ -50,11 +48,7 @@ class WorkspaceController {
     });
   }
 
-  async edit({
-    request,
-    response,
-    params,
-  }) {
+  async edit({ request, response, params }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -69,20 +63,19 @@ class WorkspaceController {
     }
 
     const data = request.all();
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Update data in database
-    await (Workspace.query()
-      .where('workspaceId', id)).update({
-      name: data.name,
-      services: JSON.stringify(data.services),
-    });
+    await Workspace.query()
+      .where('workspaceId', id)
+      .update({
+        name: data.name,
+        services: JSON.stringify(data.services),
+      });
 
     // Get updated row
-    const workspace = (await Workspace.query()
-      .where('workspaceId', id).fetch()).rows[0];
+    const workspace = (await Workspace.query().where('workspaceId', id).fetch())
+      .rows[0];
 
     return response.send({
       id: workspace.workspaceId,
@@ -111,13 +104,10 @@ class WorkspaceController {
       });
     }
 
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Update data in database
-    await (Workspace.query()
-      .where('workspaceId', id)).delete();
+    await Workspace.query().where('workspaceId', id).delete();
 
     return response.send({
       message: 'Successfully deleted workspace',
@@ -125,9 +115,7 @@ class WorkspaceController {
   }
 
   // List all workspaces a user has created
-  async list({
-    response,
-  }) {
+  async list({ response }) {
     const workspaces = (await Workspace.all()).rows;
     // Convert to array with all data Franz wants
     let workspacesArray = [];
@@ -136,7 +124,10 @@ class WorkspaceController {
         id: workspace.workspaceId,
         name: workspace.name,
         order: workspace.order,
-        services: typeof workspace.services === 'string' ? JSON.parse(workspace.services) : workspace.services,
+        services:
+          typeof workspace.services === 'string'
+            ? JSON.parse(workspace.services)
+            : workspace.services,
         userId: 1,
       }));
     }
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index f5970f7e7..c629e212d 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,8 +1,14 @@
 import {
-  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain,
+  app,
+  Menu,
+  nativeImage,
+  nativeTheme,
+  systemPreferences,
+  Tray,
+  ipcMain,
 } from 'electron';
 import { join } from 'path';
-import macosVersion from 'macos-version';
+import { isMacOSVersionGreaterThanOrEqualTo } from 'macos-version';
 import { isMac, isWindows, isLinux } from '../environment';
 
 const FILE_EXTENSION = isWindows ? 'ico' : 'png';
@@ -64,7 +70,9 @@ export default class TrayIcon {
 
     if (appSettings.type === 'app') {
       const { isAppMuted } = appSettings.data;
-      this.trayMenuTemplate[1].label = isAppMuted ? 'Enable Notifications && Audio' : 'Disable Notifications && Audio';
+      this.trayMenuTemplate[1].label = isAppMuted
+        ? 'Enable Notifications && Audio'
+        : 'Disable Notifications && Audio';
       this.trayMenu = Menu.buildFromTemplate(this.trayMenuTemplate);
       if (isLinux) {
         this.trayIcon.setContextMenu(this.trayMenu);
@@ -107,9 +115,12 @@ export default class TrayIcon {
     }
 
     if (isMac) {
-      this.themeChangeSubscriberId = systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
-        this._refreshIcon();
-      });
+      this.themeChangeSubscriberId = systemPreferences.subscribeNotification(
+        'AppleInterfaceThemeChangedNotification',
+        () => {
+          this._refreshIcon();
+        },
+      );
     }
   }
 
@@ -149,7 +160,8 @@ export default class TrayIcon {
   _getAssetFromIndicator(indicator) {
     if (indicator === '•') {
       return INDICATOR_TRAY_INDIRECT;
-    } if (indicator !== 0) {
+    }
+    if (indicator !== 0) {
       return INDICATOR_TRAY_UNREAD;
     }
     return INDICATOR_TRAY_PLAIN;
@@ -158,11 +170,16 @@ export default class TrayIcon {
   _refreshIcon() {
     if (!this.trayIcon) return;
 
-    this.trayIcon.setImage(this._getAsset('tray', this._getAssetFromIndicator(this.indicator)));
+    this.trayIcon.setImage(
+      this._getAsset('tray', this._getAssetFromIndicator(this.indicator)),
+    );
 
     if (isMac) {
       this.trayIcon.setPressedImage(
-        this._getAsset('tray', `${this._getAssetFromIndicator(this.indicator)}-active`),
+        this._getAsset(
+          'tray',
+          `${this._getAssetFromIndicator(this.indicator)}-active`,
+        ),
       );
     }
   }
@@ -170,12 +187,24 @@ export default class TrayIcon {
   _getAsset(type, asset) {
     let { platform } = process;
 
-    if (isMac && (nativeTheme.shouldUseDarkColors || macosVersion.isGreaterThanOrEqualTo('11'))) {
+    if (
+      isMac &&
+      (nativeTheme.shouldUseDarkColors ||
+        isMacOSVersionGreaterThanOrEqualTo('11'))
+    ) {
       platform = `${platform}-dark`;
     }
 
-    return nativeImage.createFromPath(join(
-      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
-    ));
+    return nativeImage.createFromPath(
+      join(
+        __dirname,
+        '..',
+        'assets',
+        'images',
+        type,
+        platform,
+        `${asset}.${FILE_EXTENSION}`,
+      ),
+    );
   }
 }
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 205a3220c..73cdb89d4 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -1,22 +1,25 @@
 import { ipcRenderer } from 'electron';
-import uuidV1 from 'uuid/v1';
+import { v1 as uuidV1 } from 'uuid';
 
 const debug = require('debug')('Ferdi:Notifications');
 
 export class NotificationsHandler {
-  onNotify = (data) => data;
+  onNotify = data => data;
 
   displayNotification(title, options) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       debug('New notification', title, options);
 
       const notificationId = uuidV1();
 
-      ipcRenderer.sendToHost('notification', this.onNotify({
-        title,
-        options,
-        notificationId,
-      }));
+      ipcRenderer.sendToHost(
+        'notification',
+        this.onNotify({
+          title,
+          options,
+          notificationId,
+        }),
+      );
 
       ipcRenderer.once(`notification-onclick:${notificationId}`, () => {
         resolve();