response-standardizer 1.3.1 → 1.3.3

package/dist/index.d.ts

@@ -35,5 +35,5 @@ export declare class ServiceException implements ServiceResponse {
 }
 export declare class ServiceResponseSuccess implements ServiceResponse {
     entity: any;
-    constructor(entity: any);
+    constructor(entity?: any);
 }

package/dist/index.js

@@ -7,7 +7,6 @@ exports.ServiceResponseSuccess = exports.ServiceException = exports.handleServic
 const utils_1 = require("./utils");
 const axios_1 = __importDefault(require("axios"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const path_1 = __importDefault(require("path"));
 const zod_1 = require("zod");
 let KEYCLOAK_PUBLIC_KEY = null;
 const initKeycloak = async (config) => {
@@ -52,7 +51,7 @@ const role = (req, res, next, allowedRoles) => {
     const clientRoles = Object.values(user?.resource_access ?? {})
         .flatMap((r) => r.roles ?? [])
         .map((r) => r.toUpperCase());
-    const allowedUpper = allowedRoles.map(r => r.toUpperCase());
+    const allowedUpper = allowedRoles.map(r => r === "super-admin" ? "ADMIN" : `DEZH-${r.toUpperCase()}`);
     const allRoles = [...realmRoles, ...clientRoles];
     const hasAccess = allowedUpper.some((role) => allRoles.includes(role));
     if (!hasAccess) {
@@ -162,21 +161,9 @@ const log = (level, message, meta) => {
         if (level === "ERROR")
             color = colors.RED;
     }
-    // گرفتن stack trace
-    const stack = new Error().stack?.split("\n")[2]; // خط Caller
-    let location = "";
-    if (stack) {
-        const match = stack.match(/\((.*):(\d+):(\d+)\)/);
-        if (match) {
-            const fileName = path_1.default.basename(match[1]);
-            const line = match[2];
-            const column = match[3];
-            location = `${fileName}:${line}:${column}`;
-        }
-    }
     const metaStr = meta ? `. ${JSON.stringify(meta)}` : "";
     // چاپ لاگ
-    console.log(`${color}[${timestamp}][${location}][${level}] ${message}${metaStr}${colors.RESET}`);
+    console.log(`${color}[${timestamp}][${level}] ${message}${metaStr}${colors.RESET}`);
 };
 exports.log = log;
 const response = (req, res, response, handler = (eq, res, data = null) => { }) => {
@@ -198,7 +185,7 @@ const response = (req, res, response, handler = (eq, res, data = null) => { }) =
         }
         return exports.RestResponse.exceptionError(req, res, response.message);
     }
-    return handler(req, res, response);
+    return handler(req, res, response.entity);
 };
 exports.response = response;
 const handleServiceException = (message, err) => {
@@ -239,7 +226,7 @@ class ServiceException {
 }
 exports.ServiceException = ServiceException;
 class ServiceResponseSuccess {
-    constructor(entity) {
+    constructor(entity = null) {
         this.entity = entity;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "response-standardizer",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Express middleware to standardize API responses",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -62,7 +62,7 @@ const role = (req: any, res: any, next: any, allowedRoles: string[]) => {
     const clientRoles: string[] = Object.values(user?.resource_access ?? {})
       .flatMap((r: any) => r.roles ?? [])
       .map((r: string) => r.toUpperCase());
-    const allowedUpper = allowedRoles.map(r => r.toUpperCase());
+    const allowedUpper = allowedRoles.map(r => r === "super-admin"?"ADMIN":`DEZH-${r.toUpperCase()}`);
     const allRoles = [...realmRoles, ...clientRoles];
     const hasAccess: boolean = allowedUpper.some((role: string) =>
       allRoles.includes(role)
@@ -208,24 +208,10 @@ export const log = (level: "INFO" | "WARN" | "ERROR", message: string, meta?: an
         if (level === "WARN") color = colors.YELLOW;
         if (level === "ERROR") color = colors.RED;
     }
-
-    // گرفتن stack trace
-    const stack = new Error().stack?.split("\n")[2]; // خط Caller
-    let location = "";
-    if (stack) {
-        const match = stack.match(/\((.*):(\d+):(\d+)\)/);
-        if (match) {
-            const fileName = path.basename(match[1]);
-            const line = match[2];
-            const column = match[3];
-            location = `${fileName}:${line}:${column}`;
-        }
-    }
-
     const metaStr = meta ? `. ${JSON.stringify(meta)}` : "";
 
     // چاپ لاگ
-    console.log(`${color}[${timestamp}][${location}][${level}] ${message}${metaStr}${colors.RESET}`);
+    console.log(`${color}[${timestamp}][${level}] ${message}${metaStr}${colors.RESET}`);
 };
 export const response = (
     req: Request, 
@@ -247,7 +233,7 @@ export const response = (
         }
         return RestResponse.exceptionError(req, res, response.message)
     }
-    return handler(req, res, response)
+    return handler(req, res, (response as ServiceResponseSuccess).entity)
 }
 export const handleServiceException = (message: string, err: any) : ServiceResponse => {
     if(err instanceof ZodError){
@@ -282,5 +268,5 @@ export class ServiceException implements ServiceResponse {
     constructor(public code: number, public message: string, public errors?: ErrorFields) {}
 }
 export class ServiceResponseSuccess implements ServiceResponse {
-    constructor(public entity: any) {}
+    constructor(public entity: any = null) {}
 }