serverpreconfigured 2.2.4 → 2.2.6

package/dist/logs/logs.js

@@ -30,7 +30,7 @@ function stringfyError(err) {
     let ret = {};
     for (let key of Object.keys(err)) {
         let value = err[key];
-        ret[key] = typeof (value) == 'object' ? 'Is Object' : value.toString();
+        ret[key] = typeof (value) == 'object' ? stringfyObject(value) : value.toString();
     }
     let retData = "";
     try {
@@ -39,6 +39,14 @@ function stringfyError(err) {
     catch (e) {
         retData = "error on stringfy error data";
     }
+    function stringfyObject(obj) {
+        let ret = {};
+        for (let key of Object.keys(obj)) {
+            let value = obj[key];
+            ret[key] = typeof (value) == 'object' ? 'Is Object' : value === null || value === void 0 ? void 0 : value.toString();
+        }
+        return JSON.stringify(ret);
+    }
     return retData;
 }
 exports.stringfyError = stringfyError;

package/dist/middlewares/auth.d.ts

@@ -1 +1,6 @@
+import { User } from "../server";
+import { Request } from "express";
+export interface RequestAuthenticated extends Request {
+    user: User;
+}
 export declare function setUserDataMiddleware(req: any, res: any, next: any): Promise<any>;

package/dist/middlewares/auth.js

@@ -23,7 +23,7 @@ function setUserDataMiddleware(req, res, next) {
             const user = yield server_1.User.findOne({ where: { email: dealerEmail, is_active: true } });
             if (!user)
                 throw "Unknown user";
-            req.user = { email: dealerEmail, id: user.id };
+            req.user = user;
             yield (0, server_1.updateUserLastAction)(user);
             next();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverpreconfigured",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "\"Pre-configured server with authentication system and database integration\"",
   "main": "dist/server.js",
   "keywords": [

package/src/logs/logs.ts

@@ -28,7 +28,7 @@ export function stringfyError(err:any):string{
    let ret:any={};
    for(let key of Object.keys(err)){
        let value=err[key];
-       ret[key]=typeof(value)=='object'?'Is Object':value.toString();
+       ret[key]=typeof(value)=='object'?stringfyObject(value):value.toString();
    }
    let retData="";
    try{
@@ -36,8 +36,18 @@ export function stringfyError(err:any):string{
    }catch(e){
       retData="error on stringfy error data";
    }
+   function stringfyObject(obj:any){
+        let ret:any={};
+        for(let key of Object.keys(obj)){
+            let value=obj[key];
+            ret[key]=typeof(value)=='object'?'Is Object':value?.toString();
+        }
+        return JSON.stringify(ret);
+   }
    return retData;
 }
+
+
 export function getIpFromRequest(req:Request){
         //@
         let ips = (

package/src/middlewares/auth.ts

@@ -2,16 +2,19 @@ import { User, updateUserLastAction, userIsLogged } from "../server";
 import { JSONResponse } from "../server";
 import { getUserSessionData } from "../server";
 import { sendIError } from "../utils/response";
-
+import { NextFunction, Request, Response } from "express"
+export interface RequestAuthenticated extends Request{
+    user:User,
+}
 export async function setUserDataMiddleware(req:any,res:any,next:any){
     if(!userIsLogged(req))
       return res.status(401).send(JSONResponse({},"User Must Be Logged"));
     try{
         const dealerEmail=getUserSessionData(req);
-        const user=await User.findOne({where:{email:dealerEmail,is_active:true}});
+        const user:User=await User.findOne({where:{email:dealerEmail,is_active:true}});
         if(!user)
           throw "Unknown user";
-        req.user={email:dealerEmail,id:user.id};
+        req.user=user;
         await updateUserLastAction(user);
         next();
      }catch(e){