serverpreconfigured 1.1.4 → 2.0.0

package/.sequelizercproj

@@ -0,0 +1,6 @@
+const path = require('path');
+
+module.exports = {
+  'config': path.resolve(__dirname,'node_modules','serverpreconfigured','dist','settings','database','database.js'),
+  'migrations-path': path.resolve(__dirname, 'migrations'),
+}

package/dist/modules/sessions.js

@@ -9,7 +9,7 @@ const env_1 = __importDefault(require("../settings/env"));
 function initSessions(app) {
     app.set('trust proxy', 1); // trust first proxy
     app.use((0, express_session_1.default)({
-        secret: 'keyboard cat',
+        secret: env_1.default.SESSION_SECRET,
         resave: false,
         saveUninitialized: true,
         cookie: { secure: env_1.default.NODE_ENV == 'development' ? false : true,

package/dist/routes/users.js

@@ -58,6 +58,7 @@ router.post('/login', (req, res) => __awaiter(void 0, void 0, void 0, function*
     }
     if (password == "" || email == "")
         return res.send((0, response_1.JSONResponse)(false, LoginErrorCode.InvalidParams, "Must have 'email' and 'password' params"));
+    email = email.toLocaleLowerCase();
     try {
         const checkPass = yield (0, users_1.checkUserPassword)(email, password);
         if (checkPass) {
@@ -80,6 +81,7 @@ router.post('/register', (req, res) => __awaiter(void 0, void 0, void 0, functio
         let name = meta_sanitizer_1.default.SanitizerEngine(req.body.name || '', true, false, [' ']).sanitizedData;
         if (email == "" || password == "" || name == "")
             return res.send((0, response_1.JSONResponse)(false, RegisterUserErrorCode.InvalidParams, "Invalid params"));
+        email = email.toLocaleLowerCase();
         yield (0, users_2.createUser)({ first_name: name, email: email, password_string: password });
         return res.send((0, response_1.JSONResponse)(true, RegisterUserErrorCode.NoError, "", "REGISTER OK"));
     }

package/dist/settings/database/database.d.ts

@@ -1,6 +1,6 @@
 export const dialect: string;
 export const host: string;
-export const database: string;
+export const database: any;
 export const username: string;
 export const password: string;
 export namespace define {

package/dist/settings/env.d.ts

@@ -5,9 +5,10 @@ declare const ENV: {
     DATABASE: {
         dialect: string;
         host: string;
-        database: string;
+        database: any;
         username: string;
         password: string;
     };
+    SESSION_SECRET: string;
 };
 export default ENV;

package/dist/settings/env.js

@@ -1,5 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const custom_env_path = path_1.default.join(process.cwd(), "spc_envfile.json");
+var custom_env = {};
+try {
+    custom_env = JSON.parse(fs_1.default.readFileSync(custom_env_path).toString());
+}
+catch (e) {
+    custom_env = {};
+}
 const ENV = {
     NODE_ENV: process.env.SERVER_ENV == 'development' ? 'development' : 'production',
     ALLOW_CORS: process.env.ALLOW_CORS == 'ALLOW' ? true : false,
@@ -7,9 +20,10 @@ const ENV = {
     DATABASE: {
         dialect: process.env.DATABASE_DIALECT ? process.env.DATABASE_DIALECT : 'postgres',
         host: process.env.DATABASE_HOST ? process.env.DATABASE_HOST : 'localhost',
-        database: process.env.DATABASE_DATABASE ? process.env.DATABASE_DATABASE : 'postgres',
+        database: (custom_env.DATABASE && custom_env.DATABASE.DATABASE) || (process.env.DATABASE_DATABASE || 'postgres'),
         username: process.env.DATABASE_USERNAME ? process.env.DATABASE_USERNAME : 'postgres',
         password: process.env.DATABASE_PASSWORD ? process.env.DATABASE_PASSWORD : '',
-    }
+    },
+    SESSION_SECRET: process.env.SESSION_SECRET ? process.env.SESSION_SECRET : "secret key session",
 };
 exports.default = ENV;

package/dist/utils/debug/debug.js

@@ -10,6 +10,6 @@ function debugMessage(isDebug, message, data = {}) {
     console.log("----DEBUG----" +
         "\nCaller: " + stack[2] +
         "\nMessage: " + message +
-        addData ? "\naddData: " + addData : "");
+        (addData ? "\naddData: " + addData : ""));
 }
 exports.debugMessage = debugMessage;

package/install.js

@@ -0,0 +1,100 @@
+#!/usr/bin/env node
+const LIB_SEQUELIZE_FILENAME=".sequelizercproj";
+const PROJECT_SEQUELIZE_FILENAME=".sequelizerc";
+const MIGRATIONS_PATH="migrations";
+const LIB_DIR=__dirname;
+const PROJECT_DIR=process.cwd();
+const CUSTOMENV_FILENAME="spc_envfile.json";
+const fs=require("fs");
+const path=require("path");
+const color=require('colors-cli');
+const PRINTWARNING=color.yellow;
+const PRINTERROR=color.red;
+const PRINTOK=color.green;
+(async()=>{
+   try{
+       console.log(PRINTWARNING("START UPDATING MIGRATIONS FILE"));
+       await updateMigrations();
+       console.log(PRINTOK("MIGRATIONS FILE UPDATED"))
+   }catch(e){
+       console.log(PRINTERROR("UPDATE MIGRATIONS FILE ERROR"));
+       console.log(e);
+   }
+   try{
+      console.log(PRINTWARNING("START COPY SEQUELIZERC FILE IF NOT EXISTS"));
+      await copySequelizeRcFile();
+      console.log(PRINTOK("COPY SEQUELIZERCFILE OK"));
+   }catch(e){
+      console.log(PRINTERROR("COPY SEQUELIZERCFILE ERROR"));
+      console.log(e);
+   }
+   try{
+     console.log(PRINTWARNING("COPY CUSTOM ENV FILE IF NOT EXISTS"));
+     await copyCustomEnvFile();
+     console.log(PRINTOK("COPY CUSTOM ENV FILE OK"));
+   }catch(e){
+     console.log(PRINTERROR("COPY CUSTOM ENV FILE ERROR"));
+     console.log(e);
+   }
+
+})()
+
+
+async function updateMigrations(){
+    try{
+        await createPath();
+        await copyFiles();
+    }catch(e){
+        throw e;
+    }
+
+    async function createPath(){
+    try{
+        if(fs.existsSync(getProjectMigrationDirPath())){
+            return true;
+        }else{
+            fs.mkdirSync(getProjectMigrationDirPath());
+        }
+    }catch(e){
+        throw e;
+    }
+    }
+    async function copyFiles(){
+        const files=fs.readdirSync(getLibMigrationDirPath());
+        for(let file of files){
+            const projectFileName=path.join(getProjectMigrationDirPath(),file);
+            if(fs.existsSync(projectFileName))
+               continue;
+            const libFileName=path.join(getLibMigrationDirPath(),file);   
+            fs.copyFileSync(libFileName,projectFileName);   
+        }
+    }
+    function getProjectMigrationDirPath(){
+       return path.join(PROJECT_DIR,MIGRATIONS_PATH);
+    }
+    function getLibMigrationDirPath(){
+       return path.join(LIB_DIR,MIGRATIONS_PATH);
+    }
+}
+async function copySequelizeRcFile(){
+   try{
+      const proj_seq=path.join(PROJECT_DIR,PROJECT_SEQUELIZE_FILENAME);
+      if(fs.existsSync(proj_seq))
+         return;
+      const lib_seq=path.join(LIB_DIR,LIB_SEQUELIZE_FILENAME);   
+      fs.copyFileSync(lib_seq,proj_seq);
+   }catch(e){
+      throw e;
+   }
+}
+async function copyCustomEnvFile(){
+    try{
+        const proj_env_custom_filename=path.join(PROJECT_DIR,CUSTOMENV_FILENAME);
+        if(fs.existsSync(proj_env_custom_filename))
+          return;
+        const lib_env_custom_filename=path.join(LIB_DIR,CUSTOMENV_FILENAME);
+        fs.copyFileSync(lib_env_custom_filename,proj_env_custom_filename);
+    }catch(e){
+        throw e;
+    }
+}

package/package.json

@@ -1,10 +1,18 @@
 {
   "name": "serverpreconfigured",
-  "version": "1.1.4",
+  "version": "2.0.0",
   "description": "\"Pre-configured server with authentication system and database integration\"",
   "main": "dist/server.js",
-  "keywords": ["server","pre configured","database","authentication"],
+  "keywords": [
+    "server",
+    "pre configured",
+    "database",
+    "authentication"
+  ],
   "type": "commonjs",
+  "bin": {
+    "serverpreconfigured": "./install.js"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node ./dist/server.js",
@@ -18,6 +26,7 @@
     "@types/express-session": "^1.17.4",
     "argon2": "^0.28.5",
     "body-parser": "^1.19.2",
+    "colors-cli": "^1.0.28",
     "cors": "^2.8.5",
     "express": "^4.17.3",
     "express-session": "^1.17.2",

package/spc_envfile.json

@@ -0,0 +1,5 @@
+{
+    "DATABASE":{
+        "DATABASE":false
+    }
+}

package/src/modules/sessions.ts

@@ -3,7 +3,7 @@ import  ENV  from "../settings/env";
 export function initSessions(app:any){
     app.set('trust proxy', 1) // trust first proxy
     app.use(session({
-        secret: 'keyboard cat',
+        secret: ENV.SESSION_SECRET,
         resave: false,
         saveUninitialized: true,
         cookie: { secure: ENV.NODE_ENV=='development'?false:true,

package/src/routes/users.ts

@@ -43,6 +43,7 @@ router.post('/login',async (req,res)=>{
     }
     if(password==""||email=="")
       return res.send(JSONResponse(false,LoginErrorCode.InvalidParams,"Must have 'email' and 'password' params"));
+    email=email.toLocaleLowerCase();
     try{
       const checkPass=await checkUserPassword(email,password);
       if(checkPass){
@@ -65,6 +66,7 @@ router.post('/register',async (req,res)=>{
       let name=meta_sanitizer.SanitizerEngine(req.body.name||'',true,false,[' ']).sanitizedData;
       if(email=="" || password=="" || name=="")
         return res.send(JSONResponse(false,RegisterUserErrorCode.InvalidParams,"Invalid params"));
+      email=email.toLocaleLowerCase();  
       await createUser({first_name:name,email:email,password_string:password});
       return res.send(JSONResponse(true,RegisterUserErrorCode.NoError,"","REGISTER OK"));
     }catch(e){

package/src/settings/env.ts

@@ -1,3 +1,12 @@
+import fs from "fs";
+import path from "path";
+const custom_env_path=path.join(process.cwd(),"spc_envfile.json");
+var custom_env:any={};
+try{
+   custom_env=JSON.parse(fs.readFileSync(custom_env_path).toString());
+}catch(e){
+   custom_env={};
+}
 const ENV={
     NODE_ENV:process.env.SERVER_ENV=='development'?'development':'production',
     ALLOW_CORS:process.env.ALLOW_CORS=='ALLOW'?true:false,
@@ -5,9 +14,10 @@ const ENV={
     DATABASE:{
         dialect:process.env.DATABASE_DIALECT?process.env.DATABASE_DIALECT:'postgres',
         host:process.env.DATABASE_HOST?process.env.DATABASE_HOST:'localhost',
-        database:process.env.DATABASE_DATABASE?process.env.DATABASE_DATABASE:'postgres',
+        database:(custom_env.DATABASE&&custom_env.DATABASE.DATABASE)||(process.env.DATABASE_DATABASE||'postgres'),
         username:process.env.DATABASE_USERNAME?process.env.DATABASE_USERNAME:'postgres',
         password:process.env.DATABASE_PASSWORD?process.env.DATABASE_PASSWORD:'',
-    }
+    },
+    SESSION_SECRET:process.env.SESSION_SECRET?process.env.SESSION_SECRET:"secret key session",
 };
 export default ENV;

package/src/utils/debug/debug.ts

@@ -7,6 +7,6 @@ export function debugMessage(isDebug:boolean,message:string,data:any={}){
     console.log("----DEBUG----"+
                 "\nCaller: "+stack[2]+
                 "\nMessage: "+message+
-                addData?"\naddData: "+addData:""
+                (addData?"\naddData: "+addData:"")
                 );
 }