From e1c47572a6235fd8fd20af888ac3a11c7ae1369d Mon Sep 17 00:00:00 2001 From: MCMXC <16797721+mcmxcdev@users.noreply.github.com> Date: Sat, 10 Feb 2024 18:37:40 -0700 Subject: updates --- config/app.ts | 33 +++++++++++++++++---------------- config/auth.ts | 18 +++++++++++------- config/bodyparser.ts | 8 ++++---- config/cors.ts | 6 +++--- config/dashboard.ts | 6 +++--- config/database.ts | 16 ++++++++-------- config/drive.ts | 8 ++++---- config/hash.ts | 8 ++++---- config/mail.ts | 6 +++--- config/session.ts | 8 ++++---- config/shield.ts | 13 ++++++++----- config/static.ts | 6 +++--- 12 files changed, 72 insertions(+), 64 deletions(-) (limited to 'config') diff --git a/config/app.ts b/config/app.ts index 135f20f..5575bc1 100644 --- a/config/app.ts +++ b/config/app.ts @@ -5,12 +5,12 @@ * file. */ -import proxyAddr from 'proxy-addr' -import env from '#start/env' -import { ProfilerConfig } from '@ioc:Adonis/Core/Profiler' -import { LoggerConfig } from '@adonisjs/core/types/logger' -import { ValidatorConfig } from '@adonisjs/validator/types' -import { defineConfig } from '@adonisjs/core/http' +import proxyAddr from 'proxy-addr'; +import env from '#start/env'; +import { ProfilerConfig } from '@ioc:Adonis/Core/Profiler'; +import { LoggerConfig } from '@adonisjs/core/types/logger'; +import { ValidatorConfig } from '@adonisjs/validator/types'; +import { defineConfig } from '@adonisjs/core/http'; /* |-------------------------------------------------------------------------- @@ -25,17 +25,18 @@ import { defineConfig } from '@adonisjs/core/http' | be decrypted. | */ -export const appKey: string = env.get('APP_KEY') +export const appKey: string = env.get('APP_KEY'); -export const url: string = env.get('APP_URL') +export const url: string = env.get('APP_URL'); // TODO: this is parsed as string to be coherent with the previous version of the code we add (before migrating to AdonisJS 5) -export const isRegistrationEnabled: string = env.get('IS_REGISTRATION_ENABLED') -export const connectWithFranz: string = env.get('CONNECT_WITH_FRANZ') -export const isCreationEnabled: string = env.get('IS_CREATION_ENABLED') +export const isRegistrationEnabled: string = env.get('IS_REGISTRATION_ENABLED'); +export const connectWithFranz: string = env.get('CONNECT_WITH_FRANZ'); +export const isCreationEnabled: string = env.get('IS_CREATION_ENABLED'); export const jwtUsePEM: boolean = env.get('JWT_USE_PEM', false) || - (env.get('JWT_PUBLIC_KEY', '') !== '' && env.get('JWT_PRIVATE_KEY', '') !== '') + (env.get('JWT_PUBLIC_KEY', '') !== '' && + env.get('JWT_PRIVATE_KEY', '') !== ''); /* |-------------------------------------------------------------------------- | Http server configuration @@ -136,7 +137,7 @@ export const http = defineConfig({ | */ forceContentNegotiationTo: 'application/json', -}) +}); /* |-------------------------------------------------------------------------- @@ -190,7 +191,7 @@ export const logger: LoggerConfig = { | */ prettyPrint: env.get('NODE_ENV') === 'development', -} +}; /* |-------------------------------------------------------------------------- @@ -229,7 +230,7 @@ export const profiler: ProfilerConfig = { | */ whitelist: [], -} +}; /* |-------------------------------------------------------------------------- @@ -240,4 +241,4 @@ export const profiler: ProfilerConfig = { | to the default config https://git.io/JT0WE | */ -export const validator: ValidatorConfig = {} +export const validator: ValidatorConfig = {}; diff --git a/config/auth.ts b/config/auth.ts index f43bbdb..a3fcc45 100644 --- a/config/auth.ts +++ b/config/auth.ts @@ -5,9 +5,9 @@ * file. */ -import { AuthConfig } from '@ioc:Adonis/Addons/Auth' -import env from '#start/env' -import { appKey, jwtUsePEM } from './app.js' +import { AuthConfig } from '@ioc:Adonis/Addons/Auth'; +import env from '#start/env'; +import { appKey, jwtUsePEM } from './app.js'; /* |-------------------------------------------------------------------------- @@ -233,8 +233,12 @@ const authConfig: AuthConfig = { driver: 'jwt', secret: jwtUsePEM ? undefined : appKey, algorithmJwt: jwtUsePEM ? undefined : 'HS256', - publicKey: jwtUsePEM ? env.get('JWT_PUBLIC_KEY', '').replaceAll('\\n', '\n') : undefined, - privateKey: jwtUsePEM ? env.get('JWT_PRIVATE_KEY', '').replaceAll('\\n', '\n') : undefined, + publicKey: jwtUsePEM + ? env.get('JWT_PUBLIC_KEY', '').replaceAll('\\n', '\n') + : undefined, + privateKey: jwtUsePEM + ? env.get('JWT_PRIVATE_KEY', '').replaceAll('\\n', '\n') + : undefined, persistJwt: true, // TODO: We should improve the following implementation as this is a security concern. // The following ts-expect-error is to set exp to undefined (JWT with no expiration) @@ -254,6 +258,6 @@ const authConfig: AuthConfig = { }, }, }, -} +}; -export default authConfig +export default authConfig; diff --git a/config/bodyparser.ts b/config/bodyparser.ts index b3a027b..b8e6ed6 100644 --- a/config/bodyparser.ts +++ b/config/bodyparser.ts @@ -5,8 +5,8 @@ * file. */ -import { BodyParserConfig } from '@adonisjs/core/bodyparser' -import { defineConfig } from '@adonisjs/core/bodyparser' +import { BodyParserConfig } from '@adonisjs/core/bodyparser'; +import { defineConfig } from '@adonisjs/core/bodyparser'; const bodyParserConfig = defineConfig({ /* @@ -201,6 +201,6 @@ const bodyParserConfig = defineConfig({ */ types: ['multipart/form-data'], }, -}) +}); -export default bodyParserConfig +export default bodyParserConfig; diff --git a/config/cors.ts b/config/cors.ts index 911326f..ebb47aa 100644 --- a/config/cors.ts +++ b/config/cors.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@adonisjs/cors' +import { defineConfig } from '@adonisjs/cors'; const corsConfig = defineConfig({ /* @@ -122,6 +122,6 @@ const corsConfig = defineConfig({ | */ maxAge: 90, -}) +}); -export default corsConfig +export default corsConfig; diff --git a/config/dashboard.ts b/config/dashboard.ts index 9e92024..bbf7a71 100644 --- a/config/dashboard.ts +++ b/config/dashboard.ts @@ -1,5 +1,5 @@ -import env from '#start/env' +import env from '#start/env'; -export const enabled: boolean = env.get('IS_DASHBOARD_ENABLED') !== 'false' +export const enabled: boolean = env.get('IS_DASHBOARD_ENABLED') !== 'false'; -export const mailFrom: string = env.get('MAIL_SENDER') +export const mailFrom: string = env.get('MAIL_SENDER'); diff --git a/config/database.ts b/config/database.ts index d2db1c2..7e3774d 100644 --- a/config/database.ts +++ b/config/database.ts @@ -5,10 +5,10 @@ * file. */ -import path from 'node:path' -import env from '#start/env' -import { DatabaseConfig } from '@adonisjs/lucid/database' -import { defineConfig } from '@adonisjs/lucid' +import path from 'node:path'; +import env from '#start/env'; +import { DatabaseConfig } from '@adonisjs/lucid/database'; +import { defineConfig } from '@adonisjs/lucid'; const databaseConfig = defineConfig({ /* @@ -40,12 +40,12 @@ const databaseConfig = defineConfig({ connection: { filename: path.join( env.get('DATA_DIR', 'data'), - `${env.get('DB_DATABASE', 'ferdium')}.sqlite` + `${env.get('DB_DATABASE', 'ferdium')}.sqlite`, ), }, pool: { afterCreate: (conn, cb) => { - conn.run('PRAGMA foreign_keys=true', cb) + conn.run('PRAGMA foreign_keys=true', cb); }, }, migrations: { @@ -116,6 +116,6 @@ const databaseConfig = defineConfig({ debug: env.get('DB_DEBUG', false), }, }, -}) +}); -export default databaseConfig +export default databaseConfig; diff --git a/config/drive.ts b/config/drive.ts index f099303..98cc905 100644 --- a/config/drive.ts +++ b/config/drive.ts @@ -5,9 +5,9 @@ * file. */ -import env from '#start/env' -import { driveConfig } from '@adonisjs/core/build/config' -import { app } from '@adonisjs/core/services/app' +import env from '#start/env'; +import { driveConfig } from '@adonisjs/core/build/config'; +import { app } from '@adonisjs/core/services/app'; /* |-------------------------------------------------------------------------- @@ -146,4 +146,4 @@ export default driveConfig({ // usingUniformAcl: false, // }, }, -}) +}); diff --git a/config/hash.ts b/config/hash.ts index 22e38bd..38c8784 100644 --- a/config/hash.ts +++ b/config/hash.ts @@ -5,9 +5,9 @@ * file. */ -import env from '#start/env' -import { defineConfig } from '@adonisjs/core/hash' -import { drivers } from '@adonisjs/core/hash' +import env from '#start/env'; +import { defineConfig } from '@adonisjs/core/hash'; +import { drivers } from '@adonisjs/core/hash'; /* |-------------------------------------------------------------------------- @@ -83,7 +83,7 @@ export default defineConfig({ driver: 'legacy', }, }, -}) +}); declare module '@adonisjs/core/types' { export interface HashersList extends InferHashers {} diff --git a/config/mail.ts b/config/mail.ts index 7d650d5..ac67231 100644 --- a/config/mail.ts +++ b/config/mail.ts @@ -5,8 +5,8 @@ * file. */ -import env from '#start/env' -import { defineConfig } from '@adonisjs/mail' +import env from '#start/env'; +import { defineConfig } from '@adonisjs/mail'; export default defineConfig({ /* @@ -111,7 +111,7 @@ export default defineConfig({ key: env.get('SPARKPOST_API_KEY'), }), }, -}) +}); declare module '@adonisjs/mail/types' { export interface MailersList extends InferMailers {} diff --git a/config/session.ts b/config/session.ts index 299eec3..d3f5642 100644 --- a/config/session.ts +++ b/config/session.ts @@ -5,9 +5,9 @@ * file. */ -import env from '#start/env' -import { app } from '@adonisjs/core/services/app' -import { defineConfig } from '@adonisjs/session' +import env from '#start/env'; +import { app } from '@adonisjs/core/services/app'; +import { defineConfig } from '@adonisjs/session'; export default defineConfig({ /* @@ -113,4 +113,4 @@ export default defineConfig({ | */ redisConnection: 'local', -}) +}); diff --git a/config/shield.ts b/config/shield.ts index c88df25..ed69aa2 100644 --- a/config/shield.ts +++ b/config/shield.ts @@ -1,5 +1,5 @@ -import env from '#start/env' -import { defineConfig } from '@adonisjs/shield' +import env from '#start/env'; +import { defineConfig } from '@adonisjs/shield'; export default defineConfig({ csp: { @@ -67,9 +67,12 @@ export default defineConfig({ | ``` | */ - exceptRoutes: (ctx) => { + exceptRoutes: ctx => { // ignore all routes starting with /v1/ (api) - return ctx.request.url().includes('/v1/') || ctx.request.url().includes('/import') + return ( + ctx.request.url().includes('/v1/') || + ctx.request.url().includes('/import') + ); }, /* @@ -135,4 +138,4 @@ export default defineConfig({ contentTypeSniffing: { enabled: true, }, -}) +}); diff --git a/config/static.ts b/config/static.ts index 1d0d0c3..9ddeb9e 100644 --- a/config/static.ts +++ b/config/static.ts @@ -1,10 +1,10 @@ -import { defineConfig } from '@adonisjs/static' +import { defineConfig } from '@adonisjs/static'; const staticConfig = defineConfig({ enabled: true, dotFiles: 'ignore', etag: true, lastModified: true, -}) +}); -export default staticConfig +export default staticConfig; -- cgit v1.2.3-70-g09d2