serverpreconfigured 1.0.6 → 1.1.0

package/dist/auth/auth.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.userIsLogged = void 0;
 const secureget_1 = require("../sessions/secureget");
 const config_1 = require("./config");
 function userIsLogged(req) {
-    let user = secureget_1.getSessionValue(req, config_1.SESSION_LOGGED_DATA);
+    let user = (0, secureget_1.getSessionValue)(req, config_1.SESSION_LOGGED_DATA);
     if (user)
         return true;
     return false;

package/dist/auth/config.js

@@ -1,3 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SESSION_LOGGED_DATA = void 0;
 exports.SESSION_LOGGED_DATA = 'email';

package/dist/database/database.d.ts

@@ -1 +1,2 @@
-export declare const dataBase: any;
+import { Sequelize } from "sequelize";
+export declare const dataBase: Sequelize;

package/dist/database/database.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.dataBase = void 0;
 //@ts-ignore
 //@ts-nocheck
 const sequelize_1 = require("sequelize");

package/dist/database/models/User.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.User = void 0;
 const sequelize_1 = require("sequelize");
 const sequelize_2 = require("sequelize");
 class User extends sequelize_1.Model {

package/dist/database/models/WSAuth.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketAuth = void 0;
 const sequelize_1 = require("sequelize");
 const sequelize_2 = require("sequelize");
 class WebSocketAuth extends sequelize_1.Model {

package/dist/expressServer.js

@@ -15,7 +15,7 @@ class ExpressServer {
         this.authBaseUrl = "";
         this.wsAuthBaseUrl = "";
         this.usePort = env_1.default.PORT;
-        this.app = express_1.default();
+        this.app = (0, express_1.default)();
         this.initModules();
     }
     listen(port = null) {
@@ -24,9 +24,9 @@ class ExpressServer {
         this.app.listen(this.usePort);
     }
     initModules() {
-        sessions_1.initSessions(this.app);
-        postreader_1.initPostReader(this.app);
-        initcors_1.initCors(this.app);
+        (0, sessions_1.initSessions)(this.app);
+        (0, postreader_1.initPostReader)(this.app);
+        (0, initcors_1.initCors)(this.app);
     }
     initAuthSystem(baseUrl = '/user') {
         this.authBaseUrl = baseUrl;

package/dist/middlewares/auth.d.ts

@@ -0,0 +1 @@
+export declare function setUserDataMiddleware(req: any, res: any, next: any): Promise<any>;

package/dist/middlewares/auth.js

@@ -0,0 +1,40 @@
+"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.setUserDataMiddleware = void 0;
+const server_1 = require("../server");
+const server_2 = require("../server");
+const server_3 = require("../server");
+const server_4 = require("../server");
+const env_1 = __importDefault(require("../settings/env"));
+const DEBUG = env_1.default.NODE_ENV === 'development' ? true : false;
+function setUserDataMiddleware(req, res, next) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!(0, server_1.userIsLogged)(req))
+            return res.status(401).send((0, server_2.JSONResponse)(false, undefined, "User Must Be Logged"));
+        try {
+            const dealerEmail = (0, server_3.getUserSessionData)(req);
+            const dealerId = yield (0, server_4.getUserIdByUserEmail)(dealerEmail);
+            req.user = { email: dealerEmail, id: dealerId };
+            next();
+        }
+        catch (e) {
+            let more = null;
+            if (DEBUG)
+                more = e;
+            return res.status(500).send((0, server_2.JSONResponse)(false, undefined, "Get dealer data error", more));
+        }
+    });
+}
+exports.setUserDataMiddleware = setUserDataMiddleware;

package/dist/middlewares/post.d.ts

@@ -0,0 +1 @@
+export declare function checkAndFilterPostParams(req: any, res: any, next: any): void;

package/dist/middlewares/post.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkAndFilterPostParams = void 0;
+function checkAndFilterPostParams(req, res, next) {
+}
+exports.checkAndFilterPostParams = checkAndFilterPostParams;

package/dist/middlewares/wsauth.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/middlewares/wsauth.js

@@ -0,0 +1,54 @@
+"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 });
+const random_1 = require("../utils/string/random");
+const wsauth_1 = require("../wsauth/wsauth");
+const response_1 = require("../utils/response");
+const server_1 = require("../server");
+const meta_sanitizer_1 = __importDefault(require("meta-sanitizer"));
+const DEBUG = true;
+function checkWSAuth(ws, msg) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            if (ws.userId && ws.connectionToken) {
+                if ((yield (0, wsauth_1.checkConnectionAuth)(ws.userId, ws.connectionToken)))
+                    return true;
+            }
+            const message = JSON.parse(msg);
+            if (message.action === "Authenticate") {
+                const token = meta_sanitizer_1.default.justCharsAndNumbers(message.token, false);
+                const userId = parseInt(meta_sanitizer_1.default.justNumbers(message.userId, false));
+                const connectionToken = (0, random_1.randomString)(35);
+                if ((yield (0, server_1.authenticateWS)(userId, token, connectionToken))) {
+                    ws.userId = userId;
+                    ws.connectionToken = connectionToken;
+                    return true;
+                }
+                else {
+                    return sendError(false, "Invalid Token or UserID");
+                }
+            }
+            else {
+                return sendError(false, "Need auth", "'action'='Authenticate' and must have 'token' and 'userId'");
+            }
+        }
+        catch (e) {
+            return sendError(false, "Internal Error", "", e);
+        }
+        function sendError(isOk, message, errorMessage = "", data = {}) {
+            ws.send((0, response_1.WSResponse)(isOk, message, errorMessage, data));
+            return false;
+        }
+    });
+}

package/dist/modules/initcors.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.initCors = void 0;
 const cors_1 = __importDefault(require("cors"));
 const env_1 = __importDefault(require("../settings/env"));
 function initCors(app) {
     if (env_1.default.ALLOW_CORS)
-        app.use(cors_1.default());
+        app.use((0, cors_1.default)());
 }
 exports.initCors = initCors;

package/dist/modules/postreader.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.initPostReader = void 0;
 const express_1 = __importDefault(require("express"));
 function initPostReader(app) {
     app.use(express_1.default.json());

package/dist/modules/sessions.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.initSessions = void 0;
 const express_session_1 = __importDefault(require("express-session"));
 const env_1 = __importDefault(require("../settings/env"));
 function initSessions(app) {
     app.set('trust proxy', 1); // trust first proxy
-    app.use(express_session_1.default({
+    app.use((0, express_session_1.default)({
         secret: 'keyboard cat',
         resave: false,
         saveUninitialized: true,

package/dist/routes/users.js

@@ -20,11 +20,14 @@ const auth_1 = require("../auth/auth");
 const meta_sanitizer_1 = __importDefault(require("meta-sanitizer"));
 const users_1 = require("../users/users");
 const users_2 = require("../users/users");
+const env_1 = __importDefault(require("../settings/env"));
+const DEBUG = env_1.default.NODE_ENV === 'development' ? true : false;
 var LoginErrorCode;
 (function (LoginErrorCode) {
     LoginErrorCode[LoginErrorCode["NoError"] = 0] = "NoError";
     LoginErrorCode[LoginErrorCode["InvalidParams"] = 1] = "InvalidParams";
     LoginErrorCode[LoginErrorCode["InvalidPassword"] = 2] = "InvalidPassword";
+    LoginErrorCode[LoginErrorCode["InternalError"] = 3] = "InternalError";
 })(LoginErrorCode || (LoginErrorCode = {}));
 var RegisterUserErrorCode;
 (function (RegisterUserErrorCode) {
@@ -36,11 +39,11 @@ var RegisterUserErrorCode;
 const router = express_1.default.Router();
 router.post('/logout', (req, res) => {
     let is_ok = false;
-    if (auth_1.userIsLogged(req)) {
-        secureset_1.deleteSessionValue(req, config_1.SESSION_LOGGED_DATA);
+    if ((0, auth_1.userIsLogged)(req)) {
+        (0, secureset_1.deleteSessionValue)(req, config_1.SESSION_LOGGED_DATA);
         is_ok = true;
     }
-    res.send(response_1.JSONResponse(is_ok, 0, is_ok ? "" : "User Must be logged", {}));
+    res.send((0, response_1.JSONResponse)(is_ok, 0, is_ok ? "" : "User Must be logged", {}));
 });
 router.post('/login', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     let email = "";
@@ -50,16 +53,24 @@ router.post('/login', (req, res) => __awaiter(void 0, void 0, void 0, function*
         password = meta_sanitizer_1.default.queryProtector(req.body.password);
     }
     catch (e) {
-        return res.send(response_1.JSONResponse(false, LoginErrorCode.InvalidParams, "Must have 'email' and 'password' params"));
+        return res.send((0, response_1.JSONResponse)(false, LoginErrorCode.InvalidParams, "Must have 'email' and 'password' params"));
     }
     if (password == "" || email == "")
-        return res.send(response_1.JSONResponse(false, LoginErrorCode.InvalidParams, "Must have 'email' and 'password' params"));
-    const checkPass = yield users_1.checkUserPassword(email, password);
-    if (checkPass) {
-        secureset_1.setSessionValue(req, config_1.SESSION_LOGGED_DATA, email);
-        return res.send(response_1.JSONResponse(true, LoginErrorCode.NoError, "Login Ok"));
+        return res.send((0, response_1.JSONResponse)(false, LoginErrorCode.InvalidParams, "Must have 'email' and 'password' params"));
+    try {
+        const checkPass = yield (0, users_1.checkUserPassword)(email, password);
+        if (checkPass) {
+            (0, secureset_1.setSessionValue)(req, config_1.SESSION_LOGGED_DATA, 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"));
+    }
+    catch (e) {
+        let more = null;
+        if (DEBUG)
+            more = e;
+        return res.send((0, response_1.JSONResponse)(false, LoginErrorCode.InternalError, "I-Error", more));
     }
-    return res.send(response_1.JSONResponse(false, LoginErrorCode.InvalidPassword, "Invalid Password"));
 }));
 router.post('/register', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -67,14 +78,14 @@ router.post('/register', (req, res) => __awaiter(void 0, void 0, void 0, functio
         let password = meta_sanitizer_1.default.queryProtector(req.body.password || '');
         let name = meta_sanitizer_1.default.SanitizerEngine(req.body.name || '', true, false, [' ']).sanitizedData;
         if (email == "" || password == "" || name == "")
-            return res.send(response_1.JSONResponse(false, RegisterUserErrorCode.InvalidParams, "Invalid params"));
-        yield users_2.createUser({ first_name: name, email: email, password_string: password });
-        return res.send(response_1.JSONResponse(true, RegisterUserErrorCode.NoError, "", "REGISTER OK"));
+            return res.send((0, response_1.JSONResponse)(false, RegisterUserErrorCode.InvalidParams, "Invalid params"));
+        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"));
     }
     catch (e) {
         if (e === "User exist")
-            return res.send(response_1.JSONResponse(false, RegisterUserErrorCode.UserExist, "User Exist"));
-        return res.send(response_1.JSONResponse(false, RegisterUserErrorCode.InternalError, "I-Error"));
+            return res.send((0, response_1.JSONResponse)(false, RegisterUserErrorCode.UserExist, "User Exist"));
+        return res.send((0, response_1.JSONResponse)(false, RegisterUserErrorCode.InternalError, "I-Error"));
     }
 }));
 exports.default = router;

package/dist/routes/wsauth.js

@@ -12,14 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.router = void 0;
 const express_1 = __importDefault(require("express"));
 const response_1 = require("../utils/response");
-const auth_1 = require("../auth/auth");
 const wsauth_1 = require("../wsauth/wsauth");
-const users_1 = require("../users/users");
-const server_1 = require("../server");
-const config_1 = require("../auth/config");
+const env_1 = __importDefault(require("../settings/env"));
+const auth_1 = require("../middlewares/auth");
 exports.router = express_1.default.Router();
+const DEBUG = env_1.default.NODE_ENV === 'development' ? true : false;
 var GenerateTokenError;
 (function (GenerateTokenError) {
     GenerateTokenError[GenerateTokenError["UserMustBeLogged"] = 1] = "UserMustBeLogged";
@@ -27,19 +27,19 @@ var GenerateTokenError;
     GenerateTokenError[GenerateTokenError["InternalError"] = 3] = "InternalError";
 })(GenerateTokenError || (GenerateTokenError = {}));
 ;
-exports.router.post('/gettoken', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!auth_1.userIsLogged(req))
-        return res.send(response_1.JSONResponse(false, GenerateTokenError.UserMustBeLogged, "User Must Be Logged"));
+exports.router.post('/gettoken', auth_1.setUserDataMiddleware, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        let userId = yield users_1.getUserIdByUserEmail(server_1.getSessionValue(req, config_1.SESSION_LOGGED_DATA));
-        if (userId == NaN)
-            return res.send(response_1.JSONResponse(false, GenerateTokenError.GetUserError, "Get user error"));
-        let n = yield wsauth_1.setWSAuthDataNewToken(userId);
-        return res.send(response_1.JSONResponse(true, 0, "", { token: n.dataValues.token,
+        let userId = req.user.id;
+        let n = yield (0, wsauth_1.setWSAuthDataNewToken)(userId);
+        return res.send((0, response_1.JSONResponse)(true, 0, "", { token: n.dataValues.token,
             expiration: n.dataValues.expiration,
             userId: userId
         }));
     }
     catch (e) {
+        let more = null;
+        if (DEBUG)
+            more = e;
+        return res.status(500).send((0, response_1.JSONResponse)(false, GenerateTokenError.InternalError, "I-Error", more));
     }
 }));

package/dist/server.d.ts

@@ -1,12 +1,14 @@
-export { userIsLogged } from "./auth/auth";
+export * from "./auth/auth";
 export { User } from "./database/models/User";
 export { dataBase } from "./database/database";
-export { setSessionValue, deleteSessionValue } from "./sessions/secureset";
-export { getSessionValue } from "./sessions/secureget";
-export { checkUserPassword } from "./users/users";
+export * from "./sessions/secureset";
+export * from "./sessions/secureget";
+export * from "./users/users";
 export { WebSocketAuth } from "./database/models/WSAuth";
-export { checkWSAuthToken, authenticateWS, checkConnectionAuth } from "./wsauth/wsauth";
+export * from "./wsauth/wsauth";
 export { randomString } from "./utils/string/random";
 export { JSONResponse } from "./utils/response";
 import ExpressServer from "./expressServer";
+export * from "./middlewares/auth";
+export * from "./middlewares/wsauth";
 export default ExpressServer;

package/dist/server.js

@@ -1,31 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var auth_1 = require("./auth/auth");
-exports.userIsLogged = auth_1.userIsLogged;
+exports.JSONResponse = exports.randomString = exports.WebSocketAuth = exports.dataBase = exports.User = void 0;
+__exportStar(require("./auth/auth"), exports);
 ;
 var User_1 = require("./database/models/User");
-exports.User = User_1.User;
+Object.defineProperty(exports, "User", { enumerable: true, get: function () { return User_1.User; } });
 var database_1 = require("./database/database");
-exports.dataBase = database_1.dataBase;
-var secureset_1 = require("./sessions/secureset");
-exports.setSessionValue = secureset_1.setSessionValue;
-exports.deleteSessionValue = secureset_1.deleteSessionValue;
-var secureget_1 = require("./sessions/secureget");
-exports.getSessionValue = secureget_1.getSessionValue;
-var users_1 = require("./users/users");
-exports.checkUserPassword = users_1.checkUserPassword;
+Object.defineProperty(exports, "dataBase", { enumerable: true, get: function () { return database_1.dataBase; } });
+__exportStar(require("./sessions/secureset"), exports);
+__exportStar(require("./sessions/secureget"), exports);
+__exportStar(require("./users/users"), exports);
 var WSAuth_1 = require("./database/models/WSAuth");
-exports.WebSocketAuth = WSAuth_1.WebSocketAuth;
-var wsauth_1 = require("./wsauth/wsauth");
-exports.checkWSAuthToken = wsauth_1.checkWSAuthToken;
-exports.authenticateWS = wsauth_1.authenticateWS;
-exports.checkConnectionAuth = wsauth_1.checkConnectionAuth;
+Object.defineProperty(exports, "WebSocketAuth", { enumerable: true, get: function () { return WSAuth_1.WebSocketAuth; } });
+__exportStar(require("./wsauth/wsauth"), exports);
 var random_1 = require("./utils/string/random");
-exports.randomString = random_1.randomString;
+Object.defineProperty(exports, "randomString", { enumerable: true, get: function () { return random_1.randomString; } });
 var response_1 = require("./utils/response");
-exports.JSONResponse = response_1.JSONResponse;
+Object.defineProperty(exports, "JSONResponse", { enumerable: true, get: function () { return response_1.JSONResponse; } });
 const expressServer_1 = __importDefault(require("./expressServer"));
+__exportStar(require("./middlewares/auth"), exports);
+__exportStar(require("./middlewares/wsauth"), exports);
 exports.default = expressServer_1.default;

package/dist/sessions/secureget.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSessionValue = void 0;
 function getSessionValue(req, get) {
     return req.session[get];
 }

package/dist/sessions/secureset.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteSessionValue = exports.setSessionValue = void 0;
 function setSessionValue(req, to, value) {
     req.session[to] = value;
 }

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

@@ -1,10 +1,10 @@
-export declare const dialect: string;
-export declare const host: string;
-export declare const database: string;
-export declare const username: string;
-export declare const password: string;
-export declare namespace define {
-    export const underscored: boolean;
-    export const timestamps: boolean;
+export const dialect: string;
+export const host: string;
+export const database: string;
+export const username: string;
+export const password: string;
+export namespace define {
+    const underscored: boolean;
+    const timestamps: boolean;
 }
-export declare const logging: boolean;
+export const logging: boolean;

package/dist/users/password.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkArgon2Password = exports.createArgon2Hash = void 0;
 const argon2_1 = __importDefault(require("argon2"));
 function createArgon2Hash(password_string) {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/users/users.d.ts

@@ -1,4 +1,5 @@
 import { UserCreateInterface } from "./types";
+export declare function getUserSessionData(req: any): string;
 export declare function getUserById(id: Number): Promise<any>;
 export declare function getUserByEmail(email: string): Promise<any>;
 export declare function getUserIdByUserEmail(email: string): Promise<number>;

package/dist/users/users.js

@@ -9,10 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkUserPassword = exports.createUser = exports.isUserExist = exports.deleteUserById = exports.getUserIdByUserEmail = exports.getUserByEmail = exports.getUserById = exports.getUserSessionData = 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 getUserSessionData(req) {
+    return (0, secureget_1.getSessionValue)(req, config_1.SESSION_LOGGED_DATA);
+}
+exports.getUserSessionData = getUserSessionData;
 function getUserById(id) {
     return __awaiter(this, void 0, void 0, function* () {
         let result = yield User_1.User.findOne({ where: { id: id.toString() } });
@@ -71,7 +78,7 @@ function createUser(data) {
         }
         if (user_exist)
             throw "User exist";
-        let hash = yield password_1.createArgon2Hash(data.password_string);
+        let hash = yield (0, password_1.createArgon2Hash)(data.password_string);
         if (!hash)
             throw "Create argon2 hash error";
         try {
@@ -93,12 +100,12 @@ function checkUserPassword(email, password_string) {
             user = yield getUserByEmail(email);
         }
         catch (e) {
-            return false;
+            throw e;
         }
         if (!user)
             return false;
         let hash = user.dataValues.password_hash;
-        if ((yield password_1.checkArgon2Password(hash, password_string)) == 'Match')
+        if ((yield (0, password_1.checkArgon2Password)(hash, password_string)) == 'Match')
             return true;
         return false;
     });

package/dist/utils/response.d.ts

@@ -1 +1,2 @@
 export declare function JSONResponse(is_ok: boolean, error_code?: number, error_message?: string, data?: any): string;
+export declare function WSResponse(isOK: boolean, message?: string, errorMessage?: string, data?: any): string;

package/dist/utils/response.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WSResponse = exports.JSONResponse = void 0;
 function JSONResponse(is_ok, error_code = 0, error_message = '', data = {}) {
     const ret_data = {
         is_ok: is_ok,
@@ -10,3 +11,12 @@ function JSONResponse(is_ok, error_code = 0, error_message = '', data = {}) {
     return JSON.stringify(ret_data);
 }
 exports.JSONResponse = JSONResponse;
+function WSResponse(isOK, message = '', errorMessage = "", data = {}) {
+    return JSON.stringify({
+        is_ok: isOK,
+        message: message,
+        error_message: errorMessage,
+        data: data
+    });
+}
+exports.WSResponse = WSResponse;

package/dist/utils/string/random.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomString = void 0;
 function randomString(length) {
     var result = '';
     var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';

package/dist/wsauth/wsauth.js

@@ -9,6 +9,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");
@@ -29,7 +30,7 @@ function setWSAuthDataNewToken(userId, expiration_hours = 72) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             let ws = yield getWSAuthDataByUserId(userId);
-            let token = random_1.randomString(50);
+            let token = (0, random_1.randomString)(50);
             let expiration = new Date();
             expiration.setTime(expiration.getTime() + expiration_hours * 60 * 60 * 1000);
             if (!Boolean(ws)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverpreconfigured",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "\"Pre-configured server with authentication system and database integration\"",
   "main": "dist/server.js",
   "keywords": ["server","pre configured","database","authentication"],
@@ -21,7 +21,7 @@
     "cors": "^2.8.5",
     "express": "^4.17.3",
     "express-session": "^1.17.2",
-    "meta-sanitizer": "^2.0.2",
+    "meta-sanitizer": "^2.1.4",
     "nodemon": "^2.0.15",
     "pg": "^8.7.3",
     "pg-hstore": "^2.3.4",

package/src/middlewares/auth.ts

@@ -0,0 +1,21 @@
+import { userIsLogged } from "../server";
+import { JSONResponse } from "../server";
+import { getUserSessionData } from "../server";
+import { getUserIdByUserEmail } from "../server";
+import ENV from "../settings/env";
+const DEBUG=ENV.NODE_ENV==='development'?true:false;
+export async function setUserDataMiddleware(req:any,res:any,next:any){
+    if(!userIsLogged(req))
+      return res.status(401).send(JSONResponse(false,undefined,"User Must Be Logged"));
+    try{
+        const dealerEmail=getUserSessionData(req);
+        const dealerId=await getUserIdByUserEmail(dealerEmail);
+        req.user={email:dealerEmail,id:dealerId};
+        next();
+     }catch(e){
+       let more=null;
+       if(DEBUG)
+         more=e;  
+       return res.status(500).send(JSONResponse(false,undefined,"Get dealer data error",more));
+     }  
+}

package/src/middlewares/post.ts

@@ -0,0 +1,4 @@
+import meta_sanitizer from "meta-sanitizer";
+export function checkAndFilterPostParams(req:any,res:any,next:any){
+     
+}

package/src/middlewares/wsauth.ts

@@ -0,0 +1,36 @@
+import { randomString } from "../utils/string/random";
+import { checkConnectionAuth } from "../wsauth/wsauth";
+import { WSResponse } from "../utils/response";
+import { authenticateWS } from "../server";
+import meta_sanitizer from "meta-sanitizer";
+const DEBUG=true;
+async function checkWSAuth(ws:any,msg:any):Promise<boolean>{
+    try{
+        if(ws.userId && ws.connectionToken){
+            if((await checkConnectionAuth(ws.userId,ws.connectionToken)))
+                return true;
+        }
+        const message=JSON.parse(msg);
+        if(message.action==="Authenticate"){
+            const token=meta_sanitizer.justCharsAndNumbers(message.token,false);
+            const userId=parseInt(meta_sanitizer.justNumbers(message.userId,false));
+            const connectionToken=randomString(35);
+            if((await authenticateWS(userId,token,connectionToken))){
+               ws.userId=userId;
+               ws.connectionToken=connectionToken;
+               return true;
+            }else{
+               return sendError(false,"Invalid Token or UserID");
+            }
+        }else{
+            return sendError(false,"Need auth","'action'='Authenticate' and must have 'token' and 'userId'");
+        }   
+    }catch(e){
+           return sendError(false,"Internal Error","",e);
+    }  
+
+    function sendError(isOk:boolean,message:string,errorMessage:string="",data:any={}){
+        ws.send(WSResponse(isOk,message,errorMessage,data));
+        return false;
+    }
+}

package/src/routes/users.ts

@@ -6,10 +6,13 @@ import { userIsLogged } from "../auth/auth";
 import meta_sanitizer from 'meta-sanitizer';
 import { checkUserPassword } from "../users/users";
 import { createUser } from "../users/users";
+import ENV from "../settings/env";
+const DEBUG=ENV.NODE_ENV==='development'?true:false;
 enum LoginErrorCode{
     NoError=0,
     InvalidParams,
     InvalidPassword,
+    InternalError,
 
 }
 enum RegisterUserErrorCode{
@@ -38,12 +41,20 @@ router.post('/login',async (req,res)=>{
     }
     if(password==""||email=="")
       return res.send(JSONResponse(false,LoginErrorCode.InvalidParams,"Must have 'email' and 'password' params"));
-    const checkPass=await checkUserPassword(email,password);
-    if(checkPass){
-       setSessionValue(req,SESSION_LOGGED_DATA,email);
-       return res.send(JSONResponse(true,LoginErrorCode.NoError,"Login Ok"));
-    }
-    return res.send(JSONResponse(false,LoginErrorCode.InvalidPassword,"Invalid Password"));
+    try{
+      const checkPass=await checkUserPassword(email,password);
+      if(checkPass){
+         setSessionValue(req,SESSION_LOGGED_DATA,email);
+         return res.send(JSONResponse(true,LoginErrorCode.NoError,"Login Ok"));
+      }
+      return res.send(JSONResponse(false,LoginErrorCode.InvalidPassword,"Invalid Password"));
+    }catch(e){
+      let more=null;
+      if(DEBUG)
+        more=e;
+      return res.send(JSONResponse(false,LoginErrorCode.InternalError,"I-Error",more));
+    }  
+    
 });
 router.post('/register',async (req,res)=>{
     try{

package/src/routes/wsauth.ts

@@ -1,29 +1,27 @@
 import  express  from "express";
 import { JSONResponse } from "../utils/response";
-import { userIsLogged } from "../auth/auth";
 import { setWSAuthDataNewToken } from "../wsauth/wsauth";
-import { getUserIdByUserEmail } from "../users/users";
-import { getSessionValue } from "../server";
-import { SESSION_LOGGED_DATA } from "../auth/config";
+import ENV from "../settings/env";
+import { setUserDataMiddleware } from "../middlewares/auth";
 export const router=express.Router();
+const DEBUG=ENV.NODE_ENV==='development'?true:false;
 enum GenerateTokenError{
    UserMustBeLogged=1,
    GetUserError,
    InternalError,
 };
-router.post('/gettoken',async (req,res)=>{
-   if(!userIsLogged(req))
-       return res.send(JSONResponse(false,GenerateTokenError.UserMustBeLogged,"User Must Be Logged"));
+router.post('/gettoken',setUserDataMiddleware,async (req:any,res:any)=>{
    try{
-       let userId=await getUserIdByUserEmail(getSessionValue(req,SESSION_LOGGED_DATA));
-       if(userId==NaN)
-         return res.send(JSONResponse(false,GenerateTokenError.GetUserError,"Get user error"));
+       let userId:number=req.user.id;
        let n=await setWSAuthDataNewToken(userId);
        return res.send(JSONResponse(true,0,"",{token:n.dataValues.token,
                                                expiration:n.dataValues.expiration,
                                                userId:userId
                                                }));
    }catch(e){
-
+      let more=null;
+      if(DEBUG)
+         more=e;
+      return res.status(500).send(JSONResponse(false,GenerateTokenError.InternalError,"I-Error",more));
    }
 });

package/src/server.ts

@@ -1,12 +1,14 @@
-export { userIsLogged } from "./auth/auth";;
+export  * from "./auth/auth";;
 export { User } from "./database/models/User";
 export { dataBase } from "./database/database";
-export { setSessionValue,deleteSessionValue } from "./sessions/secureset";
-export { getSessionValue } from "./sessions/secureget";
-export { checkUserPassword } from "./users/users";
+export * from "./sessions/secureset";
+export * from "./sessions/secureget";
+export * from "./users/users";
 export { WebSocketAuth } from "./database/models/WSAuth";
-export { checkWSAuthToken ,authenticateWS,checkConnectionAuth} from "./wsauth/wsauth";
+export * from "./wsauth/wsauth";
 export { randomString } from "./utils/string/random";
 export { JSONResponse } from "./utils/response";
 import ExpressServer from "./expressServer";
+export * from "./middlewares/auth";
+export * from "./middlewares/wsauth";
 export default ExpressServer;

package/src/users/users.ts

@@ -2,13 +2,19 @@ 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 getUserById(id:Number){
+
+export function getUserSessionData(req:any):string{
+   return getSessionValue(req,SESSION_LOGGED_DATA);
+}
+export async function getUserById(id:Number):Promise<any>{
      let result=await User.findOne({where:{id:id.toString()}});
      return (result);
 }
 
-export async function getUserByEmail(email:string){
+export async function getUserByEmail(email:string):Promise<any>{
      let result=await User.findOne({where:{email:email}});
      return (result);
 }
@@ -23,11 +29,11 @@ export async function getUserIdByUserEmail(email:string):Promise<number>{
      }
 }
 
-export async function deleteUserById(id:Number){
+export async function deleteUserById(id:Number):Promise<any>{
      let result=await User.destroy({where:{id:id.toString()}});
      return result;
 }
-export async function isUserExist(email:string) {
+export async function isUserExist(email:string):Promise<boolean>{
      try{
           let user=await getUserByEmail(email);
           return Boolean(user);
@@ -36,7 +42,7 @@ export async function isUserExist(email:string) {
      }     
 }
 
-export async function createUser(data:UserCreateInterface){
+export async function createUser(data:UserCreateInterface):Promise<any>{
      let user_exist=false;
      try{
           user_exist=await isUserExist(data.email);
@@ -63,7 +69,7 @@ export async function checkUserPassword(email:string,password_string:string):Pro
     try{
          user=await getUserByEmail(email);
     }catch(e){
-         return false;
+         throw e;
     }
     if(!user)
       return false;

package/src/utils/response.ts

@@ -6,4 +6,12 @@ export function JSONResponse(is_ok:boolean,error_code:number=0,error_message:str
         data:data,
     };
     return JSON.stringify(ret_data);
-}
+}
+export function WSResponse(isOK:boolean,message:string='',errorMessage:string="",data:any={}):string{
+    return JSON.stringify({
+      is_ok:isOK,
+      message:message,
+      error_message:errorMessage,     
+      data:data
+    });
+ }