5htp-core 0.0.8 → 0.1.0

package/src/server/services/router/request/index.ts

@@ -174,7 +174,7 @@ export default class ServerRequest extends BaseRequest {
 
             console.log("Validate request data:", this.data);
 
-            // Les ErreurSaisie seront propagées vers le middleware dédié à la gestion des erreurs
+            // Les InputError seront propagées vers le middleware dédié à la gestion des erreurs
             const { valeurs } = await validerSchema(
                 schema,
                 this.data, 

package/src/server/services/router/request/services/auth.ts

@@ -9,7 +9,7 @@ import jwt from 'jsonwebtoken';
 
 // Cre
 import app, { $ } from '@server/app';
-import { ErreurSaisie, AuthRequise, AccesRefuse } from '@common/errors';
+import { InputError, AuthRequired, Forbidden } from '@common/errors';
 import { TUserRole } from '@common/models';
 
 /*----------------------------------
@@ -70,7 +70,7 @@ export default class AuthService {
             // Une erreur s'affichera à chaque tentatove de login
             if (user.banned) {
                 req.res.clearCookie('authorization');
-                throw new AccesRefuse("Your account has been suspended. If you think it's a mistake, please contact me: contact@gaetan-legac.fr.");
+                throw new Forbidden("Your account has been suspended. If you think it's a mistake, please contact me: contact@gaetan-legac.fr.");
             }
 
         }
@@ -111,7 +111,7 @@ export default class AuthService {
         if (role === false) {
 
             if (user !== null)
-                throw new ErreurSaisie("You're already logged in.");
+                throw new InputError("You're already logged in.");
 
         } else if (role === 'DEV' && (process.env.environnement === 'local' || (user && user.roles.includes('ADMIN')))) {
 
@@ -121,13 +121,13 @@ export default class AuthService {
 
             console.warn("Refusé pour anonyme (" + this.request.ip + ")");
 
-            throw new AuthRequise(motivation);
+            throw new AuthRequired(motivation);
 
         } else if (!user.roles.includes(role)) {
 
             console.warn("Refusé: " + role + " pour " + user.name + " (" + (user.roles ? user.roles.join(', ') : 'role inconnu') + ")");
 
-            throw new AccesRefuse("You do not have sufficient permissions to access this resource.");
+            throw new Forbidden("You do not have sufficient permissions to access this resource.");
 
         } else {
 

package/src/server/services/router/request/services/detect.ts

@@ -6,7 +6,7 @@
 import express from 'express';
 
 // Core
-import { AccesRefuse } from '@common/errors';
+import { Forbidden } from '@common/errors';
 import request from '@server/data/ApiClient';
 import ServerRequest from '..';
 import TrackerService from './tracking';
@@ -54,7 +54,7 @@ export default class ProtectService {
         // If IP Address already used by another account
         /*const username = whitelist || this.request.user?.name;
         if (ip.user_name !== undefined && ip.user_name !== null && (username === undefined || username !== ip.user_name))
-            throw new AccesRefuse(`
+            throw new Forbidden(`
                 I noticed you're trying to use multiple accounts.
                 Only one account is allowed per IP address.
                 If you think I'm wrong, please contact me at contact@gaetan-legac.fr and I will solve the problem.
@@ -90,7 +90,7 @@ export default class ProtectService {
         });
 
         if (!token)
-            throw new AccesRefuse("Le captcha n'a pas été complété.");
+            throw new Forbidden("Le captcha n'a pas été complété.");
 
         const res = await request.post('https://www.google.com/recaptcha/api/siteverify', {}, {
             params: {
@@ -105,7 +105,7 @@ export default class ProtectService {
 
         const ok = res.success || false;
 
-        if (!ok) throw new AccesRefuse("Le captcha est incorrect");
+        if (!ok) throw new Forbidden("Le captcha est incorrect");
     }
 
 }

package/src/server/services/router/request/services/tracking.ts

@@ -9,7 +9,7 @@ import got from 'got';
 
 // Core
 import { arrayToObj } from '@common/data/tableaux';
-import { AccesRefuse } from '@common/errors';
+import { Forbidden } from '@common/errors';
 import requete from '@server/data/ApiClient';
 import app, { $ } from '@server/app';
 
@@ -183,7 +183,7 @@ export default class TrackerService {
 
             // Déjà banni
             if (ip.banned)
-                throw new AccesRefuse(`Banned for the following reason: ` + ip.banReason);
+                throw new Forbidden(`Banned for the following reason: ` + ip.banReason);
 
             // Données expirées
             const tempsDepuisDerniereMaj = dayjs().diff(ip.dateMaj, 'day');

package/src/server/services/router/response/index.ts

@@ -13,7 +13,7 @@ import express from 'express';
 
 // Core
 import { $ } from '@server/app';
-import { Introuvable, AccesRefuse } from '@common/errors';
+import { NotFound, Forbidden } from '@common/errors';
 
 // Libs métier
 import * as render from '../../../libs/pages/render';
@@ -174,7 +174,7 @@ export default class ServerResponse<TData extends TResponseData = TResponseData>
 
         // Securité
         if (fichier.includes('..'))
-            throw new AccesRefuse("Disallowed");
+            throw new Forbidden("Disallowed");
 
         // Force absolute path
         if (!fichier.startsWith( app.path.root ))
@@ -187,7 +187,7 @@ export default class ServerResponse<TData extends TResponseData = TResponseData>
         // Verif existance
         if (!fs.existsSync(fichier)) {
             console.log("File " + fichier + " was not found.");
-            throw new Introuvable();
+            throw new NotFound();
         }
 
         // envoi fichier

package/src/server/services/socket/index.ts

@@ -49,7 +49,7 @@ export class WebSocketCommander {
     public scopes: {[path: string]: SocketScope} = {}
 
     public constructor() {
-        app.on('cleanup', () => {
+        app.on('cleanup', async () => {
             this.closeAll();
         });
     }