serverpreconfigured 1.0.8 → 1.1.2

package/dist/middlewares/auth.js

@@ -22,7 +22,7 @@ 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.send((0, server_2.JSONResponse)(false, undefined, "User Must Be Logged"));
+            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);
@@ -33,7 +33,7 @@ function setUserDataMiddleware(req, res, next) {
             let more = null;
             if (DEBUG)
                 more = e;
-            return res.send((0, server_2.JSONResponse)(false, undefined, "Get dealer data error", more));
+            return res.status(500).send((0, server_2.JSONResponse)(false, undefined, "Get dealer data error", more));
         }
     });
 }

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 declare function checkWSAuth(ws: any, msg: any): Promise<boolean>;

package/dist/middlewares/wsauth.js

@@ -1 +1,56 @@
 "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.checkWSAuth = void 0;
+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;
+        }
+    });
+}
+exports.checkWSAuth = checkWSAuth;

package/dist/routes/users.js

@@ -20,6 +20,7 @@ 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 auth_2 = require("../middlewares/auth");
 const env_1 = __importDefault(require("../settings/env"));
 const DEBUG = env_1.default.NODE_ENV === 'development' ? true : false;
 var LoginErrorCode;
@@ -88,4 +89,7 @@ router.post('/register', (req, res) => __awaiter(void 0, void 0, void 0, functio
         return res.send((0, response_1.JSONResponse)(false, RegisterUserErrorCode.InternalError, "I-Error"));
     }
 }));
+router.post('/getuser', auth_2.setUserDataMiddleware, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    res.send((0, response_1.JSONResponse)(true, 0, "", { email: req.user.email, id: req.user.id }));
+}));
 exports.default = router;

package/dist/routes/wsauth.js

@@ -40,6 +40,6 @@ exports.router.post('/gettoken', auth_1.setUserDataMiddleware, (req, res) => __a
         let more = null;
         if (DEBUG)
             more = e;
-        return res.send((0, response_1.JSONResponse)(false, GenerateTokenError.InternalError, "I-Error", more));
+        return res.status(500).send((0, response_1.JSONResponse)(false, GenerateTokenError.InternalError, "I-Error", more));
     }
 }));

package/dist/server.d.ts

@@ -10,4 +10,5 @@ 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

@@ -36,4 +36,5 @@ var response_1 = require("./utils/response");
 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/users/users.d.ts

@@ -1,9 +1,9 @@
 import { UserCreateInterface } from "./types";
 export declare function getUserSessionData(req: any): string;
-export declare function getUserById(id: Number): Promise<Bluebird<T>>;
-export declare function getUserByEmail(email: string): Promise<Bluebird<T>>;
+export declare function getUserById(id: Number): Promise<any>;
+export declare function getUserByEmail(email: string): Promise<any>;
 export declare function getUserIdByUserEmail(email: string): Promise<number>;
-export declare function deleteUserById(id: Number): Promise<Bluebird<T>>;
+export declare function deleteUserById(id: Number): Promise<any>;
 export declare function isUserExist(email: string): Promise<boolean>;
-export declare function createUser(data: UserCreateInterface): Promise<Bluebird<T>>;
+export declare function createUser(data: UserCreateInterface): Promise<any>;
 export declare function checkUserPassword(email: string, password_string: string): Promise<boolean>;

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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSONResponse = void 0;
+exports.WSResponse = exports.JSONResponse = void 0;
 function JSONResponse(is_ok, error_code = 0, error_message = '', data = {}) {
     const ret_data = {
         is_ok: is_ok,
@@ -11,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverpreconfigured",
-  "version": "1.0.8",
+  "version": "1.1.2",
   "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.1.1",
+    "meta-sanitizer": "^2.1.4",
     "nodemon": "^2.0.15",
     "pg": "^8.7.3",
     "pg-hstore": "^2.3.4",

package/src/middlewares/auth.ts

@@ -6,7 +6,7 @@ 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.send(JSONResponse(false,undefined,"User Must Be Logged"));
+      return res.status(401).send(JSONResponse(false,undefined,"User Must Be Logged"));
     try{
         const dealerEmail=getUserSessionData(req);
         const dealerId=await getUserIdByUserEmail(dealerEmail);
@@ -16,6 +16,6 @@ export async function setUserDataMiddleware(req:any,res:any,next:any){
        let more=null;
        if(DEBUG)
          more=e;  
-       return res.send(JSONResponse(false,undefined,"Get dealer data error",more));
+       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;
+export 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,7 +6,9 @@ import { userIsLogged } from "../auth/auth";
 import meta_sanitizer from 'meta-sanitizer';
 import { checkUserPassword } from "../users/users";
 import { createUser } from "../users/users";
+import { setUserDataMiddleware } from "../middlewares/auth";
 import ENV from "../settings/env";
+
 const DEBUG=ENV.NODE_ENV==='development'?true:false;
 enum LoginErrorCode{
     NoError=0,
@@ -72,4 +74,7 @@ router.post('/register',async (req,res)=>{
     }
 });
 
+router.post('/getuser',setUserDataMiddleware,async (req:any,res)=>{
+    res.send(JSONResponse(true,0,"",{email:req.user.email,id:req.user.id}));
+});
 export default router;

package/src/routes/wsauth.ts

@@ -22,6 +22,6 @@ router.post('/gettoken',setUserDataMiddleware,async (req:any,res:any)=>{
       let more=null;
       if(DEBUG)
          more=e;
-      return res.send(JSONResponse(false,GenerateTokenError.InternalError,"I-Error",more));
+      return res.status(500).send(JSONResponse(false,GenerateTokenError.InternalError,"I-Error",more));
    }
 });

package/src/server.ts

@@ -10,4 +10,5 @@ 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

@@ -9,12 +9,12 @@ User.init(dataBase);
 export function getUserSessionData(req:any):string{
    return getSessionValue(req,SESSION_LOGGED_DATA);
 }
-export async function getUserById(id:Number){
+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);
 }
@@ -29,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);
@@ -42,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);

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
+    });
+ }