serverpreconfigured 2.2.9 → 2.2.11

package/dist/database/models/User.d.ts

@@ -6,5 +6,4 @@ export declare class User extends Model {
     is_active: boolean;
     password_hash: string;
     last_action: Date;
-    static init(sequelize: any): void;
 }

package/dist/database/models/User.js

@@ -3,18 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
 const sequelize_1 = require("sequelize");
 const sequelize_2 = require("sequelize");
+const database_1 = require("../database");
 class User extends sequelize_1.Model {
-    static init(sequelize) {
-        super.init({
-            first_name: sequelize_2.DataTypes.STRING,
-            email: sequelize_2.DataTypes.STRING,
-            is_active: sequelize_2.DataTypes.BOOLEAN,
-            password_hash: sequelize_2.DataTypes.STRING,
-            last_action: sequelize_2.DataTypes.DATE,
-        }, {
-            sequelize: sequelize,
-            tableName: 'spc_users',
-        });
-    }
 }
 exports.User = User;
+User.init({
+    first_name: sequelize_2.DataTypes.STRING,
+    email: sequelize_2.DataTypes.STRING,
+    is_active: sequelize_2.DataTypes.BOOLEAN,
+    password_hash: sequelize_2.DataTypes.STRING,
+    last_action: sequelize_2.DataTypes.DATE,
+}, {
+    sequelize: database_1.dataBase,
+    tableName: 'spc_users',
+});

package/dist/database/models/WSAuth.d.ts

@@ -3,5 +3,4 @@ export declare class WebSocketAuth extends Model {
     token: string;
     expiration: Date;
     auth_connection_token: string;
-    static init(sequelize: any): void;
 }

package/dist/database/models/WSAuth.js

@@ -3,18 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAuth = void 0;
 const sequelize_1 = require("sequelize");
 const sequelize_2 = require("sequelize");
+const database_1 = require("../database");
 class WebSocketAuth extends sequelize_1.Model {
-    static init(sequelize) {
-        super.init({
-            token: sequelize_2.DataTypes.STRING,
-            expiration: sequelize_2.DataTypes.DATE,
-            user_id: sequelize_2.DataTypes.INTEGER,
-            is_active: sequelize_2.DataTypes.BOOLEAN,
-            auth_connection_token: sequelize_2.DataTypes.STRING,
-        }, {
-            sequelize: sequelize,
-            tableName: 'spc_wsauth'
-        });
-    }
 }
 exports.WebSocketAuth = WebSocketAuth;
+WebSocketAuth.init({
+    token: sequelize_2.DataTypes.STRING,
+    expiration: sequelize_2.DataTypes.DATE,
+    user_id: sequelize_2.DataTypes.INTEGER,
+    is_active: sequelize_2.DataTypes.BOOLEAN,
+    auth_connection_token: sequelize_2.DataTypes.STRING,
+}, {
+    sequelize: database_1.dataBase,
+    tableName: 'spc_wsauth'
+});

package/dist/routes/userauth.js

@@ -63,6 +63,6 @@ router.post('/login', (req, res) => __awaiter(void 0, void 0, void 0, function*
     }
 }));
 router.post('/getuser', auth_2.setUserDataMiddleware, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    res.send((0, response_1.JSONResponse)({}, { email: req.user.email, id: req.user.id }));
+    res.send((0, response_1.JSONResponse)({ email: req.user.email, id: req.user.id }));
 }));
 exports.default = router;

package/dist/users/users.js

@@ -10,12 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkUserPassword = exports.changeUserPassword = exports.createUser = exports.isUserExist = exports.deleteUserById = exports.getUserIdByUserEmail = exports.getUserByEmail = exports.getUserById = exports.getUserSessionData = exports.updateUserLastAction = void 0;
-const database_1 = require("./../database/database");
 const User_1 = require("./../database/models/User");
 const password_1 = require("./password");
 const config_1 = require("../auth/config");
 const secureget_1 = require("../sessions/secureget");
-User_1.User.init(database_1.dataBase);
 function updateUserLastAction(user) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -113,8 +111,8 @@ function changeUserPassword(email, password) {
             if (!user)
                 throw "Unknwon User";
             let hash = yield (0, password_1.createArgon2Hash)(password);
-            if (!hash)
-                "Create Hash Error";
+            if (typeof (hash) !== "string")
+                throw "Create Hash Error";
             user.password_hash = hash;
             yield user.save();
             return user;

package/dist/wsauth/wsauth.js

@@ -11,9 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkConnectionAuth = exports.authenticateWS = exports.checkWSAuthToken = exports.setWSAuthDataNewToken = exports.getWSAuthDataByUserId = void 0;
 const server_1 = require("../server");
-const server_2 = require("../server");
 const random_1 = require("./../utils/string/random");
-server_1.WebSocketAuth.init(server_2.dataBase);
 function getWSAuthDataByUserId(userId) {
     return __awaiter(this, void 0, void 0, function* () {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverpreconfigured",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "\"Pre-configured server with authentication system and database integration\"",
   "main": "dist/server.js",
   "keywords": [
@@ -35,7 +35,7 @@
     "nodemon": "^2.0.15",
     "pg": "^8.7.3",
     "pg-hstore": "^2.3.4",
-    "sequelize": "^7.0.0-alpha.9",
+    "sequelize": "^6.37.4",
     "sequelize-cli": "^6.4.1",
     "sucrase": "^3.20.3",
     "typescript": "^4.6.2"

package/src/database/models/User.ts

@@ -1,5 +1,6 @@
 import { Model } from "sequelize";
 import { DataTypes } from "sequelize";
+import { dataBase } from "../database";
 
 export class User extends Model{
     declare id:number;
@@ -8,20 +9,18 @@ export class User extends Model{
     declare is_active:boolean;
     declare password_hash:string;
     declare last_action:Date;
-    static init(sequelize:any){
-        super.init({
-            first_name:DataTypes.STRING,
-            email:DataTypes.STRING,
-            is_active:DataTypes.BOOLEAN,
-            password_hash:DataTypes.STRING,
-            last_action:DataTypes.DATE,
-        },
-        { 
-          sequelize:sequelize,  
-          tableName: 'spc_users',  
-        }
-        );
-    }
 }
+User.init({
+    first_name:DataTypes.STRING,
+    email:DataTypes.STRING,
+    is_active:DataTypes.BOOLEAN,
+    password_hash:DataTypes.STRING,
+    last_action:DataTypes.DATE,
+},
+{ 
+  sequelize:dataBase,  
+  tableName: 'spc_users',  
+}
+);
 
 

package/src/database/models/WSAuth.ts

@@ -1,19 +1,19 @@
 import { Model } from "sequelize";
 import { DataTypes } from "sequelize";
+import { dataBase } from "../database";
 export class WebSocketAuth extends Model{
     declare token:string;
     declare expiration:Date;
     declare auth_connection_token:string;
-    static init(sequelize:any){
-        super.init({
-          token:DataTypes.STRING,
-          expiration:DataTypes.DATE,
-          user_id:DataTypes.INTEGER, 
-          is_active:DataTypes.BOOLEAN,
-          auth_connection_token:DataTypes.STRING,
-        },{
-          sequelize:sequelize,
-          tableName:'spc_wsauth'
-        });
-    }
-} 
+} 
+
+WebSocketAuth.init({
+  token:DataTypes.STRING,
+  expiration:DataTypes.DATE,
+  user_id:DataTypes.INTEGER, 
+  is_active:DataTypes.BOOLEAN,
+  auth_connection_token:DataTypes.STRING,
+},{
+  sequelize:dataBase,
+  tableName:'spc_wsauth'
+});

package/src/middlewares/auth.ts

@@ -11,7 +11,7 @@ export async function setUserDataMiddleware(req:any,res:any,next:any){
       return res.status(401).send(JSONResponse({},"User Must Be Logged"));
     try{
         const dealerEmail=getUserSessionData(req);
-        const user:User=await User.findOne({where:{email:dealerEmail,is_active:true}});
+        const user=await User.findOne({where:{email:dealerEmail,is_active:true}});
         if(!user)
           throw "Unknown user";
         req.user=user;

package/src/routes/userauth.ts

@@ -34,7 +34,7 @@ router.post('/login',async (req,res)=>{
     try{
       const checkPass=await checkUserPassword(email,password);
       if(checkPass){
-         const user:User=await User.findOne({where:{email:email}});
+         const user=await User.findOne({where:{email:email}});
          if(!user)
             throw "Dont find User";
          if(!user.is_active){
@@ -52,6 +52,6 @@ router.post('/login',async (req,res)=>{
 });
 
 router.post('/getuser',setUserDataMiddleware,async (req:any,res)=>{
-    res.send(JSONResponse({},{email:req.user.email,id:req.user.id}));
+    res.send(JSONResponse({email:req.user.email,id:req.user.id}));
 });
 export default router;

package/src/users/users.ts

@@ -1,10 +1,9 @@
-import {dataBase} from "./../database/database";
+
 import { User } from "./../database/models/User";
 import { createArgon2Hash,checkArgon2Password } from "./password";
 import {UserCreateInterface} from "./types";
 import {SESSION_LOGGED_DATA} from "../auth/config";
 import {getSessionValue} from "../sessions/secureget";
-User.init(dataBase);
 
 export async function updateUserLastAction(user:User){
      try{
@@ -80,8 +79,8 @@ export async function changeUserPassword(email:string,password:string):Promise<U
           if(!user)   
              throw "Unknwon User";
           let hash=await createArgon2Hash(password);
-          if(!hash)
-            "Create Hash Error";
+          if(typeof(hash)!=="string")
+             throw "Create Hash Error";
           user.password_hash=hash;
           await user.save();
           return user;     

package/src/wsauth/wsauth.ts

@@ -1,7 +1,7 @@
 import { WebSocketAuth } from "../server";
-import { dataBase } from "../server";
+
 import {randomString} from "./../utils/string/random";
-WebSocketAuth.init(dataBase);
+
 export async function getWSAuthDataByUserId(userId:number):Promise<any>{
    try{
       let u=await WebSocketAuth.findOne({where:{user_id:userId.toString()}});

package/dist/logs/logs.d.ts

@@ -1,29 +0,0 @@
-import { Request } from 'express';
-export declare const BASE_LOG_PATH = "./logs";
-export declare enum LogSeverity {
-    danger = "danger",
-    servere = "severe",
-    moderate = "moderate",
-    info = "info"
-}
-export interface SaveLogOptions {
-    userId?: number;
-    data: string;
-    severity: LogSeverity;
-    addPath?: string;
-    filePrefix?: string;
-    penTestSuspcion?: boolean;
-    req?: Request;
-    ip?: string;
-    url?: string;
-}
-export declare function stringfyError(err: any): string;
-export declare function getIpFromRequest(req: Request): string;
-export declare function saveInternalErrorLog(req: Request, error: any, options?: {
-    penTestSuspcion?: boolean;
-    severity?: LogSeverity;
-}): Promise<void>;
-export declare function saveLog(options: SaveLogOptions): {
-    fileName: string;
-    basePath: string;
-};

package/dist/logs/logs.js

@@ -1,132 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveLog = exports.saveInternalErrorLog = exports.getIpFromRequest = exports.stringfyError = exports.LogSeverity = exports.BASE_LOG_PATH = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-exports.BASE_LOG_PATH = './logs';
-var LogSeverity;
-(function (LogSeverity) {
-    LogSeverity["danger"] = "danger";
-    LogSeverity["servere"] = "severe";
-    LogSeverity["moderate"] = "moderate";
-    LogSeverity["info"] = "info";
-})(LogSeverity = exports.LogSeverity || (exports.LogSeverity = {}));
-function stringfyError(err) {
-    const type = typeof (err);
-    if (type !== 'object')
-        return err.toString();
-    let ret = stringfyObject(err, 0);
-    return ret || "";
-    function stringfyObject(obj, level = 0) {
-        if (!obj)
-            return "";
-        if (typeof (obj) !== 'object')
-            return obj.toString();
-        if (level == 5)
-            return "Is Object level max 8";
-        let ret = {};
-        for (let key of Object.keys(obj)) {
-            let value = obj[key];
-            //@ts-ignore
-            ret[key] = typeof (value) == 'object' ? stringfyObject(value, level + 1).replaceAll('\\', '') : value === null || value === void 0 ? void 0 : value.toString();
-        }
-        return JSON.stringify(ret);
-    }
-}
-exports.stringfyError = stringfyError;
-function getIpFromRequest(req) {
-    //@
-    let ips = (req.headers['cf-connecting-ip'] ||
-        req.headers['x-real-ip'] ||
-        req.headers['x-forwarded-for'] ||
-        req.ip || '');
-    if (typeof (ips) == 'string') {
-        ips = ips.split(',');
-    }
-    return ips[0].trim();
-}
-exports.getIpFromRequest = getIpFromRequest;
-function saveInternalErrorLog(req, error, options) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const ip = getIpFromRequest(req);
-            const url = req.originalUrl;
-            //@ts-ignore
-            const userId = (_a = req.user) === null || _a === void 0 ? void 0 : _a.id;
-            let errorString = stringfyError(error);
-            saveLog({
-                ip: ip,
-                url: url,
-                userId: userId,
-                data: errorString,
-                severity: (options === null || options === void 0 ? void 0 : options.severity) || LogSeverity.info,
-                penTestSuspcion: options === null || options === void 0 ? void 0 : options.penTestSuspcion,
-            });
-        }
-        catch (e) {
-            console.log("Error ON Save Log", e);
-        }
-    });
-}
-exports.saveInternalErrorLog = saveInternalErrorLog;
-function saveLog(options) {
-    if (!fs_1.default.existsSync(exports.BASE_LOG_PATH)) {
-        fs_1.default.mkdirSync(exports.BASE_LOG_PATH);
-    }
-    let basePath = exports.BASE_LOG_PATH;
-    if (options.addPath) {
-        basePath = path_1.default.join(basePath, options.addPath);
-        if (!fs_1.default.existsSync(basePath)) {
-            fs_1.default.mkdirSync(basePath);
-        }
-    }
-    if (options.userId) {
-        basePath = path_1.default.join(basePath, options.userId.toString());
-    }
-    else {
-        basePath = path_1.default.join(basePath, "unlogged");
-    }
-    if (!fs_1.default.existsSync(basePath)) {
-        fs_1.default.mkdirSync(basePath);
-    }
-    let fileName = path_1.default.join(basePath, `${options.filePrefix ? options.filePrefix + '_' : ""}${getDateString(new Date())}.csv`);
-    let data = "";
-    if (fs_1.default.existsSync(fileName)) {
-        data = fs_1.default.readFileSync(fileName).toString() + "\n";
-    }
-    if (!data) {
-        data = 'Data;Severidade;Usuário;Dados;IP;URL;Supeita de Ataque\n';
-    }
-    data += `${new Date()};${options.severity};${options.userId || "Deslogado"};${options.data};${options.ip || "Não Informado"};${options.url || "Não Informado"};${options.penTestSuspcion ? "SIM" : "NÃO"}`;
-    fs_1.default.writeFileSync(fileName, data);
-    return {
-        fileName,
-        basePath,
-    };
-}
-exports.saveLog = saveLog;
-function getDateString(d) {
-    const year = d.getFullYear();
-    const month = zerof(d.getMonth() + 1);
-    const day = zerof(d.getDate());
-    const hour = zerof(d.getHours());
-    return `${year}_${month}_${day}_${hour}`;
-    function zerof(n) {
-        if (n > 9)
-            return n.toString();
-        return `0${n}`;
-    }
-}

package/src/logs/logs.ts

@@ -1,127 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { Request } from 'express';
-import axios from 'axios';
-export const BASE_LOG_PATH='./logs';
-export enum LogSeverity{
-    danger='danger',
-    servere='severe',
-    moderate='moderate',
-    info='info',
-}
-export interface SaveLogOptions{
-    userId?:number;
-    data:string;
-    severity:LogSeverity;
-    addPath?:string;
-    filePrefix?:string;
-    penTestSuspcion?:boolean;
-    req?:Request;
-    ip?:string;
-    url?:string;
-}
-
-
-export function stringfyError(err:any):string{
-   const type=typeof(err);
-   if(type!=='object')
-      return err.toString();
-   let ret=stringfyObject(err,0);
-   return ret||"";
-   function stringfyObject(obj:any,level:number=0){
-        if(!obj)
-           return "";
-        if(typeof(obj)!=='object')
-          return obj.toString();
-        if(level==5)
-           return "Is Object level max 8";
-        let ret:any={};
-        for(let key of Object.keys(obj)){
-            let value=obj[key];
-            //@ts-ignore
-            ret[key]=typeof(value)=='object'?stringfyObject(value,level+1).replaceAll('\\',''):value?.toString();
-        }
-        return JSON.stringify(ret);
-   }
-
-}
-
-
-export function getIpFromRequest(req:Request){
-        //@
-        let ips = (
-            req.headers['cf-connecting-ip'] ||
-            req.headers['x-real-ip'] ||
-            req.headers['x-forwarded-for'] ||
-            req.ip || ''
-        );
-        if(typeof(ips)=='string'){
-            ips=ips.split(',');
-        }
-        return ips[0].trim();
-}
-export async function saveInternalErrorLog(req:Request,error:any,options?:{penTestSuspcion?:boolean,severity?:LogSeverity}){
-     try{
-         const ip=getIpFromRequest(req);
-         const url=req.originalUrl;
-         //@ts-ignore
-         const userId=req.user?.id;
-         let errorString=stringfyError(error);
-         saveLog({
-            ip:ip,
-            url:url,
-            userId:userId,
-            data:errorString,
-            severity:options?.severity||LogSeverity.info,
-            penTestSuspcion:options?.penTestSuspcion,
-         });
-     }catch(e){
-        console.log("Error ON Save Log",e);
-     }
-}
-export function saveLog(options:SaveLogOptions){
-    if(!fs.existsSync(BASE_LOG_PATH)){
-        fs.mkdirSync(BASE_LOG_PATH);
-    }
-    let basePath=BASE_LOG_PATH;
-    if(options.addPath){
-        basePath=path.join(basePath,options.addPath);
-        if(!fs.existsSync(basePath)){
-            fs.mkdirSync(basePath);
-        }
-    }
-    if(options.userId){
-         basePath=path.join(basePath,options.userId.toString());
-    }else{
-        basePath=path.join(basePath,"unlogged");
-    } 
-    if(!fs.existsSync(basePath)){
-        fs.mkdirSync(basePath);
-    }
-    let fileName=path.join(basePath,`${options.filePrefix?options.filePrefix+'_':""}${getDateString(new Date())}.csv`);
-    let data="";
-    if(fs.existsSync(fileName)){
-        data=fs.readFileSync(fileName).toString()+"\n";
-    }
-    if(!data){
-        data='Data;Severidade;Usuário;Dados;IP;URL;Supeita de Ataque\n';
-    }
-    data+=`${new Date()};${options.severity};${options.userId||"Deslogado"};${options.data};${options.ip||"Não Informado"};${options.url||"Não Informado"};${options.penTestSuspcion?"SIM":"NÃO"}`;
-    fs.writeFileSync(fileName,data);
-    return {
-        fileName,
-        basePath,
-    };
-}
-function getDateString(d:Date){
-  const year=d.getFullYear();
-  const month=zerof(d.getMonth()+1);
-  const day=zerof(d.getDate());
-  const hour=zerof(d.getHours());
-  return `${year}_${month}_${day}_${hour}`;
-  function zerof(n:number){
-       if(n>9)
-         return n.toString();
-       return `0${n}`; 
-  }
-}