5htp-core 0.0.9 → 0.1.0

package/src/client/components/containers/tabs/index.tsx

@@ -55,7 +55,7 @@ export const MenuOnglets = (props: JSX.HTMLAttributes<HTMLDivElement>) => {
 
     const onglets = React.useContext(ContexteOnglets);
     if (onglets === null)
-        return <>Contexte onglets introuvable</>;
+        return <>Contexte onglets NotFound</>;
 
     return (
         <ul {...props} className={"row tabs" + (props.className ? ' ' + props.className : '')}>
@@ -76,7 +76,7 @@ export const Onglet = ({ id, children, asDiv, ...props }: {
 
     const onglets = React.useContext(ContexteOnglets);
     if (onglets === null)
-        return <>Contexte onglets introuvable</>;
+        return <>Contexte onglets NotFound</>;
 
     if (id !== onglets.actuel)
         return null;

package/src/client/components/data/progressbar/index.less

@@ -12,7 +12,7 @@ div.progressbar {
     }
 
     > .progress {
-        --cBg: var(--c1);
+        --cBg: var(--cAccent);
         background: var(--cBg);
         width: 0%;
         max-width: 100%;

package/src/client/components/data/progressbar/index.tsx

@@ -39,9 +39,9 @@ const hsl = (h: number, s: number = 80, l: number = 70) => `hsl(${Math.floor(h)}
 export const couleurViaPc = (pc: number, couleurs: [number, number], ecart: number) => {
 
     return { 
-        couleur1: 'var(--c1)', 
-        couleur2: 'var(--c1)',
-        couleurTxt: 'var(--c1)'
+        couleur1: 'var(--cAccent)', 
+        couleur2: 'var(--cAccent)',
+        couleurTxt: 'var(--cAccent)'
     }
     const [couleurMin, couleurMax] = couleurs;
     const couleur = couleurMin + (pc * (couleurMax - couleurMin));

package/src/client/components/input/BaseV2/index.less

@@ -1,6 +1,6 @@
 @import (reference) '~@/client/assets/theme.less';
 
-@hInput: @sizeComponent * 1.2;
+@hInput: @sizeComponent;
 
 // TODO: Adapter textarea à input/basev2
 .contChamp textarea {
@@ -24,11 +24,11 @@
     border-radius: @radius;
 
     --cBg2: #eee;
-    background: fade(#000, 5%);
     //box-shadow: 1px 3px 0 fade(#000,4%), 0 1px 2px 0 fade(#000,2%);
 
     > i {
         margin-left: 0.5em;
+        color: var(--cTxtDesc);
     }
 
     .contValue {
@@ -42,7 +42,7 @@
     @gapAround: (@hInput - @labelH) / 2;
     > .btn:first-child { margin-left: 0 - @gapAround / 2; }
 
-    @labelH: 1.2em;
+    @labelH: 0.6em;
     label {
         position: absolute;
         left: 0; width: 100%;
@@ -51,6 +51,7 @@
         align-items: center;
 
         height: @labelH;
+        font-size: 0.8em;
         color: var(--cTxtDesc);
         transition: all .1s ease-out;
     }

package/src/client/components/input/Slider/index.less

@@ -15,7 +15,7 @@
         height: @hTrack;
 
         &-0 {
-            background: var(--c1);
+            background: var(--cAccent);
             border-radius: @hTrack / 2 0 0 @hTrack / 2;
         }
 

package/src/client/components/input/UploadImage/index.less

@@ -9,7 +9,7 @@
     background: @cBgPage + #090909;
 
     &:not(.enCours):hover {
-        border-color: var(--c1);
+        border-color: var(--cAccent);
     }
 
     // Encadré

package/src/client/context/index.ts

@@ -7,7 +7,6 @@ import React from 'react';
 import type { ComponentChild } from 'preact';
 
 // Core
-import { AuthRequise } from '@common/errors';
 import { createDialog } from '@client/components/Dialog/Manager';
 import BaseRequest from '@common/router/request';
 import router, { TClientRoute } from '@client/router';

package/src/client/router/index.tsx

@@ -94,12 +94,19 @@ export const Link = ({ to, ...props }: {
     className?: string
 }) => {
 
-    return (
-        <a {...props} href={to} onClick={(e) => {
+    // External = open in new tab by default
+    if (to[0] !== '/' || to.startsWith('//'))
+        props.target = '_blank';
+    // Otherwise, propagate to the router
+    else 
+        props.onClick = (e) => {
             history?.push(to);
             e.preventDefault();
             return false
-        }}/>
+        }
+
+    return (
+        <a {...props} href={to} />
     )
 
 }

package/src/common/data/input/validate.ts

@@ -8,7 +8,7 @@
 import { ComponentChild } from 'preact'
 
 // Libs
-import { Erreur, TListeErreursSaisie, ErreurSaisieSchema } from '@common/errors';
+import { Erreur, TListeErreursSaisie, InputErrorSchema } from '@common/errors';
 
 import { EXCLURE_VALEUR } from './validators/build';
 
@@ -216,7 +216,7 @@ export const validate = async <TSchemaA extends TSchema, TDonnees extends TObjet
     }
 
     if (nbErreurs !== 0 && opts.critique === true) {
-        throw new ErreurSaisieSchema(erreurs);
+        throw new InputErrorSchema(erreurs);
     }
 
     debug && console.log('[schema][valider]', inputAvalider, '=>', output);

package/src/common/data/input/validators/basic.ts

@@ -11,7 +11,7 @@ import {
 } from 'validator';
 
 // Libs
-import { ErreurSaisie } from '@common/errors';
+import { InputError } from '@common/errors';
 import File from '@common/data/file';
 
 // Libs métier
@@ -39,7 +39,7 @@ export const object = (opts: TSchemaChamp<object> & {} = {}) => champ<object>('o
             }*/
 
         if (typeof val !== 'object' || val.constructor !== Object)
-            throw new ErreurSaisie("This value must be an object.");
+            throw new InputError("This value must be an object.");
 
         return opts.valider ? await opts.valider(val, donneesSaisie, donneesRetour) : val;
     },
@@ -60,7 +60,7 @@ export const array = (subtype?: Schema<any> | TSchemaChamp<any[]>, { choix, ...o
             //console.log('VALIDER ARRAY', items, donneesSaisie);
 
             if (!Array.isArray(items))
-                throw new ErreurSaisie("This value must be an array.");
+                throw new InputError("This value must be an array.");
 
             // Verif items
             if (subtype !== undefined) {
@@ -86,7 +86,7 @@ export const choice = (values: any[], opts: TSchemaChamp<any> & {} = {}) => cham
     valider: async (val: any, donneesSaisie: TObjetDonnees, donneesRetour: TObjetDonnees) => {
 
         if (!values.includes(val))
-            throw new ErreurSaisie("Invalid value. Must be: " + values.join(', '));
+            throw new InputError("Invalid value. Must be: " + values.join(', '));
 
         return opts.valider ? await opts.valider(val, donneesSaisie, donneesRetour) : val;
     },
@@ -104,21 +104,21 @@ export const string = ({ min, max, ...opts }: TSchemaChamp<string> = {}) => cham
         else if (typeof val === 'number')
             return val.toString();
         else if (typeof val !== 'string')
-            throw new ErreurSaisie("This value must be a string.");
+            throw new InputError("This value must be a string.");
 
         // Espaces blancs
         val = trim(val);
 
         // Taille min
         if (val.length < min)
-            throw new ErreurSaisie(`Must be at least ` + min + ' characters');
+            throw new InputError(`Must be at least ` + min + ' characters');
 
         // Taille max
         if (val.length > max)
             if (corriger)
                 val = val.substring(0, max);
             else
-                throw new ErreurSaisie(`Must be up to ` + max + ' characters');
+                throw new InputError(`Must be up to ` + max + ' characters');
 
         return opts.valider ? await opts.valider(val, donneesSaisie, donneesRetour) : val;
     },
@@ -131,7 +131,7 @@ export const url = (opts: TSchemaChamp<string> & {} = {}) => string({
         if (!isURL(val, {
             // https://www.npmjs.com/package/validator
         }))
-            throw new ErreurSaisie(`Please provide a valid URL.`);
+            throw new InputError(`Please provide a valid URL.`);
 
         return opts.valider ? await opts.valider(val, donneesSaisie, donneesRetour, corriger) : val;
     },
@@ -142,7 +142,7 @@ export const email = (opts: TSchemaChamp<string> & {} = {}) => string({
     valider: async (val: any, donneesSaisie: TObjetDonnees, donneesRetour: TObjetDonnees, corriger?: boolean) => {
 
         if (!isEmail(val))
-            throw new ErreurSaisie("Please enter a valid email address.");
+            throw new InputError("Please enter a valid email address.");
 
         const retour = normalizeEmail(val);
 
@@ -177,7 +177,7 @@ const nombre = (float: boolean) => ({ ...opts }: TSchemaChamp<number> & {} = {})
                 if (corriger)
                     val = opts.min;
                 else
-                    throw new ErreurSaisie("This value must be a number.");
+                    throw new InputError("This value must be a number.");
             }
 
             // Minimum
@@ -185,14 +185,14 @@ const nombre = (float: boolean) => ({ ...opts }: TSchemaChamp<number> & {} = {})
                 if (corriger)
                     val = opts.min;
                 else
-                    throw new ErreurSaisie(`Must be at least ` + opts.min);
+                    throw new InputError(`Must be at least ` + opts.min);
 
             // Maximum
             if (opts.max !== undefined && val > opts.max)
                 if (corriger)
                     val = opts.max;
                 else
-                    throw new ErreurSaisie(`Must be up to ` + opts.max);
+                    throw new InputError(`Must be up to ` + opts.max);
 
         }
 
@@ -210,7 +210,7 @@ export const bool = (opts: TSchemaChamp<boolean> & {} = {}) => champ<boolean>('b
     valider: async (val: any, donneesSaisie: TObjetDonnees, donneesRetour: TObjetDonnees) => {
 
         if (typeof val !== 'boolean' && !['true', 'false'].includes(val))
-            throw new ErreurSaisie("This value must be a boolean.");
+            throw new InputError("This value must be a boolean.");
 
         val = !!val;
 
@@ -233,12 +233,12 @@ export const date = (opts: TSchemaChamp<Date> & {} = {}) => champ<Date>('date',
         if (chaine) {
 
             if (!isISO8601(val))
-                throw new ErreurSaisie("This value must be a date.");
+                throw new InputError("This value must be a date.");
 
             val = toDate(val);
 
         } else if (!(val instanceof Date))
-            throw new ErreurSaisie("This value must be a date.");
+            throw new InputError("This value must be a date.");
 
         return opts.valider ? await opts.valider(val, donneesSaisie, donneesRetour) : val;
 
@@ -265,7 +265,7 @@ export const validateurFichier = async (
     console.log('VALIDER FICHIER', type, val);
 
     if (!(val instanceof NormalizedFile))
-        throw new ErreurSaisie(`Must be a File (${typeof val} received)`);
+        throw new InputError(`Must be a File (${typeof val} received)`);
 
     // MIME
     if (type !== undefined) {
@@ -284,7 +284,7 @@ export const validateurFichier = async (
         // Vérification
         const mimeFichier = val.type;
         if (!mimetypes.includes(mimeFichier))
-            throw new ErreurSaisie('Only the following formats are allowed: ' + mimetypes.join(', ') + '. The file you gave is ' + mimeFichier + '.');
+            throw new InputError('Only the following formats are allowed: ' + mimetypes.join(', ') + '. The file you gave is ' + mimeFichier + '.');
 
     }
 
@@ -292,7 +292,7 @@ export const validateurFichier = async (
     if (taille) {
         const tailleFichier = val.size / 1024 / 1024; // Mo
         if (tailleFichier > taille)
-            throw new ErreurSaisie(`Le fichier ne doit pas faire plus de ${taille} Mo (taille reçue: ${tailleFichier} Mo)`);
+            throw new InputError(`Le fichier ne doit pas faire plus de ${taille} Mo (taille reçue: ${tailleFichier} Mo)`);
     }
 
     return opts.valider ? await opts.valider(val, donneesSaisie, donneesRetour) : val;

package/src/common/data/input/validators/build.ts

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 // Libs
-import { ErreurSaisie } from '@common/errors';
+import { InputError } from '@common/errors';
 import * as basicValidators from './basic';
 
 // Components
@@ -39,7 +39,7 @@ export const champ = <TValeur>(
                     return undefined;
                 // Requis
                 else
-                    throw new ErreurSaisie("Please enter a value");
+                    throw new InputError("Please enter a value");
             }
 
             if (opts.valider !== undefined)

package/src/common/errors/index.ts

@@ -66,13 +66,13 @@ export abstract class Erreur extends Error {
     }
 }
 
-export class ErreurSaisie extends Erreur {
+export class InputError extends Erreur {
     public http = 400;
     public title = "Bad Request";
     public static msgDefaut = "Bad Request.";
 }
 
-export class ErreurSaisieSchema extends Erreur {
+export class InputErrorSchema extends Erreur {
 
     public http = 400;
     public title = "Bad Request";
@@ -89,7 +89,7 @@ export class ErreurSaisieSchema extends Erreur {
 
     public constructor(message: TListeErreursSaisie, details?: TDetailsErreur) {
 
-        super( ErreurSaisieSchema.listeToString(message), details );
+        super( InputErrorSchema.listeToString(message), details );
 
         this.erreursSaisie = message;
 
@@ -103,29 +103,33 @@ export class ErreurSaisieSchema extends Erreur {
     }
 }
 
-export class AuthRequise extends Erreur {
+export class AuthRequired extends Erreur {
     public http = 401;
     public title = "Authentication Required";
     public static msgDefaut = "Please Login to Continue.";
 }
 
-export class AccesRefuse extends Erreur {
+export class Forbidden extends Erreur {
     public http = 403;
     public title = "Access Denied";
     public static msgDefaut = "You're not allowed to access to this resource.";
 }
 
-export class Introuvable extends Erreur {
+export class NotFound extends Erreur {
     public http = 404;
     public title = "Not Found";
     public static msgDefaut = "The resource you asked for was not found.";
 }
 
-export class ErreurCritique extends Erreur {
+export class Anomaly extends Erreur {
 
     public http = 500;
     public title = "Technical Error";
     public static msgDefaut = "A technical error has occurred. A notification has just been sent to the admin.";
+
+    public constructor(message, public data: object) {
+        super(message);
+    }
 }
 
 export class NotAvailable extends Erreur {
@@ -148,13 +152,13 @@ export const instancierViaCode = (
 ): Erreur => {
 
     if (typeof message === 'object')
-        return new ErreurSaisieSchema(message, details);
+        return new InputErrorSchema(message, details);
 
     switch (code) {
-        case 400: return new ErreurSaisie( message, details);
-        case 401: return new AuthRequise( message, details);
-        case 403: return new AccesRefuse( message, details);
-        case 404: return new Introuvable( message, details);
-        default: return new ErreurCritique( message, details);
+        case 400: return new InputError( message, details);
+        case 401: return new AuthRequired( message, details);
+        case 403: return new Forbidden( message, details);
+        case 404: return new NotFound( message, details);
+        default: return new Anomaly( message, details);
     }
 }

package/src/server/data/Token.olg.ts

@@ -15,7 +15,7 @@ import hInterval from 'human-interval';
 
 // Core
 import Cron, { CronTask } from '@server/services/cron';
-import { AccesRefuse } from '@common/errors';
+import { Forbidden } from '@common/errors';
 
 const debug = true;
 
@@ -82,7 +82,7 @@ class Tokens {
         debug && console.log("Get token", token, options);
         if (options === undefined) {
             if (critical)
-                throw new AccesRefuse(`Invalid token.`);
+                throw new Forbidden(`Invalid token.`);
             else
                 return undefined;
         }

package/src/server/data/aes.ts

@@ -6,7 +6,7 @@
 import crypto from 'crypto';
 
 // Core
-import { AccesRefuse } from '@common/errors';
+import { Forbidden } from '@common/errors';
 
 const debug = true;
 
@@ -43,7 +43,7 @@ class AES {
 
         } catch (error) {
 
-            throw new AccesRefuse("Invalid token.");
+            throw new Forbidden("Invalid token.");
             
         }
         

package/src/server/routes/auth.ts

@@ -90,6 +90,12 @@ route.post('/auth/logout', async ({ auth }) => {
 
 });
 
+
+
+
+
+
+// Too specific to project
 route.get('/invite', async ({ auth, schema }) => {
 
     const user = await auth.check("USER");

package/src/server/services/auth/base.ts

@@ -7,7 +7,7 @@ import md5 from 'md5';
 import { OAuth2Client, LoginTicket } from 'google-auth-library';
 
 // Core libs
-import { ErreurSaisie, AuthRequise, AccesRefuse } from '@common/errors';
+import { Forbidden } from '@common/errors';
 
 // App Libs
 import { IP } from '@models';
@@ -38,7 +38,7 @@ export type AuthConfig = {
         key: string,
         expiration: string,
     },
-    google: {
+    google?: {
         web: {
             clientId: string,
             secret: string,
@@ -75,11 +75,13 @@ export default abstract class UserAuthBase {
     public abstract beforeSignup(user: User): Promise< void >;
     public abstract afterSignup(user: User): Promise<{ redirect: string }>;
     
-    private googleClient = new OAuth2Client(
-        app.config.auth.google.web.clientId, // Google Client ID
-        app.config.auth.google.web.secret, // Private key
-        "https://" + app.env.domain + "/auth/google/response" // Redirect url
-    );
+    private googleClient = app.config.auth.google
+        ? new OAuth2Client(
+            app.config.auth.google.web.clientId, // Google Client ID
+            app.config.auth.google.web.secret, // Private key
+            "https://" + app.env.domain + "/auth/google/response" // Redirect url
+        )
+        : undefined;
 
     public async load() {
 
@@ -101,6 +103,9 @@ export default abstract class UserAuthBase {
 
     public async FromGoogle(request: ServerRequest): Promise<string> {
 
+        if (!this.googleClient)
+            throw new Forbidden(`Authentication method disabled.`);
+
         // Register  start time, so we can determine the signup time to display
         request.response?.cookie('signupstart', Date.now());
 
@@ -126,8 +131,11 @@ export default abstract class UserAuthBase {
         request: ServerRequest,
     ): Promise<AuthResponse> {
 
+        if (!this.googleClient)
+            throw new Forbidden(`Authentication method disabled.`);
+
         if (codeOrToken === undefined)
-            throw new AccesRefuse("Bad code / token");
+            throw new Forbidden("Bad code / token");
 
         if (type === 'code') {
             const r = await this.googleClient.getToken(codeOrToken);
@@ -146,16 +154,16 @@ export default abstract class UserAuthBase {
                 ]
             });
         } catch (error) {
-            throw new AccesRefuse(`Google denied your login attempt: ` + error.message + `. If you don't think it's normal, please contact us.`);
+            throw new Forbidden(`Google denied your login attempt: ` + error.message + `. If you don't think it's normal, please contact us.`);
         }
 
         const payload = ticket.getPayload();
         if (payload === undefined)
-            throw new AccesRefuse("Invalid payload");
+            throw new Forbidden("Invalid payload");
         const { email, sub: google_id } = payload;
 
         if (email === undefined)
-            throw new AccesRefuse("Unable to get your email address from the Google sign-in.");
+            throw new Forbidden("Unable to get your email address from the Google sign-in.");
 
         return await this.Auth(email, request, true);
 
@@ -180,7 +188,7 @@ export default abstract class UserAuthBase {
 
         } else if (!canPass) { // Send login email
 
-            throw new AccesRefuse("This option is not available");
+            throw new Forbidden("This option is not available");
 
             // If the current IP was used to connect to another account that the current
             ip = await request.detect.botsAndMultiaccount(user.name);

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

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 // Core
-import { Introuvable } from '@common/errors';
+import { NotFound } from '@common/errors';
 import app from '@server/app';
 import context from '@server/context';
 
@@ -99,7 +99,7 @@ export class CronManager {
         const tache = CronManager.taches[nom];
 
         if (tache === undefined)
-            throw new Introuvable("Tâche introuvable: " + nom);
+            throw new NotFound("Tâche NotFound: " + nom);
 
         await tache.run(true);
 

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

@@ -9,7 +9,7 @@ const safeStringify = require('fast-safe-stringify'); // remplace les référenc
 
 // Core: general
 import app, { $ } from '@server/app';
-import { Introuvable } from '@common/errors';
+import { NotFound } from '@common/errors';
 
 // Services
 import './connection';
@@ -113,7 +113,7 @@ export function sql<TRowData extends TObjetDonnees = {}>(strings: TemplateString
         fetchStats(columns, string, periodStr, intervalStr)*/
 
     query.mergeValues = (options: TQueryOptions = {}) => 
-        sql.query(string, options).then(queriesResult => {
+        sql.query(string, options).then( queriesResult => {
 
             const data: TObjetDonnees = {};
             for (const queryResult of queriesResult)
@@ -211,7 +211,8 @@ sql.query = async <TRowData extends TObjetDonnees = {}>(
                     time: Date.now() - startTime,
                 });
         }
-        return rows;
+
+        return rows as unknown as TRowData[];
         
     } catch (error) {
         
@@ -251,7 +252,7 @@ sql.firstOrFail = <TRowData extends TObjetDonnees = {}>(query: string, message?:
     sql.query(query, opts).then((resultatRequetes: any) => {
 
         if (resultatRequetes.length === 0)
-            throw new Introuvable(message);
+            throw new NotFound(message);
 
         return resultatRequetes[0];
 
@@ -359,18 +360,15 @@ sql.insert = async <TData extends TObjetDonnees>(
         }).join(', ');
 
     if (opts.upsert !== undefined)
-        query += ' ON DUPLICATE KEY UPDATE ' + opts.upsert.map(col => 
+        query += ' ON DUPLICATE KEY UPDATE ' + opts.upsert.map( col => 
             '`' + col + '` = ' + (opts.upsertMode === 'increment' ? '`' + col + '` + ' : '') + 'VALUES(' + col + ')'
         )
 
     const queryResult = await sql.query(query + ';', opts);
 
-    if (opts.returnQuery)
-        return queryResult;
-    else {
-        data.id = queryResult.insertId;
-        return data;
-    }
+    console.log("opts.returnQuery", opts.returnQuery, "queryResult", queryResult);
+    
+    return [data, queryResult.insertId, queryResult];
 }
 
 /*----------------------------------

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

@@ -135,7 +135,7 @@ export default class Email {
                 const template = templates[email.template];
 
                 if (template === undefined)
-                    throw new Error(`Impossible de charger la template email ${email.template} depuis le cache (introuvable).`);
+                    throw new Error(`Impossible de charger la template email ${email.template} depuis le cache (NotFound).`);
 
                 const txt = template(email.data || {})
 
@@ -197,7 +197,4 @@ declare global {
             email: Email;
         }
     }
-}
-
-// Register transporters
-require("./transports/*");
+}

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

@@ -22,7 +22,7 @@ import TrackingService from './request/services/tracking';
 
 // Core: libs
 import app, { $ } from '@server/app';
-import { Introuvable } from '@common/errors';
+import { NotFound } from '@common/errors';
 
 // Core: types
 import type { TSsrUnresolvedRoute, TRegisterPageArgs } from '@client/router';
@@ -439,7 +439,7 @@ export class Router extends BaseRouter {
                 return response;
         }
 
-        throw new Introuvable(`The requested endpoint was not found.`);
+        throw new NotFound(`The requested endpoint was not found.`);
     }
 
 }