5htp-core 0.1.2-1 → 0.1.2-3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "5-HTP, scientifically called 5-Hydroxytryptophan, is the precursor of happiness neurotransmitter.",
-	"version": "0.1.2-1",
+	"version": "0.1.2-3",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/client/assets/css/medias.less

@@ -8,6 +8,20 @@ img.img,
 .bg.img {
     .build-theme-bg(#000, #fff);
     text-shadow: 0 0 10px fade(#000, 20%);
+
+    --cTxtDiscret: fade(#fff, 40%)
+    --cTxtDesc: fade(#fff, 60%);
+    --cTxtBase: fade(#fff, 80%);
+    --cTxtImportant: fade(#fff, 100%);
+    --cTxtAccent: fade(#fff, 20%);
+
+    &.light {
+        --cTxtDiscret: fade(#000, 40%)
+        --cTxtDesc: fade(#000, 60%);
+        --cTxtBase: fade(#000, 80%);
+        --cTxtImportant: fade(#000, 100%);
+        --cTxtAccent: fade(#000, 20%);
+    }
 }
 
 img {

package/src/server/app/config.ts

@@ -30,14 +30,8 @@ declare global {
 
 export type TEnvName = TEnvConfig["name"];
 export type TEnvConfig = {
-
     name: 'local' | 'server',
     profile: 'dev' | 'prod',
-    level: 'silly' | 'info' | 'warn' | 'error',
-
-    localIP: string,
-    domain: string,
-    url: string,
 }
 
 type AppIdentityConfig = {
@@ -93,20 +87,10 @@ export default class ConfigParser {
         console.log("Using environment:", process.env.NODE_ENV);
         return process.env.NODE_ENV === 'development' ? {
             name: 'local',
-            profile: 'dev',
-            level: 'silly',
-        
-            localIP: '86.76.176.80',
-            domain: 'localhost:3010',
-            url: 'http://localhost:3010',
+            profile: 'dev'
         } : {
             name: 'server',
             profile: 'prod',
-            level: 'silly',
-        
-            localIP: '86.76.176.80',
-            domain: 'megacharger.io',
-            url: 'https://megacharger.io',
         }
     }
 

package/src/server/app/index.ts

@@ -74,7 +74,7 @@ export class App {
         get: (container, serviceId, receiver) => {
 
             if (!( serviceId in container ) && typeof serviceId === 'string')
-                throw new Error(`Service not loaded: ${serviceId}`);
+                throw new Error(`The following service is required as a dependancy: ${serviceId}`);
 
             return container[serviceId];
         }

package/src/server/libs/pages/document.tsx

@@ -34,7 +34,7 @@ export default ({ page, children: html, request, ssrData }: {
 
     const routesForClient = JSON.stringify( services.router.ssrRoutes );
 
-    const fullUrl = services.http.url + request.path;
+    const fullUrl = services.http.publicUrl + request.path;
 
     let attrsBody = {
         className: [...page.bodyClass].join(' '),

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

@@ -89,16 +89,22 @@ export default abstract class UserAuthBase {
     public abstract beforeSignup(user: User): Promise< void >;
     public abstract afterSignup(user: User): Promise<{ redirect: string }>;
     
-    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;
+    private googleClient: OAuth2Client | undefined;
 
     public async load() {
 
+        // Google auth client
+        if (app.config.auth.google) {
+
+            const httpConfig = app.services.http.publicUrl;
+
+            this.googleClient = new OAuth2Client(
+                app.config.auth.google.web.clientId, // Google Client ID
+                app.config.auth.google.web.secret, // Private key
+                httpConfig + "/auth/google/response" // Redirect url
+            );
+        }
+
     }
 
     public async FromEmail(
@@ -145,7 +151,8 @@ export default abstract class UserAuthBase {
         request: ServerRequest,
     ): Promise<AuthResponse> {
 
-        if (!this.googleClient)
+        const googleConfig = app.config.auth.google;
+        if (!this.googleClient || !googleConfig)
             throw new Forbidden(`Authentication method disabled.`);
 
         if (codeOrToken === undefined)
@@ -156,15 +163,15 @@ export default abstract class UserAuthBase {
             return this.GoogleResponse('token', r.tokens.id_token, request);
         }
 
-        config.debug && console.log(LogPrefix, "Auth via google", app.config.auth.google);
+        config.debug && console.log(LogPrefix, "Auth via google", googleConfig);
 
         let ticket: LoginTicket;
         try {
             ticket = await this.googleClient.verifyIdToken({
                 idToken: codeOrToken,
                 audience: [
-                    app.config.auth.google.web.clientId,
-                    app.config.auth.google.android.clientId,
+                    googleConfig.web.clientId,
+                    googleConfig.android.clientId,
                 ]
             });
         } catch (error) {

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

@@ -19,8 +19,15 @@ import BugReporter from "./bugReporter";
 
 export type TReportTransport = keyof typeof $
 
+type TLogProfile = 'silly' | 'info' | 'warn' | 'error'
+
 export type ConsoleConfig = {
-  
+    dev: {
+        level: TLogProfile,
+    },
+    prod: {
+        level: TLogProfile
+    }
 }
 
 declare global {
@@ -120,6 +127,8 @@ export class Console {
    ----------------------------------*/
     public load() {
 
+        const envConfig = app.config.console[ app.env.profile ];
+
         this.logger = new Logger({
             overwriteConsole: true,
             //type: app.env.profile === 'dev' ? 'pretty' : 'hidden',
@@ -138,7 +147,7 @@ export class Console {
             warn: this.log.bind(this),
             error: this.log.bind(this),
             fatal: this.log.bind(this),
-        }, app.env.level);
+        }, envConfig.level);
 
         setInterval(() => this.clean(), 60000);
 

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

@@ -98,7 +98,7 @@ export default class Email {
             to: config.bugReport.to,
             subject: "Bug on server: " + (report.error.message),
             html: `
-                <a href="${app.env.url}/admin/activity/requests/${report.channelId}">
+                <a href="${app.services.http.publicUrl}/admin/activity/requests/${report.channelId}">
                     View Request details & console
                 </a>
                 <br/>

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

@@ -11,9 +11,6 @@ import path from 'path';
 import cors from 'cors';
 //var serveStatic = require('serve-static')
 
-// Npm: Autres
-import fs from 'fs-extra';
-
 // Middlewares (npm)
 import morgan from 'morgan';
 import hpp from 'hpp'; // Protection contre la pollution des reuqtees http
@@ -38,13 +35,18 @@ import { MiddlewareFormData } from './multipart';
 ----------------------------------*/
 
 export type HttpServiceConfig = {
-    port: number
-    ssl: boolean,
 
+    // Access
+    domain: string,
+    port: number,
+    ssl: number,
+
+    // Limitations / Load restriction
     upload: {
         maxSize: string // Expression package bytes
     },
 
+    // Protections against bots
     security: {
         recaptcha: {
             prv: string,
@@ -75,35 +77,19 @@ export default class HttpServer {
     public router: Router;
 
     public config: HttpServiceConfig;
-    public url: string;
+    public publicUrl: string;
 
     public constructor() {
 
         // Init
         this.config = app.config.http;
-        this.url = (this.config.ssl ? 'https' : 'http') + '://' + app.env.domain;
-        this.express = express();
+        this.publicUrl = app.env.name === 'local'
+            ? 'http://localhost:' + this.config.port
+            : ((this.config.ssl ? 'https' : 'http') + '://' + this.config.domain);
 
         // Configure HTTP server
-        if (!this.config.ssl) {
-
-            this.http = http.createServer(this.express);
-
-        } /*else if ('ssh' in app.env) {
-
-            const ssh = app.env.ssh;
-
-            console.log("Création du serveur https pour le socket:", '/home/' + ssh.login + '/ssl.*');
-            this.http = https.createServer({
-                key: fs.readFileSync('/home/' + ssh.login + '/ssl.key'),
-                cert: fs.readFileSync('/home/' + ssh.login + '/ssl.cert'),
-                ca: fs.readFileSync('/home/' + ssh.login + '/ssl.ca'),
-                requestCert: true,
-                rejectUnauthorized: false
-            }, this.express);
-            
-        }*/ else
-            throw new Error(`SSL was enabled, but no ssh config was specified in app.env (required to load ssl certificate files)`);
+        this.express = express();
+        this.http = http.createServer(this.express);
 
         // Start HTTP Server
         this.router = app.services.router;
@@ -248,7 +234,7 @@ export default class HttpServer {
         // Impossible donc de créer un serveur http ici, on le fera dans start.js
         console.info("Lancement du serveur web");
         this.http.listen(this.config.port, () => {
-            console.info(`Serveur web démarré sur https://${app.env.domain}:${this.config.port}/`);
+            console.info(`Serveur web démarré sur ${this.publicUrl}`);
         });
 
     }

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

@@ -96,8 +96,6 @@ export default class ServerRequest extends BaseRequest {
         this.cookies = res.req.cookies;
 
         this.ip = res.req.ip;
-        if (this.ip === '::1' && app.env.localIP)
-            this.ip = app.env.localIP;
 
         this.data = data || {};
 

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

@@ -80,6 +80,8 @@ export default class ProtectService {
 
         return conflict;*/
 
+        return false;
+
     }
 
     public async captcha(token?: string) {