serverpreconfigured 1.2.0 → 2.1.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/auth/auth.d.ts

@@ -1 +1,3 @@
 export declare function userIsLogged(req: any): boolean;
+export declare function setUserLogged(req: any, email: string): void;
+export declare function logoutUser(req: any): void;

package/dist/auth/auth.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.userIsLogged = void 0;
+exports.logoutUser = exports.setUserLogged = exports.userIsLogged = void 0;
 const secureget_1 = require("../sessions/secureget");
 const config_1 = require("./config");
+const server_1 = require("../server");
+const server_2 = require("../server");
 function userIsLogged(req) {
     let user = (0, secureget_1.getSessionValue)(req, config_1.SESSION_LOGGED_DATA);
     if (user)
@@ -10,3 +12,11 @@ function userIsLogged(req) {
     return false;
 }
 exports.userIsLogged = userIsLogged;
+function setUserLogged(req, email) {
+    (0, server_1.setSessionValue)(req, config_1.SESSION_LOGGED_DATA, email);
+}
+exports.setUserLogged = setUserLogged;
+function logoutUser(req) {
+    (0, server_2.deleteSessionValue)(req, config_1.SESSION_LOGGED_DATA);
+}
+exports.logoutUser = logoutUser;

package/dist/routes/users.js

@@ -13,8 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
-const secureset_1 = require("../sessions/secureset");
-const config_1 = require("../auth/config");
 const response_1 = require("../utils/response");
 const auth_1 = require("../auth/auth");
 const meta_sanitizer_1 = __importDefault(require("meta-sanitizer"));
@@ -22,6 +20,8 @@ const users_1 = require("../users/users");
 const users_2 = require("../users/users");
 const auth_2 = require("../middlewares/auth");
 const env_1 = __importDefault(require("../settings/env"));
+const auth_3 = require("../auth/auth");
+const auth_4 = require("../auth/auth");
 const DEBUG = env_1.default.NODE_ENV === 'development' ? true : false;
 var LoginErrorCode;
 (function (LoginErrorCode) {
@@ -41,7 +41,7 @@ const router = express_1.default.Router();
 router.post('/logout', (req, res) => {
     let is_ok = false;
     if ((0, auth_1.userIsLogged)(req)) {
-        (0, secureset_1.deleteSessionValue)(req, config_1.SESSION_LOGGED_DATA);
+        (0, auth_4.logoutUser)(req);
         is_ok = true;
     }
     res.send((0, response_1.JSONResponse)(is_ok, 0, is_ok ? "" : "User Must be logged", {}));
@@ -62,7 +62,7 @@ router.post('/login', (req, res) => __awaiter(void 0, void 0, void 0, function*
     try {
         const checkPass = yield (0, users_1.checkUserPassword)(email, password);
         if (checkPass) {
-            (0, secureset_1.setSessionValue)(req, config_1.SESSION_LOGGED_DATA, email);
+            (0, auth_3.setUserLogged)(req, email);
             return res.send((0, response_1.JSONResponse)(true, LoginErrorCode.NoError, "Login Ok"));
         }
         return res.send((0, response_1.JSONResponse)(false, LoginErrorCode.InvalidPassword, "Invalid Password"));

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,7 +5,7 @@ declare const ENV: {
     DATABASE: {
         dialect: string;
         host: string;
-        database: string;
+        database: any;
         username: string;
         password: string;
     };

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,7 +20,7 @@ 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 : '',
     },

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.2.0",
+  "version": "2.1.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/auth/auth.ts

@@ -1,8 +1,16 @@
 import { getSessionValue } from "../sessions/secureget";
 import { SESSION_LOGGED_DATA } from "./config";
+import { setSessionValue } from "../server";
+import { deleteSessionValue } from "../server";
 export function userIsLogged(req:any):boolean{
     let user=getSessionValue(req,SESSION_LOGGED_DATA);
     if(user)
       return true;
     return false;
+}
+export function setUserLogged(req:any,email:string){
+    setSessionValue(req,SESSION_LOGGED_DATA,email);
+}
+export function logoutUser(req:any){
+  deleteSessionValue(req,SESSION_LOGGED_DATA);
 }

package/src/routes/users.ts

@@ -8,6 +8,8 @@ import { checkUserPassword } from "../users/users";
 import { createUser } from "../users/users";
 import { setUserDataMiddleware } from "../middlewares/auth";
 import ENV from "../settings/env";
+import { setUserLogged } from "../auth/auth";
+import { logoutUser } from "../auth/auth";
 
 const DEBUG=ENV.NODE_ENV==='development'?true:false;
 enum LoginErrorCode{
@@ -27,7 +29,7 @@ const router=express.Router();
 router.post('/logout',(req,res)=>{
    let is_ok=false;
    if(userIsLogged(req)){
-       deleteSessionValue(req,SESSION_LOGGED_DATA);
+       logoutUser(req)
        is_ok=true;
    }
    res.send(JSONResponse(is_ok,0,is_ok?"":"User Must be logged",{}));
@@ -47,7 +49,7 @@ router.post('/login',async (req,res)=>{
     try{
       const checkPass=await checkUserPassword(email,password);
       if(checkPass){
-         setSessionValue(req,SESSION_LOGGED_DATA,email);
+         setUserLogged(req,email);
          return res.send(JSONResponse(true,LoginErrorCode.NoError,"Login Ok"));
       }
       return res.send(JSONResponse(false,LoginErrorCode.InvalidPassword,"Invalid Password"));

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,7 +14,7 @@ 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:'',
     },