Revert "chore: update outdated node_modules (#1807)"

This reverts commit 26a9dba22236bc22a7612107630282cfe02d20e0.

7 files changed, 145 insertions, 190 deletions

diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js
index fc2f9b72d..887af2903 100644
--- a/src/electron/macOSPermissions.js
+++ b/src/electron/macOSPermissions.js
@@ -1,17 +1,14 @@
 import { systemPreferences, dialog } from 'electron';
 import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra';
-import { isMacOSVersionGreaterThanOrEqualTo } from 'macos-version';
+import macosVersion 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 =
-  isMacOSVersionGreaterThanOrEqualTo('10.15');
-debug(
-  `Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`,
-);
+const isExplicitScreenCapturePermissionReqd = macosVersion.isGreaterThanOrEqualTo('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 dea49ad7e..73c8bfd03 100644
--- a/src/helpers/userAgent-helpers.ts
+++ b/src/helpers/userAgent-helpers.ts
@@ -1,17 +1,12 @@
 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 dea5a888e..c76a287f7 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 { v4: uuid } = require('uuid');
+const uuid = require('uuid/v4');
 const path = require('path');
 const fs = require('fs-extra');
 const { LOCAL_HOSTNAME } = require('../../../../config');
@@ -156,7 +156,9 @@ 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 e387e39c4..a3ad736fa 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -1,38 +1,41 @@
 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 { v4: uuid } = require('uuid');
+const uuid = require('uuid/v4');
 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',
@@ -49,13 +52,15 @@ 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',
@@ -65,19 +70,17 @@ 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',
@@ -91,11 +94,14 @@ 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 || {};
@@ -126,11 +132,16 @@ 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',
@@ -138,8 +149,7 @@ 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`;
@@ -152,16 +162,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;
@@ -178,8 +188,7 @@ 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);
       }
 
@@ -201,8 +210,7 @@ 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);
     }
 
@@ -217,14 +225,9 @@ class UserController {
         let serviceId;
         do {
           serviceId = uuid();
-        } 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({
+        } 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
           serviceId,
           name: service.name,
           recipeId: service.recipeId,
@@ -246,18 +249,11 @@ class UserController {
         let workspaceId;
         do {
           workspaceId = uuid();
-        } 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({
+        } 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
           workspaceId,
           name: workspace.name,
           order: workspace.order,
@@ -270,9 +266,7 @@ 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
@@ -297,7 +291,10 @@ class UserController {
       .send(exportData);
   }
 
-  async importFerdi({ request, response }) {
+  async importFerdi({
+    request,
+    response,
+  }) {
     const validation = await validateAll(request.all(), {
       file: 'required',
     });
@@ -309,9 +306,7 @@ 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) {
@@ -327,14 +322,9 @@ class UserController {
         let serviceId;
         do {
           serviceId = uuid();
-        } 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({
+        } 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
           serviceId,
           name: service.name,
           recipeId: service.recipeId,
@@ -354,19 +344,13 @@ class UserController {
         let workspaceId;
         do {
           workspaceId = uuid();
-        } 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({
+        } 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
           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 f1a5ddf2b..4189fbcdd 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -1,11 +1,16 @@
 const Workspace = use('App/Models/Workspace');
-const { validateAll } = use('Validator');
+const {
+  validateAll,
+} = use('Validator');
 
-const { v4: uuid } = require('uuid');
+const uuid = require('uuid/v4');
 
 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',
@@ -24,10 +29,7 @@ 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;
 
@@ -48,7 +50,11 @@ class WorkspaceController {
     });
   }
 
-  async edit({ request, response, params }) {
+  async edit({
+    request,
+    response,
+    params,
+  }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -63,19 +69,20 @@ 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,
@@ -104,10 +111,13 @@ 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',
@@ -115,7 +125,9 @@ 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 = [];
@@ -124,10 +136,7 @@ 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 c629e212d..f5970f7e7 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,14 +1,8 @@
 import {
-  app,
-  Menu,
-  nativeImage,
-  nativeTheme,
-  systemPreferences,
-  Tray,
-  ipcMain,
+  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain,
 } from 'electron';
 import { join } from 'path';
-import { isMacOSVersionGreaterThanOrEqualTo } from 'macos-version';
+import macosVersion from 'macos-version';
 import { isMac, isWindows, isLinux } from '../environment';
 
 const FILE_EXTENSION = isWindows ? 'ico' : 'png';
@@ -70,9 +64,7 @@ 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);
@@ -115,12 +107,9 @@ export default class TrayIcon {
     }
 
     if (isMac) {
-      this.themeChangeSubscriberId = systemPreferences.subscribeNotification(
-        'AppleInterfaceThemeChangedNotification',
-        () => {
-          this._refreshIcon();
-        },
-      );
+      this.themeChangeSubscriberId = systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
+        this._refreshIcon();
+      });
     }
   }
 
@@ -160,8 +149,7 @@ 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;
@@ -170,16 +158,11 @@ 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`),
       );
     }
   }
@@ -187,24 +170,12 @@ export default class TrayIcon {
   _getAsset(type, asset) {
     let { platform } = process;
 
-    if (
-      isMac &&
-      (nativeTheme.shouldUseDarkColors ||
-        isMacOSVersionGreaterThanOrEqualTo('11'))
-    ) {
+    if (isMac && (nativeTheme.shouldUseDarkColors || macosVersion.isGreaterThanOrEqualTo('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 73cdb89d4..205a3220c 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -1,25 +1,22 @@
 import { ipcRenderer } from 'electron';
-import { v1 as uuidV1 } from 'uuid';
+import uuidV1 from 'uuid/v1';
 
 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();