summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Controllers/Http/Api/Static/AnnouncementsController.ts2
-rw-r--r--app/Controllers/Http/RecipeController.ts2
-rw-r--r--app/Controllers/Http/ServiceController.ts2
-rw-r--r--app/Exceptions/Handler.ts23
-rw-r--r--app/Middleware/Auth.ts3
-rw-r--r--app/Middleware/Dashboard.ts4
-rw-r--r--app/Models/User.ts2
7 files changed, 8 insertions, 30 deletions
diff --git a/app/Controllers/Http/Api/Static/AnnouncementsController.ts b/app/Controllers/Http/Api/Static/AnnouncementsController.ts
index 090ee1c..565df5e 100644
--- a/app/Controllers/Http/Api/Static/AnnouncementsController.ts
+++ b/app/Controllers/Http/Api/Static/AnnouncementsController.ts
@@ -1,5 +1,5 @@
1import type { HttpContext } from '@adonisjs/core/http'; 1import type { HttpContext } from '@adonisjs/core/http';
2import { app } from '@adonisjs/core/services/app'; 2import app from '@adonisjs/core/services/app';
3import path from 'node:path'; 3import path from 'node:path';
4import fs from 'fs-extra'; 4import fs from 'fs-extra';
5 5
diff --git a/app/Controllers/Http/RecipeController.ts b/app/Controllers/Http/RecipeController.ts
index d30c59f..4d01a02 100644
--- a/app/Controllers/Http/RecipeController.ts
+++ b/app/Controllers/Http/RecipeController.ts
@@ -1,6 +1,6 @@
1import type { HttpContext } from '@adonisjs/core/http'; 1import type { HttpContext } from '@adonisjs/core/http';
2import fs from 'fs-extra'; 2import fs from 'fs-extra';
3import { app } from '@adonisjs/core/services/app'; 3import app from '@adonisjs/core/services/app';
4import path from 'node:path'; 4import path from 'node:path';
5import Recipe from '#app/Models/Recipe'; 5import Recipe from '#app/Models/Recipe';
6import { isCreationEnabled } from '#config/app'; 6import { isCreationEnabled } from '#config/app';
diff --git a/app/Controllers/Http/ServiceController.ts b/app/Controllers/Http/ServiceController.ts
index 8fec844..df5f623 100644
--- a/app/Controllers/Http/ServiceController.ts
+++ b/app/Controllers/Http/ServiceController.ts
@@ -5,7 +5,7 @@ import { url } from '#config/app';
5import { v4 as uuid } from 'uuid'; 5import { v4 as uuid } from 'uuid';
6import * as fs from 'fs-extra'; 6import * as fs from 'fs-extra';
7import path from 'node:path'; 7import path from 'node:path';
8import { app } from '@adonisjs/core/services/app'; 8import app from '@adonisjs/core/services/app';
9import sanitize from 'sanitize-filename'; 9import sanitize from 'sanitize-filename';
10 10
11const createSchema = schema.create({ 11const createSchema = schema.create({
diff --git a/app/Exceptions/Handler.ts b/app/Exceptions/Handler.ts
deleted file mode 100644
index 51764bc..0000000
--- a/app/Exceptions/Handler.ts
+++ /dev/null
@@ -1,23 +0,0 @@
1/*
2|--------------------------------------------------------------------------
3| Http Exception Handler
4|--------------------------------------------------------------------------
5|
6| AdonisJs will forward all exceptions occurred during an HTTP request to
7| the following class. You can learn more about exception handling by
8| reading docs.
9|
10| The exception handler extends a base `HttpExceptionHandler` which is not
11| mandatory, however it can do lot of heavy lifting to handle the errors
12| properly.
13|
14*/
15
16import logger from '@adonisjs/core/services/logger';
17import { ExceptionHandler as AdonisExceptionHandler } from '@adonisjs/core/http';
18
19export default class ExceptionHandler extends AdonisExceptionHandler {
20 constructor() {
21 super(logger);
22 }
23}
diff --git a/app/Middleware/Auth.ts b/app/Middleware/Auth.ts
index b6ff446..58d5b76 100644
--- a/app/Middleware/Auth.ts
+++ b/app/Middleware/Auth.ts
@@ -3,7 +3,7 @@ import { HttpContext } from '@adonisjs/core/http';
3import { AuthenticationException } from '@adonisjs/auth/build/standalone'; 3import { AuthenticationException } from '@adonisjs/auth/build/standalone';
4import * as jose from 'jose'; 4import * as jose from 'jose';
5import { appKey } from '#config/app'; 5import { appKey } from '#config/app';
6import User from '#app/Models/User'; 6import User from '#models/User';
7 7
8/** 8/**
9 * Auth middleware is meant to restrict un-authenticated access to a given route 9 * Auth middleware is meant to restrict un-authenticated access to a given route
@@ -94,6 +94,7 @@ export default class AuthMiddleware {
94 /** 94 /**
95 * Handle request 95 * Handle request
96 */ 96 */
97 // eslint-disable-next-line consistent-return
97 public async handle( 98 public async handle(
98 { request, auth, response }: HttpContext, 99 { request, auth, response }: HttpContext,
99 next: () => Promise<void>, 100 next: () => Promise<void>,
diff --git a/app/Middleware/Dashboard.ts b/app/Middleware/Dashboard.ts
index 19c8cfc..20113b7 100644
--- a/app/Middleware/Dashboard.ts
+++ b/app/Middleware/Dashboard.ts
@@ -1,9 +1,9 @@
1import type { HttpContext } from '@adonisjs/core/http'; 1import type { HttpContext } from '@adonisjs/core/http';
2import { Config } from '@adonisjs/core/config'; 2import config from '@adonisjs/core/services/config';
3 3
4export default class Dashboard { 4export default class Dashboard {
5 public async handle({ response }: HttpContext, next: () => Promise<void>) { 5 public async handle({ response }: HttpContext, next: () => Promise<void>) {
6 if (Config.get('dashboard.enabled') === false) { 6 if (config.get('dashboard.enabled') === false) {
7 response.send( 7 response.send(
8 'The user dashboard is disabled on this server\n\nIf you are the server owner, please set IS_DASHBOARD_ENABLED to true to enable the dashboard.', 8 'The user dashboard is disabled on this server\n\nIf you are the server owner, please set IS_DASHBOARD_ENABLED to true to enable the dashboard.',
9 ); 9 );
diff --git a/app/Models/User.ts b/app/Models/User.ts
index d292b3a..f744588 100644
--- a/app/Models/User.ts
+++ b/app/Models/User.ts
@@ -3,7 +3,7 @@ import { BaseModel, beforeSave, column, hasMany } from '@adonisjs/lucid/orm';
3import hash from '@adonisjs/core/services/hash'; 3import hash from '@adonisjs/core/services/hash';
4import emitter from '@adonisjs/core/services/emitter'; 4import emitter from '@adonisjs/core/services/emitter';
5import moment from 'moment'; 5import moment from 'moment';
6import Encryption from '@ioc:Adonis/Core/Encryption'; 6import { Encryption } from '@adonisjs/core/encryption';
7import randtoken from 'rand-token'; 7import randtoken from 'rand-token';
8import Token from './Token.js'; 8import Token from './Token.js';
9import Workspace from './Workspace.js'; 9import Workspace from './Workspace.js';