@scefira/dfw 1.2.2 → 1.2.3

package/dist/lib/APIListener.d.ts

@@ -2,6 +2,7 @@ import { Handler } from "express";
 import fileUpload from "express-fileupload";
 import { DFWRequest, DFWRequestSchema, DFWResponse } from "../types";
 import { DFWServiceConstructor } from "./DFWService";
+import { ZodSchema } from "zod";
 export type APIMethod = 'get' | 'post' | 'put' | 'delete' | 'options' | 'patch' | 'use';
 export type ListenerFn<TServices extends readonly DFWServiceConstructor[] = []> = (dfw: DFWRequestSchema<TServices>, req: DFWRequest<TServices>, res: DFWResponse) => Promise<any | void> | any | void;
 export type APIListener = {
@@ -12,11 +13,24 @@ export type APIListener = {
     /**
      * Main function to be called
      */
-    listener?: ListenerFn;
+    fn?: ListenerFn;
     /**
      * Express middleware (compatible with raw listeners)
      */
     middleware?: Handler | Handler[];
+    /**
+     * zod validations
+     */
+    validate?: {
+        /**
+         * Validate the request body
+         */
+        body?: ZodSchema;
+        /**
+         * Validate the request query
+         */
+        query?: ZodSchema;
+    };
     /**
      *
      */

package/dist/lib/APIListener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"APIListener.d.ts","sourceRoot":"","sources":["../../src/lib/APIListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,KAAK,CAAA;AACvF,MAAM,MAAM,UAAU,CAAC,SAAS,SAAS,SAAS,qBAAqB,EAAE,GAAG,EAAE,IAC5E,CACE,GAAG,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAChC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,EAC1B,GAAG,EAAE,WAAW,KACb,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,UAAU,CAAA;IAErB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,EAAE,qBAAqB,EAAE,CAAA;IAElC;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,GAAG,OAAO,CAAA;IAErC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAChE,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AACjE,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAEnE,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,EAAE,EAAE,UAAU,GAAG,WAAW,CAAC;IAC9B,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,EAAE,UAAU,GAAG,WAAW,CAAC;CAC7D,CAAA;AAED,eAAO,MAAM,uBAAuB,eAAgB,OAAO,CAAC,WAAW,CAAC;KACpD,SAAS,SAAS,SAAS,qBAAqB,EAAE,UAC1D,wBAAwB,GAAG;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,MACtD,UAAU,CAAC,SAAS,CAAC,GACxB,WAAW;SAGR,UAAU,GACb,WAAW;CAkBf,CAAC"}
+{"version":3,"file":"APIListener.d.ts","sourceRoot":"","sources":["../../src/lib/APIListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAEhC,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,KAAK,CAAA;AACvF,MAAM,MAAM,UAAU,CAAC,SAAS,SAAS,SAAS,qBAAqB,EAAE,GAAG,EAAE,IAC5E,CACE,GAAG,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAChC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,EAC1B,GAAG,EAAE,WAAW,KACb,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB;;OAEG;IACH,EAAE,CAAC,EAAE,UAAU,CAAA;IAEf;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT;;WAEG;QACH,IAAI,CAAC,EAAE,SAAS,CAAC;QAEjB;;WAEG;QACH,KAAK,CAAC,EAAE,SAAS,CAAC;KACnB,CAAA;IAED;;OAEG;IACH,QAAQ,CAAC,EAAE,qBAAqB,EAAE,CAAA;IAElC;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,GAAG,OAAO,CAAA;IAErC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAChE,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AACjE,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAEnE,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,EAAE,EAAE,UAAU,GAAG,WAAW,CAAC;IAC9B,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,EAAE,UAAU,GAAG,WAAW,CAAC;CAC7D,CAAA;AAED,eAAO,MAAM,uBAAuB,eAAgB,OAAO,CAAC,WAAW,CAAC;KACpD,SAAS,SAAS,SAAS,qBAAqB,EAAE,UAC1D,wBAAwB,GAAG;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,MACtD,UAAU,CAAC,SAAS,CAAC,GACxB,WAAW;SAGR,UAAU,GACb,WAAW;CAkBf,CAAC"}

package/dist/lib/APIListener.js

@@ -4,10 +4,10 @@ exports.makeAPIListenerFunction = void 0;
 const makeAPIListenerFunction = (baseParams) => {
     function listener(arg1, arg2) {
         if (typeof arg1 === "function") {
-            return Object.assign({ listener: arg1 }, baseParams);
+            return Object.assign({ fn: arg1 }, baseParams);
         }
         else {
-            return Object.assign(Object.assign({ listener: arg2 }, arg1), baseParams);
+            return Object.assign(Object.assign({ fn: arg2 }, arg1), baseParams);
         }
     }
     return listener;

package/dist/lib/APIListener.js.map

@@ -1 +1 @@
-{"version":3,"file":"APIListener.js","sourceRoot":"","sources":["../../src/lib/APIListener.ts"],"names":[],"mappings":";;;AAmEO,MAAM,uBAAuB,GAAG,CAAC,UAAgC,EAAE,EAAE;IAU1E,SAAS,QAAQ,CAAC,IAAS,EAAE,IAAU;QACrC,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,uBACE,QAAQ,EAAE,IAAI,IACX,UAAU,EACb;QACJ,CAAC;aAAM,CAAC;YACN,qCACE,QAAQ,EAAE,IAAK,IACZ,IAAI,GACJ,UAAU,EACb;QACJ,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA1BW,QAAA,uBAAuB,2BA0BlC"}
+{"version":3,"file":"APIListener.js","sourceRoot":"","sources":["../../src/lib/APIListener.ts"],"names":[],"mappings":";;;AAmFO,MAAM,uBAAuB,GAAG,CAAC,UAAgC,EAAE,EAAE;IAU1E,SAAS,QAAQ,CAAC,IAAS,EAAE,IAAU;QACrC,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,uBACE,EAAE,EAAE,IAAI,IACL,UAAU,EACb;QACJ,CAAC;aAAM,CAAC;YACN,qCACE,EAAE,EAAE,IAAK,IACN,IAAI,GACJ,UAAU,EACb;QACJ,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA1BW,QAAA,uBAAuB,2BA0BlC"}

package/dist/lib/APIManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,WAAW,CAAC;AAYhC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,UAAU;IAC3B,OAAO,CAAC,GAAG,CAAS;gBAER,GAAG,EAAE,OAAO;IAIjB,eAAe;IA6Df,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;CA8DvD"}
+{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,WAAW,CAAC;AAYhC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,UAAU;IAC3B,OAAO,CAAC,GAAG,CAAS;gBAER,GAAG,EAAE,OAAO;IAIjB,eAAe;IA6Df,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;CA6FvD"}

package/dist/lib/APIManager.js

@@ -81,7 +81,7 @@ class APIManager {
         var _a;
         const server = this.DFW.server;
         const method = (_a = params.method) !== null && _a !== void 0 ? _a : 'get';
-        const fn = params.listener;
+        const fn = params.fn;
         if (!params.middleware && !fn) {
             DFWUtils_1.default.log(`Unable to set listener for [${method}] ${path} listener and middleware are undefined`);
             return;
@@ -89,6 +89,34 @@ class APIManager {
         // Body Parser
         if (['post', 'put', 'patch', 'delete'].includes(method) && params.disableBodyParser !== true)
             server[method](path, body_parser_1.default.json());
+        if (params.validate) {
+            server[method](path, (req, res, next) => {
+                var _a, _b;
+                const bodySchema = (_a = params.validate) === null || _a === void 0 ? void 0 : _a.body;
+                const querySchema = (_b = params.validate) === null || _b === void 0 ? void 0 : _b.query;
+                if (bodySchema) {
+                    const result = bodySchema.safeParse(req.body);
+                    if (!result.success) {
+                        return res.status(400).json({
+                            error: 'Body validation failed',
+                            validation: result.error.format(),
+                        });
+                    }
+                    req.body = result.data;
+                }
+                if (querySchema) {
+                    const result = querySchema.safeParse(req.query);
+                    if (!result.success) {
+                        return res.status(400).json({
+                            error: 'Query validation failed',
+                            validation: result.error.format(),
+                        });
+                    }
+                    req.query = result.data;
+                }
+                next();
+            });
+        }
         // DFW native middleware
         server[method](path, this.DFW.RouterAPILevel);
         // file upload middleware

package/dist/lib/APIManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"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"}

package/dist/lib/DFWCore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWCore.d.ts","sourceRoot":"","sources":["../../src/lib/DFWCore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAqC,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAK7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,KAAK,eAAe,GAAG,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,GAAG,eAAe,EAAE,CAAA;AAE3F,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,OAAO,CAAC;QACd,UAAiB,OAAO;YACpB,GAAG,EAAE,gBAAgB,CAAA;SACxB;QAED,UAAiB,QAAQ;YACrB,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;SACjD;KACJ;CACJ;AAED,qBAAa,OAAO;IAEhB,OAAc,aAAa,EAAE,OAAO,CAAA;IAEpC,OAAc,OAAO,SAAW;IAChC,OAAc,cAAc,SAA8B;IAE1D,SAAgB,MAAM,EAAE,OAAO,CAAmB;IAClD,SAAgB,cAAc,EAAE,MAAM,CAAY;IAElD,SAAgB,MAAM,EAAE,MAAM,CAAA;IAE9B,SAAgB,MAAM,EAAE,SAAS,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAe;IAE/B,OAAO,CAAC,UAAU,CAAuB;gBAE7B,MAAM,EAAE,SAAS;IAoCtB,KAAK;IAQL,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,GAAG,IAAI;IACtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,IAAI;IAStD;;;;OAIG;IACI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,GAAE,MAAW;IAcxD,IAAI,EAAE,mIAEL;CACJ;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"DFWCore.d.ts","sourceRoot":"","sources":["../../src/lib/DFWCore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAqC,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAK7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,KAAK,eAAe,GAAG,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,GAAG,eAAe,EAAE,CAAA;AAE3F,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,OAAO,CAAC;QACd,UAAiB,OAAO;YACpB,GAAG,EAAE,gBAAgB,CAAA;SACxB;QAED,UAAiB,QAAQ;YACrB,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;SACjD;KACJ;CACJ;AAED,qBAAa,OAAO;IAEhB,OAAc,aAAa,EAAE,OAAO,CAAA;IAEpC,OAAc,OAAO,SAAW;IAChC,OAAc,cAAc,SAA8B;IAE1D,SAAgB,MAAM,EAAE,OAAO,CAAmB;IAClD,SAAgB,cAAc,EAAE,MAAM,CAAY;IAElD,SAAgB,MAAM,EAAE,MAAM,CAAA;IAE9B,SAAgB,MAAM,EAAE,SAAS,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAe;IAE/B,OAAO,CAAC,UAAU,CAAuB;gBAE7B,MAAM,EAAE,SAAS;IAqCtB,KAAK;IAQL,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,GAAG,IAAI;IACtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,IAAI;IAStD;;;;OAIG;IACI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,GAAE,MAAW;IAcxD,IAAI,EAAE,mIAEL;CACJ;AAED,eAAe,OAAO,CAAC"}

package/dist/lib/DFWCore.js

@@ -47,7 +47,7 @@ const cors_1 = __importDefault(require("cors"));
 const path_1 = __importDefault(require("path"));
 class DFWCore {
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         this.server = (0, express_1.default)();
         this.RouterAPILevel = (0, express_1.Router)();
         this.APIManager = new APIManager_1.default(this);
@@ -63,17 +63,19 @@ class DFWCore {
             fs_1.default.mkdirSync(this.tmpDir);
         }
         this.tmpDir = path_1.default.normalize(fs_1.default.mkdtempSync(`${this.tmpDir}${path_1.default.sep}`));
-        this.database = ((_c = config.server) === null || _c === void 0 ? void 0 : _c.prismaGenerathor) ?
-            config.server.prismaGenerathor(this)
-            :
-                new client_1.PrismaClient(config.prisma);
+        if (typeof config.prisma === 'function') {
+            this.database = config.prisma(this);
+        }
+        else {
+            this.database = new client_1.PrismaClient(config.prisma);
+        }
         if (fs_1.default.existsSync(DFWCore.DFW_DIR) == false) {
             fs_1.default.mkdirSync(DFWCore.DFW_DIR);
         }
-        if ((_d = config.server) === null || _d === void 0 ? void 0 : _d.trustProxy)
-            this.server.set('trust proxy', (_e = config.server) === null || _e === void 0 ? void 0 : _e.trustProxy);
+        if ((_c = config.server) === null || _c === void 0 ? void 0 : _c.trustProxy)
+            this.server.set('trust proxy', (_d = config.server) === null || _d === void 0 ? void 0 : _d.trustProxy);
         //// CORS ////
-        if ((_f = config.server) === null || _f === void 0 ? void 0 : _f.cors) {
+        if ((_e = config.server) === null || _e === void 0 ? void 0 : _e.cors) {
             this.server.use((0, cors_1.default)(config.server.cors));
         }
         this.APIManager.installAPILAyer();
@@ -89,7 +91,7 @@ class DFWCore {
     }
     addListener(path, b) {
         if (typeof b === 'function') {
-            this.APIManager.addListener(path, { listener: b });
+            this.APIManager.addListener(path, { fn: b });
         }
         else {
             this.APIManager.addListener(path, b);
@@ -104,7 +106,7 @@ class DFWCore {
         if (Array.isArray(node)) {
             node.forEach((n) => { this.register(n, path); });
         }
-        else if (!!node.listener || !!node.middleware) {
+        else if (!!node.fn || !!node.middleware) {
             this.addListener(path, node);
         }
         else if (typeof node == "object") {

package/dist/lib/DFWCore.js.map

@@ -1 +1 @@
-{"version":3,"file":"DFWCore.js","sourceRoot":"","sources":["../../src/lib/DFWCore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DFWCore.js","sourceRoot":"","sources":["../../src/lib/DFWCore.ts"],"names":[],"mappings":"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"}

package/dist/lib/DFWService.d.ts

@@ -12,5 +12,6 @@ export default abstract class DFWService {
         id: string;
     };
     constructor(dfw: DFWRequestSchema);
+    buildTransaction: (fn: (db: any) => Promise<any>) => Promise<any>;
 }
 //# sourceMappingURL=DFWService.d.ts.map

package/dist/lib/DFWService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWService.d.ts","sourceRoot":"","sources":["../../src/lib/DFWService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAG5C,MAAM,MAAM,qBAAqB,GAAG,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,CAAC;AAEjE,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,qBAAqB,IAC9D,CAAC,SAAS,UAAU,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE1C,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,SAAS,qBAAqB,EAAE,IAAI;KAC9E,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,qBAAqB,GACjD,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAC/B,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,qBAAqB,GAC1C,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAClB,KAAK;CACR,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU;IACtC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAEpC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAA;IACnC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;gBAE5B,GAAG,EAAE,gBAAgB;CAIlC"}
+{"version":3,"file":"DFWService.d.ts","sourceRoot":"","sources":["../../src/lib/DFWService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,MAAM,qBAAqB,GAAG,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,CAAC;AAEjE,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,qBAAqB,IAC9D,CAAC,SAAS,UAAU,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE1C,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,SAAS,qBAAqB,EAAE,IAAI;KAC9E,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,qBAAqB,GACjD,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAC/B,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,qBAAqB,GAC1C,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAClB,KAAK;CACR,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU;IACtC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAEpC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAA;IACnC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;gBAE5B,GAAG,EAAE,gBAAgB;IAK1B,gBAAgB,OAAQ,CAAC,EAAE,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,kBAEtD;CAEH"}

package/dist/lib/DFWService.js

@@ -1,7 +1,19 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 class DFWService {
     constructor(dfw) {
+        this.buildTransaction = (fn) => this.db.$transaction((db) => __awaiter(this, void 0, void 0, function* () {
+            return fn(db);
+        }));
         this.db = dfw.db;
         this.user = dfw.getSession().user;
     }

package/dist/lib/DFWService.js.map

@@ -1 +1 @@
-{"version":3,"file":"DFWService.js","sourceRoot":"","sources":["../../src/lib/DFWService.ts"],"names":[],"mappings":";;AAiBA,MAA8B,UAAU;IAMtC,YAAY,GAAqB;QAC/B,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC;IACpC,CAAC;CACF;AAVD,6BAUC"}
+{"version":3,"file":"DFWService.js","sourceRoot":"","sources":["../../src/lib/DFWService.ts"],"names":[],"mappings":";;;;;;;;;;;AAgBA,MAA8B,UAAU;IAMtC,YAAY,GAAqB;QAK1B,qBAAgB,GAAG,CAAC,EAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,CAAO,EAAE,EAAE,EAAE;YAC7F,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;QACf,CAAC,CAAA,CAAC,CAAA;QANA,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC;IACpC,CAAC;CAMF;AAfD,6BAeC"}

package/dist/lib/DFWSessionStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWSessionStore.d.ts","sourceRoot":"","sources":["../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,OAAO,MAAM,WAAW,CAAC;AAIhC,cAAM,eAAgB,SAAQ,KAAK;IAE/B,OAAO,CAAC,EAAE,CAAc;IAExB,OAAO,CAAC,KAAK,CAA8B;gBAE/B,GAAG,EAAE,OAAO;IAMxB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAyBnE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAmBxE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;CAc7D;AAED,eAAe,eAAe,CAAA"}
+{"version":3,"file":"DFWSessionStore.d.ts","sourceRoot":"","sources":["../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,OAAO,MAAM,WAAW,CAAC;AAIhC,cAAM,eAAgB,SAAQ,KAAK;IAE/B,OAAO,CAAC,EAAE,CAAc;IAExB,OAAO,CAAC,KAAK,CAA8B;gBAE/B,GAAG,EAAE,OAAO;IAMxB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IA+BnE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAmBxE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;CAc7D;AAED,eAAe,eAAe,CAAA"}

package/dist/lib/DFWSessionStore.js

@@ -18,9 +18,15 @@ class DFWSessionStore extends express_session_1.Store {
         }
         if (process.env.NODE_ENV === 'development')
             console.log(`read session ${sid}`);
-        this.db.dfw_session.findUnique({
+        this.db.dfw_session.findFirst({
             select: { idUser: true },
-            where: { id: sid }
+            where: {
+                id: sid,
+                OR: [
+                    { expiresAt: null },
+                    { expiresAt: { gt: new Date() } },
+                ],
+            }
         }).then((sessionObj) => {
             if (sessionObj) {
                 const passportSession = { cookie: {}, passport: { user: sessionObj.idUser } };
@@ -52,8 +58,8 @@ class DFWSessionStore extends express_session_1.Store {
                 id: sid
             }
         }).then(() => {
-            callback === null || callback === void 0 ? void 0 : callback();
-        });
+            callback && callback();
+        }).catch(e => callback && callback(e));
     }
     destroy(sid, callback) {
         if (process.env.NODE_ENV === 'development')
@@ -64,9 +70,9 @@ class DFWSessionStore extends express_session_1.Store {
                 id: sid
             },
         }).then(() => {
-            callback === null || callback === void 0 ? void 0 : callback();
+            callback && callback();
         }).catch((e) => {
-            callback === null || callback === void 0 ? void 0 : callback(e);
+            callback && callback(e);
         });
     }
 }

package/dist/lib/DFWSessionStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"DFWSessionStore.js","sourceRoot":"","sources":["../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DFWSessionStore.js","sourceRoot":"","sources":["../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"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"}

package/dist/lib/DFWUtils.d.ts

@@ -1,5 +1,6 @@
+import z from "zod";
 export default class DFWUtils {
-    static readonly EMAIL_REGEX: RegExp;
+    static emailSchema: z.ZodString;
     static isEmail(email: string): boolean;
     static log(message: string, isError?: boolean): void;
     /**

package/dist/lib/DFWUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWUtils.d.ts","sourceRoot":"","sources":["../../src/lib/DFWUtils.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,QAAQ;IAEzB,gBAAuB,WAAW,SAA6J;WAEjL,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;WAI/B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe;IAQ3D;;;OAGG;WACiB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D;;;OAGG;WACW,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK1D;;;OAGG;WACW,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI5D;;OAEG;WACW,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAY1D;;OAEG;WACW,IAAI,IAAI,MAAM;WAId,IAAI,IAAI,MAAM;WAIR,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WASpE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAO9E"}
+{"version":3,"file":"DFWUtils.d.ts","sourceRoot":"","sources":["../../src/lib/DFWUtils.ts"],"names":[],"mappings":"AAKA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,MAAM,CAAC,OAAO,OAAO,QAAQ;IAEzB,OAAc,WAAW,cAAqB;WAEhC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;WAI/B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe;IAQ3D;;;OAGG;WACiB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D;;;OAGG;WACW,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK1D;;;OAGG;WACW,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI5D;;OAEG;WACW,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAY1D;;OAEG;WACW,IAAI,IAAI,MAAM;WAId,IAAI,IAAI,MAAM;WAIR,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WASpE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAO9E"}

package/dist/lib/DFWUtils.js

@@ -17,9 +17,10 @@ const crypto_1 = require("crypto");
 const mime_types_1 = require("mime-types");
 const bcrypt_1 = __importDefault(require("bcrypt"));
 const cuid2_1 = require("@paralleldrive/cuid2");
+const zod_1 = __importDefault(require("zod"));
 class DFWUtils {
     static isEmail(email) {
-        return this.EMAIL_REGEX.test(String(email).toLowerCase());
+        return this.emailSchema.safeParse(email).success;
     }
     static log(message, isError = false) {
         if (isError) {
@@ -95,6 +96,6 @@ class DFWUtils {
         });
     }
 }
-DFWUtils.EMAIL_REGEX = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+DFWUtils.emailSchema = zod_1.default.string().email();
 exports.default = DFWUtils;
 //# sourceMappingURL=DFWUtils.js.map

package/dist/lib/DFWUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"DFWUtils.js","sourceRoot":"","sources":["../../src/lib/DFWUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DFWUtils.js","sourceRoot":"","sources":["../../src/lib/DFWUtils.ts"],"names":[],"mappings":"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"}

package/dist/modules/DFWFileModule.d.ts

@@ -19,10 +19,10 @@ declare class DFWFileModule extends DFWModule {
         size: number | null;
         createdAt: Date;
         updatedAt: Date;
-        expire: Date | null;
         idUser: string | null;
         checksum: string | null;
         mimetype: string | null;
+        expire: Date | null;
         idParent: string | null;
     }>;
     generateTempFileName(posfix?: string): string;

package/dist/test.d.ts

@@ -1,8 +1,23 @@
 import { DFWService } from ".";
+import z from "zod";
 export declare class DFWSessionService extends DFWService {
     readonly namespace: "session";
     test(userDto: any): Promise<{
-        pasa: any;
+        name: string | null;
+        id: string;
+        email: string | null;
+        displayName: string | null;
+        encodedKey: string | null;
+        createdAt: Date;
+        updatedAt: Date;
     }>;
+    trans: (userDto: any) => Promise<any>;
 }
+export declare const emailSchema: z.ZodObject<{
+    email: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    email: string;
+}, {
+    email: string;
+}>;
 //# sourceMappingURL=test.d.ts.map

package/dist/test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,UAAU,EAIb,MAAM,GAAG,CAAC;AAEX,qBAAa,iBAAkB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,SAAS,EAAG,SAAS,CAAU;IAExC,IAAI,CAAC,OAAO,EAAE,GAAG;;;CAOpB"}
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,UAAU,EAIb,MAAM,GAAG,CAAC;AACX,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,qBAAa,iBAAkB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,SAAS,EAAG,SAAS,CAAU;IAExC,IAAI,CAAC,OAAO,EAAE,GAAG;;;;;;;;;IAOjB,KAAK,YAAa,GAAG,kBAGnB;CAEL;AASD,eAAO,MAAM,WAAW;;;;;;EAKtB,CAAC"}

package/dist/test.js

@@ -8,18 +8,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.DFWSessionService = void 0;
+exports.emailSchema = exports.DFWSessionService = void 0;
 const _1 = require(".");
+const zod_1 = __importDefault(require("zod"));
 class DFWSessionService extends _1.DFWService {
     constructor() {
         super(...arguments);
         this.namespace = 'session';
+        this.trans = (userDto) => this.buildTransaction((db) => __awaiter(this, void 0, void 0, function* () {
+            const { createUserAsync } = new _1.DFWUserModule(db);
+            return createUserAsync(userDto);
+        }));
     }
     test(userDto) {
         return this.db.$transaction((db) => __awaiter(this, void 0, void 0, function* () {
             const { createUserAsync } = new _1.DFWUserModule(db);
-            return { "pasa": userDto };
+            return createUserAsync(userDto);
         }));
     }
 }
@@ -30,6 +38,12 @@ var DFW = new _1.DFWCore({
         trustProxy: true
     }
 }).start();
+exports.emailSchema = zod_1.default.object({
+    email: zod_1.default.string()
+        .trim() // opcional: elimina espacios en blanco al inicio y al final
+        .toLowerCase() // opcional: convierte a minúsculas
+        .email() // valida que sea un email válido
+});
 const SessionGuard = (_a, _b, next_1) => __awaiter(void 0, [_a, _b, next_1], void 0, function* ({ dfw }, { error }, next) {
     console.log("SessionGuard");
     if (!dfw.getSession().isAuthenticated) {
@@ -42,24 +56,24 @@ const SessionGuard = (_a, _b, next_1) => __awaiter(void 0, [_a, _b, next_1], voi
 DFW.register({
     test: [
         (0, _1.GETListener)({
+            middleware: [SessionGuard],
             services: [DFWSessionService],
-            middleware: [
-            //SessionGuard({ credentials: ['ADMIN'] , access:['POPO'] }),
-            //BodyValidationGuard(SessionDtoValidator),
-            ],
-        }, (_a) => __awaiter(void 0, [_a], void 0, function* ({ session }) {
-            return session.test({ tom: 'clancy' });
-        })),
+        }, (_a) => __awaiter(void 0, [_a], void 0, function* ({ session }) { return session.test({ tom: 'clancy' }); })),
         {
             method: 'post',
             services: [DFWSessionService],
-            listener: (_a, _b) => __awaiter(void 0, [_a, _b], void 0, function* ({ db }, { body }) {
+            validate: { body: exports.emailSchema },
+            fn: (_a, _b) => __awaiter(void 0, [_a, _b], void 0, function* ({ db }, { body }) {
+                return body.email;
             })
         }
     ],
     boot: [
-        (0, _1.GETListener)((_a) => __awaiter(void 0, [_a], void 0, function* ({ getSession }) {
-            const { user, isAuthenticated } = getSession();
+        (0, _1.GETListener)((_a) => __awaiter(void 0, [_a], void 0, function* ({ getSession, db }) {
+            let { user, isAuthenticated } = getSession();
+            if (isAuthenticated) {
+                user = (yield db.dfw_user.findUnique({ where: { id: user === null || user === void 0 ? void 0 : user.id } }));
+            }
             return { user, isAuthenticated };
         }))
     ],

package/dist/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}

package/dist/types/DFWConfig.d.ts

@@ -10,7 +10,6 @@ export type DFWConfig = {
         cors?: CorsOptions;
         trustProxy?: boolean | number;
         tmpDir?: string;
-        prismaGenerathor?: (dfw: DFWCore) => PrismaClient;
     };
     /**
      *
@@ -53,6 +52,6 @@ export type DFWConfig = {
     /**
      * Prisma client options
      */
-    prisma?: Omit<PrismaClientOptions, '__internal'>;
+    prisma?: Omit<PrismaClientOptions, '__internal'> | ((dfw: DFWCore) => PrismaClient);
 };
 //# sourceMappingURL=DFWConfig.d.ts.map

package/dist/types/DFWConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWConfig.d.ts","sourceRoot":"","sources":["../../src/types/DFWConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAA;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AAEpE,MAAM,MAAM,SAAS,GAAG;IAEpB,MAAM,CAAC,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,CAAA;QAEb,oCAAoC;QACpC,IAAI,CAAC,EAAE,WAAW,CAAA;QAElB,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;QAG7B,MAAM,CAAC,EAAE,MAAM,CAAA;QAGf,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,YAAY,CAAA;KACpD,CAAA;IAED;;OAEG;IACH,OAAO,CAAC,EAAE;QACN;;WAEG;QACH,cAAc,CAAC,EAAE;YACb,GAAG,CAAC,EAAE,KAAK,CAAA;SACd,CAAA;QAED;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB;;;WAGG;QACH,eAAe,CAAC,EAAE,OAAO,CAAA;QAEzB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAA;QAEf;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAA;QAEnB;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAA;QAE7B;;WAEG;QACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAC5B,CAAA;IAED;;OAEG;IACH,MAAM,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAA;CACnD,CAAA"}
+{"version":3,"file":"DFWConfig.d.ts","sourceRoot":"","sources":["../../src/types/DFWConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAA;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AAEpE,MAAM,MAAM,SAAS,GAAG;IAEpB,MAAM,CAAC,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,CAAA;QAEb,oCAAoC;QACpC,IAAI,CAAC,EAAE,WAAW,CAAA;QAElB,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;QAG7B,MAAM,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;IAED;;OAEG;IACH,OAAO,CAAC,EAAE;QACN;;WAEG;QACH,cAAc,CAAC,EAAE;YACb,GAAG,CAAC,EAAE,KAAK,CAAA;SACd,CAAA;QAED;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB;;;WAGG;QACH,eAAe,CAAC,EAAE,OAAO,CAAA;QAEzB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAA;QAEf;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAA;QAEnB;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAA;QAE7B;;WAEG;QACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAC5B,CAAA;IAED;;OAEG;IACH,MAAM,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,YAAY,CAAC,CAAA;CACtF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scefira/dfw",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "NodeJS fast API prototiping framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/prisma/schema/dfw.prisma

@@ -14,14 +14,14 @@ model dfw_user {
 }
 
 model dfw_session {
-    id     String    @id @default(uuid()) @db.Uuid
-    agent  String?   @db.VarChar(255)
-    ip     String?   @db.VarChar(255)
-    expire DateTime? @db.Date
+    id     String  @id @default(uuid()) @db.Uuid
+    agent  String? @db.VarChar(255)
+    ip     String? @db.VarChar(255)
     idUser String?
 
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
+    createdAt DateTime  @default(now())
+    updatedAt DateTime  @updatedAt
+    expiresAt DateTime? @db.Date
 
     user dfw_user? @relation(fields: [idUser], references: [id], onDelete: Cascade)
 

package/dist/lib/strategies/DFWPassportStrategy.d.ts

@@ -1,4 +0,0 @@
-import { Strategy } from "passport-local";
-declare const DFWPassportStrategy: Strategy;
-export default DFWPassportStrategy;
-//# sourceMappingURL=DFWPassportStrategy.d.ts.map

package/dist/lib/strategies/DFWPassportStrategy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DFWPassportStrategy.d.ts","sourceRoot":"","sources":["../../../src/lib/strategies/DFWPassportStrategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIzC,QAAA,MAAM,mBAAmB,UAevB,CAAA;AAEF,eAAe,mBAAmB,CAAA"}

package/dist/lib/strategies/DFWPassportStrategy.js

@@ -1,36 +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 });
-const passport_local_1 = require("passport-local");
-const UserModule_1 = __importDefault(require("../../modules/UserModule"));
-const DFWUtils_1 = __importDefault(require("../DFWUtils"));
-const DFWPassportStrategy = new passport_local_1.Strategy((identifier, password, done) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const UserControl = new UserModule_1.default();
-        const id = yield UserControl.validateUserPasswordAsync(identifier, password);
-        if (id) {
-            return done(null, { id });
-        }
-        else {
-            yield DFWUtils_1.default.sleepAsync(1500);
-            return done('ACCESS_DENIED');
-        }
-    }
-    catch (e) {
-        yield DFWUtils_1.default.sleepAsync(1500);
-        return done(e);
-    }
-}));
-exports.default = DFWPassportStrategy;
-//# sourceMappingURL=DFWPassportStrategy.js.map

package/dist/lib/strategies/DFWPassportStrategy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DFWPassportStrategy.js","sourceRoot":"","sources":["../../../src/lib/strategies/DFWPassportStrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,mDAAyC;AACzC,0EAAoD;AACpD,2DAAkC;AAElC,MAAM,mBAAmB,GAAG,IAAI,yBAAQ,CAAC,CAAO,UAAkB,EAAE,QAAa,EAAE,IAAI,EAAE,EAAE;IACvF,IAAI,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,oBAAa,EAAE,CAAA;QACvC,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,yBAAyB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE5E,IAAI,EAAE,EAAE,CAAC;YACL,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAC7B,CAAC;aAAM,CAAC;YACJ,MAAM,kBAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAC/B,OAAO,IAAI,CAAC,eAAe,CAAC,CAAA;QAChC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,kBAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;AACL,CAAC,CAAA,CAAC,CAAA;AAEF,kBAAe,mBAAmB,CAAA"}

package/dist/modules/FileModule.d.ts

@@ -1,32 +0,0 @@
-import DFWModule from "../lib/DFWModule";
-import { UploadedFile } from "express-fileupload";
-type SaveFileOptions = {
-    name?: string;
-    variant?: string;
-    expire?: Date;
-    idParent?: string;
-    makeUrl: (filePath: string) => string;
-};
-declare class DFWFileModule extends DFWModule {
-    readonly namespace = "file";
-    saveUploadedFileAsync(file: UploadedFile, { name, expire, idParent, variant, makeUrl }: SaveFileOptions): Promise<{
-        variant: string | null;
-        name: string | null;
-        id: string;
-        url: string | null;
-        metadata: import("@prisma/client/runtime/library").JsonValue | null;
-        path: string | null;
-        storage: import(".prisma/client").$Enums.DFW_FILE_STORAGE;
-        size: number | null;
-        createdAt: Date;
-        updatedAt: Date;
-        expire: Date | null;
-        idUser: string | null;
-        checksum: string | null;
-        mimetype: string | null;
-        idParent: string | null;
-    }>;
-    generateTempFileName(posfix?: string): string;
-}
-export default DFWFileModule;
-//# sourceMappingURL=FileModule.d.ts.map

package/dist/modules/FileModule.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FileModule.d.ts","sourceRoot":"","sources":["../../src/modules/FileModule.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQlD,KAAK,eAAe,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;CACxC,CAAA;AAED,cAAM,aAAc,SAAQ,SAAS;IAEjC,SAAgB,SAAS,UAAU;IAE7B,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,eAAe;;;;;;;;;;;;;;;;;IA4BtG,oBAAoB,CAAC,MAAM,CAAC,EAAE,MAAM;CAG9C;AAED,eAAe,aAAa,CAAA"}

package/dist/modules/FileModule.js

@@ -1,59 +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 });
-const DFWModule_1 = __importDefault(require("../lib/DFWModule"));
-const util_1 = require("util");
-const client_1 = require("@prisma/client");
-const luxon_1 = require("luxon");
-const path_1 = __importDefault(require("path"));
-const DFWUtils_1 = __importDefault(require("../lib/DFWUtils"));
-const fs_1 = __importDefault(require("fs"));
-const __1 = require("..");
-class DFWFileModule extends DFWModule_1.default {
-    constructor() {
-        super(...arguments);
-        this.namespace = "file";
-    }
-    saveUploadedFileAsync(file_1, _a) {
-        return __awaiter(this, arguments, void 0, function* (file, { name, expire, idParent, variant, makeUrl }) {
-            const filePath = luxon_1.DateTime.now().toFormat("yyyy/MM");
-            const fileName = DFWUtils_1.default.uuid();
-            const ext = path_1.default.extname(file.name);
-            const localPath = `${__1.DFWCore.DFW_UPLOAD_DIR}/${filePath}`;
-            const localFilePath = `${localPath}/${fileName}${ext !== null && ext !== void 0 ? ext : ''}`;
-            const moveAsync = (0, util_1.promisify)(file.mv);
-            fs_1.default.mkdirSync(localPath, { recursive: true });
-            yield moveAsync(localFilePath);
-            return this.db.dfw_file.create({
-                data: {
-                    name: name !== null && name !== void 0 ? name : file.name,
-                    size: file.size,
-                    mimetype: file.mimetype,
-                    checksum: file.md5,
-                    url: makeUrl(`${filePath}/${fileName}${ext !== null && ext !== void 0 ? ext : ''}`),
-                    path: localFilePath,
-                    storage: client_1.DFW_FILE_STORAGE.LOCAL,
-                    expire,
-                    idParent,
-                    variant
-                }
-            });
-        });
-    }
-    generateTempFileName(posfix) {
-        return path_1.default.join(this.DFW.tmpDir, `${DFWUtils_1.default.uuid()}${posfix !== null && posfix !== void 0 ? posfix : ""}`);
-    }
-}
-exports.default = DFWFileModule;
-//# sourceMappingURL=FileModule.js.map

package/dist/modules/FileModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FileModule.js","sourceRoot":"","sources":["../../src/modules/FileModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iEAAyC;AACzC,+BAAiC;AAEjC,2CAAkD;AAClD,iCAAiC;AACjC,gDAAwB;AACxB,+DAAuC;AACvC,4CAAoB;AACpB,0BAA6B;AAU7B,MAAM,aAAc,SAAQ,mBAAS;IAArC;;QAEoB,cAAS,GAAG,MAAM,CAAC;IAiCvC,CAAC;IA/BS,qBAAqB;6DAAC,IAAkB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAmB;YACzG,MAAM,QAAQ,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YACnD,MAAM,QAAQ,GAAG,kBAAQ,CAAC,IAAI,EAAE,CAAA;YAChC,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACnC,MAAM,SAAS,GAAG,GAAG,WAAO,CAAC,cAAc,IAAI,QAAQ,EAAE,CAAA;YACzD,MAAM,aAAa,GAAG,GAAG,SAAS,IAAI,QAAQ,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,EAAE,EAAE,CAAA;YAC5D,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAEpC,YAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAE5C,MAAM,SAAS,CAAC,aAAa,CAAC,CAAA;YAE9B,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC3B,IAAI,EAAE;oBACF,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,CAAC,IAAI;oBACvB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,QAAQ,EAAE,IAAI,CAAC,GAAG;oBAClB,GAAG,EAAE,OAAO,CAAC,GAAG,QAAQ,IAAI,QAAQ,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,EAAE,EAAE,CAAC;oBACnD,IAAI,EAAE,aAAa;oBACnB,OAAO,EAAE,yBAAgB,CAAC,KAAK;oBAC/B,MAAM;oBACN,QAAQ;oBACR,OAAO;iBACV;aACJ,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,oBAAoB,CAAC,MAAe;QACvC,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,kBAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC;CACJ;AAED,kBAAe,aAAa,CAAA"}

package/dist/modules/SecurityModule.d.ts

@@ -1,27 +0,0 @@
-import { dfw_access, dfw_credential, dfw_user } from "@prisma/client";
-import DFWModule from "../lib/DFWModule";
-declare class DFWSecurityModule extends DFWModule {
-    readonly namespace = "security";
-    createCredentiaAsync(name: string, description?: string): Promise<{
-        name: string;
-        description: string | null;
-        createdAt: Date;
-        updatedAt: Date;
-    }>;
-    createAccessAsync(name: string, description?: string): Promise<{
-        name: string;
-        description: string | null;
-        createdAt: Date;
-        updatedAt: Date;
-    }>;
-    attachUserToCredentialAsync(user: string | Partial<dfw_user>, credential: dfw_credential | string | (dfw_credential | string)[]): any;
-    attachAccessToCredentialAsync(access: string | Partial<dfw_access>, credential: Partial<dfw_credential> | string): Promise<{
-        name: string;
-        description: string | null;
-        createdAt: Date;
-        updatedAt: Date;
-    } | never[]>;
-    userHasCredentialAsync(userSource: string | Partial<dfw_user>, credential: string): Promise<boolean>;
-}
-export default DFWSecurityModule;
-//# sourceMappingURL=SecurityModule.d.ts.map

package/dist/modules/SecurityModule.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SecurityModule.d.ts","sourceRoot":"","sources":["../../src/modules/SecurityModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,cAAM,iBAAkB,SAAQ,SAAS;IACrC,SAAgB,SAAS,cAAc;IAE1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;;;;;;IAIvD,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;;;;;;IAIpD,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,cAAc,GAAG,MAAM,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC,EAAE;IAgC/H,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,MAAM;;;;;;IAoBhH,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM;CAmBjG;AAED,eAAe,iBAAiB,CAAA"}

package/dist/modules/SecurityModule.js

@@ -1,108 +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 });
-const DFWModule_1 = __importDefault(require("../lib/DFWModule"));
-class DFWSecurityModule extends DFWModule_1.default {
-    constructor() {
-        super(...arguments);
-        this.namespace = "security";
-    }
-    createCredentiaAsync(name, description) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.db.dfw_credential.create({ data: { name, description } });
-        });
-    }
-    createAccessAsync(name, description) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.db.dfw_access.create({ data: { name, description } });
-        });
-    }
-    attachUserToCredentialAsync(user, credential) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const idUser = typeof user === "object" ? user.id : user;
-            if (Array.isArray(credential)) {
-                let result = yield Promise.all(credential.map((credentialObj) => this.attachUserToCredentialAsync(user, credentialObj)));
-                return result.flat(1);
-            }
-            else {
-                let idCredential;
-                if (typeof credential == "string") {
-                    let credentialObj = (yield this.db.dfw_credential.findFirst({ select: { name: true }, where: { name: credential } }));
-                    if (credentialObj) {
-                        idCredential = credentialObj.name;
-                    }
-                    else {
-                        return [];
-                    }
-                }
-                else {
-                    idCredential = credential.name;
-                }
-                const newCredential = yield this.db.dfw_credential.update({
-                    data: {
-                        users: {
-                            connect: {
-                                id: idUser
-                            }
-                        }
-                    },
-                    where: {
-                        name: idCredential
-                    }
-                }).catch((e) => []);
-                return Array.isArray(newCredential) ? newCredential : [newCredential];
-            }
-        });
-    }
-    attachAccessToCredentialAsync(access, credential) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const idAccess = typeof access === 'object' ? access.name : access;
-            const idCredential = typeof credential === 'object' ? credential.name : credential;
-            const newCredential = yield this.db.dfw_credential.update({
-                data: {
-                    access: {
-                        connect: {
-                            name: idAccess
-                        }
-                    }
-                },
-                where: {
-                    name: idCredential
-                }
-            }).catch(() => []);
-            return newCredential;
-        });
-    }
-    userHasCredentialAsync(userSource, credential) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const idUser = typeof userSource === 'object' ? userSource.id : userSource;
-            const user = yield this.db.dfw_user.findUnique({
-                select: { id: true },
-                where: {
-                    id: idUser,
-                    credentials: {
-                        some: {
-                            OR: [
-                                { name: credential }
-                            ]
-                        }
-                    }
-                }
-            });
-            return !!user;
-        });
-    }
-}
-exports.default = DFWSecurityModule;
-//# sourceMappingURL=SecurityModule.js.map

package/dist/modules/SecurityModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SecurityModule.js","sourceRoot":"","sources":["../../src/modules/SecurityModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,iEAAyC;AAEzC,MAAM,iBAAkB,SAAQ,mBAAS;IAAzC;;QACoB,cAAS,GAAG,UAAU,CAAC;IAiF3C,CAAC;IA/EgB,oBAAoB,CAAC,IAAY,EAAE,WAAoB;;YAChE,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QAC1E,CAAC;KAAA;IAEY,iBAAiB,CAAC,IAAY,EAAE,WAAoB;;YAC7D,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QACtE,CAAC;KAAA;IAEY,2BAA2B,CAAC,IAAgC,EAAE,UAAiE;;YACxI,MAAM,MAAM,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACzD,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5B,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;gBACxH,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACJ,IAAI,YAAoB,CAAC;gBAEzB,IAAI,OAAO,UAAU,IAAI,QAAQ,EAAE,CAAC;oBAChC,IAAI,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;oBACtH,IAAI,aAAa,EAAE,CAAC;wBAAC,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC;oBAAC,CAAC;yBAAM,CAAC;wBAAC,OAAO,EAAE,CAAA;oBAAC,CAAC;gBAChF,CAAC;qBAAM,CAAC;oBACJ,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC;gBACnC,CAAC;gBAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC;oBACtD,IAAI,EAAE;wBACF,KAAK,EAAE;4BACH,OAAO,EAAE;gCACL,EAAE,EAAE,MAAM;6BACb;yBACJ;qBACJ;oBACD,KAAK,EAAE;wBACH,IAAI,EAAE,YAAY;qBACrB;iBACJ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEpB,OAAO,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAC1E,CAAC;QACL,CAAC;KAAA;IAEY,6BAA6B,CAAC,MAAoC,EAAE,UAA4C;;YACzH,MAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAA;YAClE,MAAM,YAAY,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAA;YAElF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC;gBACtD,IAAI,EAAE;oBACF,MAAM,EAAE;wBACJ,OAAO,EAAE;4BACL,IAAI,EAAE,QAAQ;yBACjB;qBACJ;iBACJ;gBACD,KAAK,EAAE;oBACH,IAAI,EAAE,YAAY;iBACrB;aACJ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAEnB,OAAO,aAAa,CAAA;QACxB,CAAC;KAAA;IAEY,sBAAsB,CAAC,UAAsC,EAAE,UAAkB;;YAC1F,MAAM,MAAM,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAA;YAE1E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAC3C,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;gBACpB,KAAK,EAAE;oBACH,EAAE,EAAE,MAAM;oBACV,WAAW,EAAE;wBACT,IAAI,EAAE;4BACF,EAAE,EAAE;gCACA,EAAE,IAAI,EAAE,UAAU,EAAE;6BACvB;yBACJ;qBACJ;iBACJ;aACJ,CAAC,CAAA;YAEF,OAAO,CAAC,CAAC,IAAI,CAAA;QACjB,CAAC;KAAA;CACJ;AAED,kBAAe,iBAAiB,CAAA"}