diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-09-29 08:33:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-29 08:33:01 +0200 |
commit | 20574717c4b54635a8b757fccce64f2a98614997 (patch) | |
tree | 0f671af98b8253b13149c7bf5262d0b137881ecf /src/internal-server | |
parent | 5.6.3-nightly.17 [skip ci] (diff) | |
download | ferdium-app-20574717c4b54635a8b757fccce64f2a98614997.tar.gz ferdium-app-20574717c4b54635a8b757fccce64f2a98614997.tar.zst ferdium-app-20574717c4b54635a8b757fccce64f2a98614997.zip |
chore: update various outdated node_modules (#1969)
Diffstat (limited to 'src/internal-server')
3 files changed, 27 insertions, 36 deletions
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'); | |||
2 | const { validateAll } = use('Validator'); | 2 | const { validateAll } = use('Validator'); |
3 | const Env = use('Env'); | 3 | const Env = use('Env'); |
4 | 4 | ||
5 | const uuid = require('uuid/v4'); | 5 | const { v4: uuid } = require('uuid'); |
6 | const path = require('path'); | 6 | const path = require('path'); |
7 | const fs = require('fs-extra'); | 7 | const fs = require('fs-extra'); |
8 | const { LOCAL_HOSTNAME, DEFAULT_SERVICE_ORDER } = require('../../../../config'); | 8 | 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'); | |||
5 | 5 | ||
6 | const btoa = require('btoa'); | 6 | const btoa = require('btoa'); |
7 | const fetch = require('node-fetch'); | 7 | const fetch = require('node-fetch'); |
8 | const uuid = require('uuid/v4'); | 8 | const { v4: uuid } = require('uuid'); |
9 | const crypto = require('crypto'); | 9 | const crypto = require('crypto'); |
10 | const { | 10 | const { |
11 | DEFAULT_APP_SETTINGS, | 11 | 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 @@ | |||
1 | const Workspace = use('App/Models/Workspace'); | 1 | const Workspace = use('App/Models/Workspace'); |
2 | const { | 2 | const { validateAll } = use('Validator'); |
3 | validateAll, | ||
4 | } = use('Validator'); | ||
5 | 3 | ||
6 | const uuid = require('uuid/v4'); | 4 | const { v4: uuid } = require('uuid'); |
7 | 5 | ||
8 | class WorkspaceController { | 6 | class WorkspaceController { |
9 | // Create a new workspace for user | 7 | // Create a new workspace for user |
10 | async create({ | 8 | async create({ request, response }) { |
11 | request, | ||
12 | response, | ||
13 | }) { | ||
14 | // Validate user input | 9 | // Validate user input |
15 | const validation = await validateAll(request.all(), { | 10 | const validation = await validateAll(request.all(), { |
16 | name: 'required', | 11 | name: 'required', |
@@ -29,10 +24,13 @@ class WorkspaceController { | |||
29 | let workspaceId; | 24 | let workspaceId; |
30 | do { | 25 | do { |
31 | workspaceId = uuid(); | 26 | workspaceId = uuid(); |
32 | } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop | 27 | } while ( |
28 | (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows | ||
29 | .length > 0 | ||
30 | ); // eslint-disable-line no-await-in-loop | ||
33 | 31 | ||
34 | const order = (await Workspace.all()).rows.length; | 32 | const order = (await Workspace.all()).rows.length; |
35 | const name = data.name; | 33 | const { name } = data; |
36 | delete data.name; | 34 | delete data.name; |
37 | 35 | ||
38 | await Workspace.create({ | 36 | await Workspace.create({ |
@@ -52,11 +50,7 @@ class WorkspaceController { | |||
52 | }); | 50 | }); |
53 | } | 51 | } |
54 | 52 | ||
55 | async edit({ | 53 | async edit({ request, response, params }) { |
56 | request, | ||
57 | response, | ||
58 | params, | ||
59 | }) { | ||
60 | // Validate user input | 54 | // Validate user input |
61 | const validation = await validateAll(request.all(), { | 55 | const validation = await validateAll(request.all(), { |
62 | name: 'required', | 56 | name: 'required', |
@@ -71,20 +65,19 @@ class WorkspaceController { | |||
71 | } | 65 | } |
72 | 66 | ||
73 | const data = request.all(); | 67 | const data = request.all(); |
74 | const { | 68 | const { id } = params; |
75 | id, | ||
76 | } = params; | ||
77 | 69 | ||
78 | // Update data in database | 70 | // Update data in database |
79 | await (Workspace.query() | 71 | await Workspace.query() |
80 | .where('workspaceId', id)).update({ | 72 | .where('workspaceId', id) |
81 | name: data.name, | 73 | .update({ |
82 | services: JSON.stringify(data.services), | 74 | name: data.name, |
83 | }); | 75 | services: JSON.stringify(data.services), |
76 | }); | ||
84 | 77 | ||
85 | // Get updated row | 78 | // Get updated row |
86 | const workspace = (await Workspace.query() | 79 | const workspace = (await Workspace.query().where('workspaceId', id).fetch()) |
87 | .where('workspaceId', id).fetch()).rows[0]; | 80 | .rows[0]; |
88 | 81 | ||
89 | return response.send({ | 82 | return response.send({ |
90 | id: workspace.workspaceId, | 83 | id: workspace.workspaceId, |
@@ -113,13 +106,10 @@ class WorkspaceController { | |||
113 | }); | 106 | }); |
114 | } | 107 | } |
115 | 108 | ||
116 | const { | 109 | const { id } = params; |
117 | id, | ||
118 | } = params; | ||
119 | 110 | ||
120 | // Update data in database | 111 | // Update data in database |
121 | await (Workspace.query() | 112 | await Workspace.query().where('workspaceId', id).delete(); |
122 | .where('workspaceId', id)).delete(); | ||
123 | 113 | ||
124 | return response.send({ | 114 | return response.send({ |
125 | message: 'Successfully deleted workspace', | 115 | message: 'Successfully deleted workspace', |
@@ -127,9 +117,7 @@ class WorkspaceController { | |||
127 | } | 117 | } |
128 | 118 | ||
129 | // List all workspaces a user has created | 119 | // List all workspaces a user has created |
130 | async list({ | 120 | async list({ response }) { |
131 | response, | ||
132 | }) { | ||
133 | const workspaces = (await Workspace.all()).rows; | 121 | const workspaces = (await Workspace.all()).rows; |
134 | // Convert to array with all data Franz wants | 122 | // Convert to array with all data Franz wants |
135 | let workspacesArray = []; | 123 | let workspacesArray = []; |
@@ -138,7 +126,10 @@ class WorkspaceController { | |||
138 | id: workspace.workspaceId, | 126 | id: workspace.workspaceId, |
139 | name: workspace.name, | 127 | name: workspace.name, |
140 | order: workspace.order, | 128 | order: workspace.order, |
141 | services: typeof workspace.services === 'string' ? JSON.parse(workspace.services) : workspace.services, | 129 | services: |
130 | typeof workspace.services === 'string' | ||
131 | ? JSON.parse(workspace.services) | ||
132 | : workspace.services, | ||
142 | userId: 1, | 133 | userId: 1, |
143 | })); | 134 | })); |
144 | } | 135 | } |