aboutsummaryrefslogtreecommitdiffstats
path: root/src/internal-server
diff options
context:
space:
mode:
authorLibravatar Markus Hatvan <markus_hatvan@aon.at>2021-10-15 09:48:06 +0200
committerLibravatar GitHub <noreply@github.com>2021-10-15 09:48:06 +0200
commit14d2364fc69e0222133115c55a36286986006098 (patch)
tree9e9b3c41ef742bbe87ca1632b292c67043051957 /src/internal-server
parent5.6.3-nightly.34 [skip ci] (diff)
downloadferdium-app-14d2364fc69e0222133115c55a36286986006098.tar.gz
ferdium-app-14d2364fc69e0222133115c55a36286986006098.tar.zst
ferdium-app-14d2364fc69e0222133115c55a36286986006098.zip
chore: update eslint setup (#2074)
Diffstat (limited to 'src/internal-server')
-rw-r--r--src/internal-server/app/Controllers/Http/RecipeController.js2
-rw-r--r--src/internal-server/app/Controllers/Http/ServiceController.js2
-rw-r--r--src/internal-server/app/Controllers/Http/UserController.js5
-rw-r--r--src/internal-server/app/Controllers/Http/WorkspaceController.js2
-rw-r--r--src/internal-server/config/app.js1
-rw-r--r--src/internal-server/config/bodyParser.js12
-rw-r--r--src/internal-server/database/migrations/1503250034279_user.js2
-rw-r--r--src/internal-server/database/migrations/1566385379883_service_schema.js2
-rw-r--r--src/internal-server/database/migrations/1566554231482_recipe_schema.js2
-rw-r--r--src/internal-server/database/migrations/1566554359294_workspace_schema.js2
-rw-r--r--src/internal-server/start/app.js9
11 files changed, 16 insertions, 25 deletions
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index d44839db1..1b0ac7035 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -56,7 +56,6 @@ class RecipeController {
56 let remoteResults = []; 56 let remoteResults = [];
57 // eslint-disable-next-line eqeqeq 57 // eslint-disable-next-line eqeqeq
58 if (Env.get('CONNECT_WITH_FRANZ') == 'true') { 58 if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
59 // eslint-disable-line eqeqeq
60 remoteResults = JSON.parse( 59 remoteResults = JSON.parse(
61 await ( 60 await (
62 await fetch( 61 await fetch(
@@ -112,7 +111,6 @@ class RecipeController {
112 } 111 }
113 // eslint-disable-next-line eqeqeq 112 // eslint-disable-next-line eqeqeq
114 if (Env.get('CONNECT_WITH_FRANZ') == 'true') { 113 if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
115 // eslint-disable-line eqeqeq
116 return response.redirect(`${RECIPES_URL}/download/${service}`); 114 return response.redirect(`${RECIPES_URL}/download/${service}`);
117 } 115 }
118 return response.status(400).send({ 116 return response.status(400).send({
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index 133473b68..dedb5a12b 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -36,7 +36,7 @@ class ServiceController {
36 } while ( 36 } while (
37 (await Service.query().where('serviceId', serviceId).fetch()).rows 37 (await Service.query().where('serviceId', serviceId).fetch()).rows
38 .length > 0 38 .length > 0
39 ); // eslint-disable-line no-await-in-loop 39 );
40 40
41 await Service.create({ 41 await Service.create({
42 serviceId, 42 serviceId,
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 25b5277bd..2ecc8241c 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -171,7 +171,6 @@ class UserController {
171 return response.status(401).send(errorMessage); 171 return response.status(401).send(errorMessage);
172 } 172 }
173 173
174 // eslint-disable-next-line prefer-destructuring
175 token = content.token; 174 token = content.token;
176 } catch (error) { 175 } catch (error) {
177 return response.status(401).send({ 176 return response.status(401).send({
@@ -300,7 +299,7 @@ class UserController {
300 } while ( 299 } while (
301 (await Workspace.query().where('workspaceId', newWorkspaceId).fetch()) 300 (await Workspace.query().where('workspaceId', newWorkspaceId).fetch())
302 .rows.length > 0 301 .rows.length > 0
303 ); // eslint-disable-line no-await-in-loop 302 );
304 303
305 if ( 304 if (
306 workspace.services && 305 workspace.services &&
@@ -340,7 +339,7 @@ class UserController {
340 } while ( 339 } while (
341 (await Service.query().where('serviceId', newServiceId).fetch()).rows 340 (await Service.query().where('serviceId', newServiceId).fetch()).rows
342 .length > 0 341 .length > 0
343 ); // eslint-disable-line no-await-in-loop 342 );
344 343
345 // store the old serviceId as the key for future lookup 344 // store the old serviceId as the key for future lookup
346 serviceIdTranslation[service.serviceId] = newServiceId; 345 serviceIdTranslation[service.serviceId] = newServiceId;
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 9d461135e..528721f13 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -27,7 +27,7 @@ class WorkspaceController {
27 } while ( 27 } while (
28 (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows 28 (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows
29 .length > 0 29 .length > 0
30 ); // eslint-disable-line no-await-in-loop 30 );
31 31
32 const order = (await Workspace.all()).rows.length; 32 const order = (await Workspace.all()).rows.length;
33 const { name } = data; 33 const { name } = data;
diff --git a/src/internal-server/config/app.js b/src/internal-server/config/app.js
index 0a1644932..379190734 100644
--- a/src/internal-server/config/app.js
+++ b/src/internal-server/config/app.js
@@ -2,7 +2,6 @@
2const Env = use('Env'); 2const Env = use('Env');
3 3
4module.exports = { 4module.exports = {
5
6 /* 5 /*
7 |-------------------------------------------------------------------------- 6 |--------------------------------------------------------------------------
8 | Application Name 7 | Application Name
diff --git a/src/internal-server/config/bodyParser.js b/src/internal-server/config/bodyParser.js
index 8a5406f9e..ef2eedf40 100644
--- a/src/internal-server/config/bodyParser.js
+++ b/src/internal-server/config/bodyParser.js
@@ -58,9 +58,7 @@ module.exports = {
58 | 58 |
59 */ 59 */
60 raw: { 60 raw: {
61 types: [ 61 types: ['text/*'],
62 'text/*',
63 ],
64 }, 62 },
65 63
66 /* 64 /*
@@ -72,9 +70,7 @@ module.exports = {
72 | 70 |
73 */ 71 */
74 form: { 72 form: {
75 types: [ 73 types: ['application/x-www-form-urlencoded'],
76 'application/x-www-form-urlencoded',
77 ],
78 }, 74 },
79 75
80 /* 76 /*
@@ -86,9 +82,7 @@ module.exports = {
86 | 82 |
87 */ 83 */
88 files: { 84 files: {
89 types: [ 85 types: ['multipart/form-data'],
90 'multipart/form-data',
91 ],
92 86
93 /* 87 /*
94 |-------------------------------------------------------------------------- 88 |--------------------------------------------------------------------------
diff --git a/src/internal-server/database/migrations/1503250034279_user.js b/src/internal-server/database/migrations/1503250034279_user.js
index 80b49020a..d502e4fa0 100644
--- a/src/internal-server/database/migrations/1503250034279_user.js
+++ b/src/internal-server/database/migrations/1503250034279_user.js
@@ -3,7 +3,7 @@ const Schema = use('Schema');
3 3
4class UserSchema extends Schema { 4class UserSchema extends Schema {
5 up() { 5 up() {
6 this.create('users', (table) => { 6 this.create('users', table => {
7 table.increments(); 7 table.increments();
8 table.json('settings'); 8 table.json('settings');
9 table.timestamps(); 9 table.timestamps();
diff --git a/src/internal-server/database/migrations/1566385379883_service_schema.js b/src/internal-server/database/migrations/1566385379883_service_schema.js
index d887ef193..d8087248f 100644
--- a/src/internal-server/database/migrations/1566385379883_service_schema.js
+++ b/src/internal-server/database/migrations/1566385379883_service_schema.js
@@ -3,7 +3,7 @@ const Schema = use('Schema');
3 3
4class ServiceSchema extends Schema { 4class ServiceSchema extends Schema {
5 up() { 5 up() {
6 this.create('services', (table) => { 6 this.create('services', table => {
7 table.increments(); 7 table.increments();
8 table.string('serviceId', 80).notNullable(); 8 table.string('serviceId', 80).notNullable();
9 table.string('name', 80).notNullable(); 9 table.string('name', 80).notNullable();
diff --git a/src/internal-server/database/migrations/1566554231482_recipe_schema.js b/src/internal-server/database/migrations/1566554231482_recipe_schema.js
index 514d57600..41bebdacb 100644
--- a/src/internal-server/database/migrations/1566554231482_recipe_schema.js
+++ b/src/internal-server/database/migrations/1566554231482_recipe_schema.js
@@ -3,7 +3,7 @@ const Schema = use('Schema');
3 3
4class RecipeSchema extends Schema { 4class RecipeSchema extends Schema {
5 up() { 5 up() {
6 this.create('recipes', (table) => { 6 this.create('recipes', table => {
7 table.increments(); 7 table.increments();
8 table.string('name', 80).notNullable(); 8 table.string('name', 80).notNullable();
9 table.string('recipeId', 254).notNullable().unique(); 9 table.string('recipeId', 254).notNullable().unique();
diff --git a/src/internal-server/database/migrations/1566554359294_workspace_schema.js b/src/internal-server/database/migrations/1566554359294_workspace_schema.js
index 421a406b5..3e5385f45 100644
--- a/src/internal-server/database/migrations/1566554359294_workspace_schema.js
+++ b/src/internal-server/database/migrations/1566554359294_workspace_schema.js
@@ -3,7 +3,7 @@ const Schema = use('Schema');
3 3
4class WorkspaceSchema extends Schema { 4class WorkspaceSchema extends Schema {
5 up() { 5 up() {
6 this.create('workspaces', (table) => { 6 this.create('workspaces', table => {
7 table.increments(); 7 table.increments();
8 table.string('workspaceId', 80).notNullable().unique(); 8 table.string('workspaceId', 80).notNullable().unique();
9 table.string('name', 80).notNullable(); 9 table.string('name', 80).notNullable();
diff --git a/src/internal-server/start/app.js b/src/internal-server/start/app.js
index 8b1a49f57..7ca544085 100644
--- a/src/internal-server/start/app.js
+++ b/src/internal-server/start/app.js
@@ -28,9 +28,7 @@ const providers = [
28| Providers for migrations, tests etc. 28| Providers for migrations, tests etc.
29| 29|
30*/ 30*/
31const aceProviders = [ 31const aceProviders = ['@adonisjs/lucid/providers/MigrationsProvider'];
32 '@adonisjs/lucid/providers/MigrationsProvider',
33];
34 32
35/* 33/*
36|-------------------------------------------------------------------------- 34|--------------------------------------------------------------------------
@@ -57,5 +55,8 @@ const aliases = {};
57const commands = []; 55const commands = [];
58 56
59module.exports = { 57module.exports = {
60 providers, aceProviders, aliases, commands, 58 providers,
59 aceProviders,
60 aliases,
61 commands,
61}; 62};