From 20574717c4b54635a8b757fccce64f2a98614997 Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Wed, 29 Sep 2021 08:33:01 +0200
Subject: chore: update various outdated node_modules (#1969)

---
 .../app/Controllers/Http/ServiceController.js      |  2 +-
 .../app/Controllers/Http/UserController.js         |  2 +-
 .../app/Controllers/Http/WorkspaceController.js    | 59 +++++++++-------------
 3 files changed, 27 insertions(+), 36 deletions(-)

(limited to 'src/internal-server/app/Controllers/Http')

diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index ae463617d..133473b68 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, DEFAULT_SERVICE_ORDER } = require('../../../../config');
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 7b71aac14..747606da7 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -5,7 +5,7 @@ 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,
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 773312a0b..9d461135e 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,10 +24,13 @@ 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;
-    const name = data.name;
+    const { name } = data;
     delete data.name;
 
     await Workspace.create({
@@ -52,11 +50,7 @@ class WorkspaceController {
     });
   }
 
-  async edit({
-    request,
-    response,
-    params,
-  }) {
+  async edit({ request, response, params }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -71,20 +65,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,
@@ -113,13 +106,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',
@@ -127,9 +117,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 = [];
@@ -138,7 +126,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,
       }));
     }
-- 
cgit v1.2.3-70-g09d2