@scefira/dfw 0.1.5 → 0.1.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/manager/APIManager.d.ts +2 -2
- package/lib/manager/APIManager.d.ts.map +1 -1
- package/lib/manager/APIManager.js +44 -30
- package/lib/manager/APIManager.js.map +1 -1
- package/lib/manager/DFWModule.d.ts +4 -2
- package/lib/manager/DFWModule.d.ts.map +1 -1
- package/lib/manager/DFWModule.js +15 -6
- package/lib/manager/DFWModule.js.map +1 -1
- package/lib/manager/SecurityManager.d.ts.map +1 -1
- package/lib/manager/SecurityManager.js +0 -6
- package/lib/manager/SecurityManager.js.map +1 -1
- package/lib/manager/SessionManager.d.ts.map +1 -1
- package/lib/manager/SessionManager.js +1 -3
- package/lib/manager/SessionManager.js.map +1 -1
- package/lib/manager/UserManager.d.ts +1 -1
- package/lib/manager/UserManager.d.ts.map +1 -1
- package/lib/manager/UserManager.js +1 -1
- package/lib/manager/UserManager.js.map +1 -1
- package/lib/test.js +9 -1
- package/lib/test.js.map +1 -1
- package/lib/types/DFWRequestScheme.d.ts +2 -1
- package/lib/types/DFWRequestScheme.d.ts.map +1 -1
- package/package.json +10 -8
|
@@ -14,7 +14,7 @@ export declare class APIListener {
|
|
|
14
14
|
export declare type BootCallback = (req: DFWRequest, boot: DFWBoot) => Promise<any>;
|
|
15
15
|
export default class APIManager extends DFWModule {
|
|
16
16
|
server?: Express;
|
|
17
|
-
|
|
17
|
+
DFW_BASIC_ROUTER: Router;
|
|
18
18
|
private bootCallbacks;
|
|
19
19
|
constructor(DFW: DFWInstance);
|
|
20
20
|
middleware(req: DFWRequest, res: Response): Promise<void>;
|
|
@@ -26,7 +26,7 @@ export default class APIManager extends DFWModule {
|
|
|
26
26
|
* @param config
|
|
27
27
|
*/
|
|
28
28
|
addListener(path: string, apiFunction: APIFunction, config?: APIListenerConfig): void;
|
|
29
|
-
|
|
29
|
+
makeAPIListenerMiddlewares(config?: APIListenerConfig): any[];
|
|
30
30
|
/**
|
|
31
31
|
*
|
|
32
32
|
* @param dfw
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../src/manager/APIManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGlE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,WAAW,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../src/manager/APIManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGlE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAKzC,oBAAY,WAAW,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,gBAAgB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;AACzG,oBAAY,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAEhF,qBAAa,WAAW;IACpB,SAAgB,MAAM,EAAE,iBAAiB,CAAC;IAC1C,SAAgB,QAAQ,EAAE,WAAW,CAAC;gBAE1B,MAAM,EAAE,iBAAiB,GAAG,WAAW,EAAE,QAAQ,CAAC,EAAE,WAAW;CAS9E;AAED,oBAAY,YAAY,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAE5E,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,SAAS;IAEtC,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,gBAAgB,EAAE,MAAM,CAAoB;IAEnD,OAAO,CAAC,aAAa,CA2CnB;gBAEU,GAAG,EAAE,WAAW;IAgCf,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAI/C,WAAW,CAAC,IAAI,SAAO,EAAE,MAAM,GAAE,OAA8B;IAMtE;;;;;MAKE;IACK,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,GAAE,iBAAsB;IAmCzF,0BAA0B,CAAC,MAAM,GAAE,iBAAsB;IAgCzD;;;MAGE;IACW,YAAY,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAU5D;;;OAGG;IACI,eAAe,CAAC,QAAQ,EAAE,YAAY;IAI7C;;;;MAIE;IACK,iBAAiB,CAAC,QAAQ,EAAE,CAAC,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM;CAkBrG;AAED,eAAO,MAAM,sBAAsB,2BAAqB,QAAQ,IAAI,CAAC,sCAA4C,CAAC"}
|
|
@@ -18,6 +18,7 @@ const body_parser_1 = __importDefault(require("body-parser"));
|
|
|
18
18
|
const DFWModule_1 = __importDefault(require("./DFWModule"));
|
|
19
19
|
const express_1 = __importDefault(require("express"));
|
|
20
20
|
const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
21
|
+
const SecurityManager_1 = __importDefault(require("./SecurityManager"));
|
|
21
22
|
class APIListener {
|
|
22
23
|
constructor(config, listener) {
|
|
23
24
|
if (typeof config == "function" && !listener) {
|
|
@@ -34,7 +35,7 @@ exports.APIListener = APIListener;
|
|
|
34
35
|
class APIManager extends DFWModule_1.default {
|
|
35
36
|
constructor(DFW) {
|
|
36
37
|
super(DFW);
|
|
37
|
-
this.
|
|
38
|
+
this.DFW_BASIC_ROUTER = express_1.default.Router();
|
|
38
39
|
this.bootCallbacks = [
|
|
39
40
|
/** add default callback on each APIManager instance */
|
|
40
41
|
({ dfw }, boot) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -75,6 +76,30 @@ class APIManager extends DFWModule_1.default {
|
|
|
75
76
|
}
|
|
76
77
|
})
|
|
77
78
|
];
|
|
79
|
+
this.DFW_BASIC_ROUTER.use((0, cookie_parser_1.default)());
|
|
80
|
+
this.DFW_BASIC_ROUTER.use(((req, res, next) => {
|
|
81
|
+
req.dfw = {
|
|
82
|
+
__meta: {},
|
|
83
|
+
instance: this.instance,
|
|
84
|
+
req,
|
|
85
|
+
res
|
|
86
|
+
};
|
|
87
|
+
next();
|
|
88
|
+
}));
|
|
89
|
+
this.DFW_BASIC_ROUTER.use((0, exports.MiddlewareAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
try {
|
|
91
|
+
yield this.instance.DatabaseManager.middleware(req, res);
|
|
92
|
+
yield this.instance.SessionManager.middleware(req, res);
|
|
93
|
+
yield this.instance.SecurityManager.middleware(req, res);
|
|
94
|
+
yield this.instance.UserManager.middleware(req, res);
|
|
95
|
+
yield this.instance.FileManager.middleware(req, res);
|
|
96
|
+
yield this.instance.APIManager.middleware(req, res);
|
|
97
|
+
next();
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
next(e);
|
|
101
|
+
}
|
|
102
|
+
})));
|
|
78
103
|
}
|
|
79
104
|
middleware(req, res) {
|
|
80
105
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -82,9 +107,8 @@ class APIManager extends DFWModule_1.default {
|
|
|
82
107
|
});
|
|
83
108
|
}
|
|
84
109
|
startServer(port = 3000, server = require("express")()) {
|
|
85
|
-
this.API_ROUTER.use((0, cookie_parser_1.default)());
|
|
86
|
-
server.listen(port);
|
|
87
110
|
this.server = server;
|
|
111
|
+
this.server.listen(port);
|
|
88
112
|
console.log(`[DFW] Server listening on port ${port}`);
|
|
89
113
|
}
|
|
90
114
|
/**
|
|
@@ -96,7 +120,7 @@ class APIManager extends DFWModule_1.default {
|
|
|
96
120
|
addListener(path, apiFunction, config = {}) {
|
|
97
121
|
if (!this.server)
|
|
98
122
|
throw `you must start an DFW/Express Server before add a listener`;
|
|
99
|
-
let handlers = this.
|
|
123
|
+
let handlers = this.makeAPIListenerMiddlewares(config);
|
|
100
124
|
// APIFunction middleware
|
|
101
125
|
handlers.push((0, exports.MiddlewareAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
102
126
|
yield Promise.resolve(apiFunction(req, res, req.dfw)).then((data) => {
|
|
@@ -120,43 +144,33 @@ class APIManager extends DFWModule_1.default {
|
|
|
120
144
|
}
|
|
121
145
|
next(err);
|
|
122
146
|
}));
|
|
123
|
-
this.server.use(path, this.
|
|
147
|
+
this.server.use(path, this.DFW_BASIC_ROUTER); // Install basic middleware
|
|
124
148
|
this.server[config.method ? config.method.toLowerCase() : "get"](path, handlers);
|
|
125
149
|
console.log(`[API][${config.method ? config.method.toUpperCase() : "GET"}] ${path}`);
|
|
126
150
|
}
|
|
127
|
-
|
|
128
|
-
let handlers = [
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
151
|
+
makeAPIListenerMiddlewares(config = {}) {
|
|
152
|
+
let handlers = [];
|
|
153
|
+
//Check security middleware
|
|
154
|
+
if (config.security) {
|
|
155
|
+
handlers.push((0, exports.MiddlewareAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
156
|
+
let bindings = config.security ? SecurityManager_1.default.jsonToBindings(config.security) : [];
|
|
157
|
+
for (let binding of bindings) {
|
|
158
|
+
console.log(binding);
|
|
159
|
+
if ((yield req.dfw.SecurityManager.checkBindingAsync(req, binding[0], binding[1])) === false) {
|
|
160
|
+
next(`${SecurityManager_1.default.RULE_LABELS[binding[0]]}`);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
136
163
|
next();
|
|
137
|
-
}
|
|
138
|
-
|
|
164
|
+
})));
|
|
165
|
+
}
|
|
139
166
|
// Body parser
|
|
140
167
|
if (config.parseBody !== false) { // Body parser middleware
|
|
141
168
|
handlers.push(body_parser_1.default.json(), body_parser_1.default.urlencoded({ extended: true }));
|
|
142
169
|
}
|
|
170
|
+
// Upload handler
|
|
143
171
|
if (config.upload) {
|
|
144
172
|
handlers.push((0, express_fileupload_1.default)(Object.assign(config.upload, config, { useTempFiles: true, tempFileDir: this.instance.FileManager.tmpDir })));
|
|
145
173
|
}
|
|
146
|
-
handlers.push((0, exports.MiddlewareAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
147
|
-
try {
|
|
148
|
-
yield this.instance.DatabaseManager.middleware(req, res);
|
|
149
|
-
yield this.instance.SessionManager.middleware(req, res);
|
|
150
|
-
yield this.instance.SecurityManager.middleware(req, res);
|
|
151
|
-
yield this.instance.UserManager.middleware(req, res);
|
|
152
|
-
yield this.instance.FileManager.middleware(req, res);
|
|
153
|
-
yield this.instance.APIManager.middleware(req, res);
|
|
154
|
-
next();
|
|
155
|
-
}
|
|
156
|
-
catch (e) {
|
|
157
|
-
next(e);
|
|
158
|
-
}
|
|
159
|
-
})));
|
|
160
174
|
return handlers;
|
|
161
175
|
}
|
|
162
176
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/manager/APIManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,4EAA4C;AAC5C,8DAAqC;AAErC,4DAAoC;AAIpC,sDAA8B;AAC9B,kEAAyC;
|
|
1
|
+
{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/manager/APIManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,11 @@ import { PrismaClient } from "@prisma/client";
|
|
|
2
2
|
import { NextFunction } from "express";
|
|
3
3
|
import DFWInstance from "../DFWInstance";
|
|
4
4
|
export default abstract class DFWModule {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
private _instance;
|
|
6
|
+
private _db;
|
|
7
7
|
constructor(DFW: DFWInstance);
|
|
8
|
+
get db(): PrismaClient<import(".prisma/client").Prisma.PrismaClientOptions, never, import(".prisma/client").Prisma.RejectOnNotFound | import(".prisma/client").Prisma.RejectPerOperation | undefined> | Omit<PrismaClient<import(".prisma/client").Prisma.PrismaClientOptions, never, import(".prisma/client").Prisma.RejectOnNotFound | import(".prisma/client").Prisma.RejectPerOperation | undefined>, "$connect" | "$disconnect" | "$on" | "$transaction" | "$use">;
|
|
9
|
+
get instance(): DFWInstance;
|
|
8
10
|
use(db: PrismaClient | Omit<PrismaClient, '$connect' | '$disconnect' | '$on' | '$transaction' | '$use'>): this;
|
|
9
11
|
static middleware?: (req: Request, res: Response, next: NextFunction) => void;
|
|
10
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWModule.d.ts","sourceRoot":"","sources":["../../src/manager/DFWModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,SAAS;
|
|
1
|
+
{"version":3,"file":"DFWModule.d.ts","sourceRoot":"","sources":["../../src/manager/DFWModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,SAAS;IAEnC,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,GAAG,CAAgG;gBAE/F,GAAG,EAAE,WAAW;IAK5B,IAAI,EAAE,kcAEL;IAED,IAAI,QAAQ,gBAEX;IAEM,GAAG,CAAC,EAAE,EAAC,YAAY,GAAC,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,aAAa,GAAG,KAAK,GAAG,cAAc,GAAG,MAAM,CAAC,GAAG,IAAI;IAalH,OAAc,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAA;CACvF"}
|
package/lib/manager/DFWModule.js
CHANGED
|
@@ -2,17 +2,26 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
class DFWModule {
|
|
4
4
|
constructor(DFW) {
|
|
5
|
-
this.
|
|
6
|
-
this.
|
|
5
|
+
this._instance = DFW;
|
|
6
|
+
this._db = this._instance.database;
|
|
7
|
+
}
|
|
8
|
+
get db() {
|
|
9
|
+
return this._db;
|
|
10
|
+
}
|
|
11
|
+
get instance() {
|
|
12
|
+
return this._instance;
|
|
7
13
|
}
|
|
8
14
|
use(db) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
15
|
+
this._db = db;
|
|
16
|
+
return this;
|
|
17
|
+
/*
|
|
18
|
+
return new Proxy(this,{
|
|
19
|
+
get: (target, prop, receiver)=>{
|
|
20
|
+
if(prop === "db") return db;
|
|
13
21
|
return target[prop];
|
|
14
22
|
}
|
|
15
23
|
});
|
|
24
|
+
*/
|
|
16
25
|
}
|
|
17
26
|
}
|
|
18
27
|
exports.default = DFWModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWModule.js","sourceRoot":"","sources":["../../src/manager/DFWModule.ts"],"names":[],"mappings":";;AAIA,MAA8B,SAAS;IAKnC,YAAY,GAAgB;QACxB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"DFWModule.js","sourceRoot":"","sources":["../../src/manager/DFWModule.ts"],"names":[],"mappings":";;AAIA,MAA8B,SAAS;IAKnC,YAAY,GAAgB;QACxB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;IACvC,CAAC;IAED,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAEM,GAAG,CAAC,EAAgG;QACvG,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;QACZ;;;;;;;UAOE;IACN,CAAC;CAGJ;AAhCD,4BAgCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SecurityManager.d.ts","sourceRoot":"","sources":["../../src/manager/SecurityManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAqB,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEtE,oBAAY,cAAc,GAAG;IACzB,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU,GAAG,UAAU,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC/G,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,cAAc,GAAG,cAAc,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACpI,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IAElD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,KAAK;IACxC,MAAM,CAAC,QAAQ,CAAC,WAAW,KAAK;IAChC,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK;IACpC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,KAAK;IAC5C,MAAM,CAAC,QAAQ,CAAC,wBAAwB,KAAK;IAE7C,MAAM,CAAC,QAAQ,CAAC,WAAW;;;;;;MAM1B;IAEM,UAAU,QAAe,UAAU,OAAO,QAAQ,
|
|
1
|
+
{"version":3,"file":"SecurityManager.d.ts","sourceRoot":"","sources":["../../src/manager/SecurityManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAqB,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEtE,oBAAY,cAAc,GAAG;IACzB,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU,GAAG,UAAU,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC/G,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,cAAc,GAAG,cAAc,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACpI,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IAElD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,KAAK;IACxC,MAAM,CAAC,QAAQ,CAAC,WAAW,KAAK;IAChC,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK;IACpC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,KAAK;IAC5C,MAAM,CAAC,QAAQ,CAAC,wBAAwB,KAAK;IAE7C,MAAM,CAAC,QAAQ,CAAC,WAAW;;;;;;MAM1B;IAEM,UAAU,QAAe,UAAU,OAAO,QAAQ,mBAExD;IAED;;;OAGG;WACW,cAAc,CAAC,cAAc,EAAE,sBAAsB,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;WAiCvE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;WAItD,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIvD;;;;OAIG;IACU,sBAAsB,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAWjG;;;;;OAKG;IACU,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA4BtF,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAI5D,yBAAyB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,cAAc,GAAG,cAAc,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE;IAK9H,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE;IAKnH,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO;IAKxD,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO;CAKnE"}
|
|
@@ -18,12 +18,6 @@ class SecurityManager extends DFWModule_1.default {
|
|
|
18
18
|
constructor() {
|
|
19
19
|
super(...arguments);
|
|
20
20
|
this.middleware = (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
let config = req.dfw.__meta.config ? req.dfw.__meta.config : {};
|
|
22
|
-
let bindings = config.security ? SecurityManager.jsonToBindings(config.security) : [];
|
|
23
|
-
for (let binding of bindings) {
|
|
24
|
-
if ((yield this.checkBindingAsync(req, binding[0], binding[1])) === false)
|
|
25
|
-
throw SecurityManager.RULE_LABELS[binding[0]], binding[0];
|
|
26
|
-
}
|
|
27
21
|
req.dfw.SecurityManager = this;
|
|
28
22
|
});
|
|
29
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SecurityManager.js","sourceRoot":"","sources":["../../src/manager/SecurityManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,0EAAyC;AAGzC,4DAAoC;AAQpC,MAAqB,eAAgB,SAAQ,mBAAS;IAAtD;;QAgBW,eAAU,GAAG,CAAO,GAAe,EAAE,GAAa,EAAE,EAAE;YACzD,
|
|
1
|
+
{"version":3,"file":"SecurityManager.js","sourceRoot":"","sources":["../../src/manager/SecurityManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionManager.d.ts","sourceRoot":"","sources":["../../src/manager/SessionManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,SAAS,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"SessionManager.d.ts","sourceRoot":"","sources":["../../src/manager/SessionManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,SAAS,MAAM,aAAa,CAAC;AAWpC,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,SAAS;IAEjD,SAAgB,qBAAqB,EAAE,MAAM,CAAC;IAC9C,SAAgB,YAAY,EAAE,MAAM,CAAS;IAC7C,SAAgB,YAAY,EAAE,MAAM,CAAS;gBAEjC,GAAG,EAAE,WAAW;IAKrB,UAAU,QAAe,UAAU,OAAO,QAAQ,mBAoCvD;IAEF;;;;OAIG;YACW,sBAAsB;IAepC;;;;;OAKG;IACU,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B1F;;;;OAIG;IACU,WAAW,CAAC,GAAG,EAAE,UAAU;IAoBxC;;;;OAIG;IACI,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAavD;;OAEG;IACU,yBAAyB;CASzC"}
|
|
@@ -37,9 +37,7 @@ class SessionManager extends DFWModule_1.default {
|
|
|
37
37
|
let session = yield this.db.dfw_session.findFirst({
|
|
38
38
|
where: { id: Number(req.cookies.sid), token: req.cookies.stk },
|
|
39
39
|
include: {
|
|
40
|
-
user:
|
|
41
|
-
select: { id: true, nick: true, email: true }
|
|
42
|
-
}
|
|
40
|
+
user: true
|
|
43
41
|
},
|
|
44
42
|
});
|
|
45
43
|
req.dfw.session = session ? { record: session, user: session.user, isLogged: session.user ? true : false } : yield this.regenerateSessionAsync(req);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionManager.js","sourceRoot":"","sources":["../../src/manager/SessionManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAGA,4DAAoC;AACpC,iCAAiC;AACjC,2DAAmC;AACnC,wEAAgD;
|
|
1
|
+
{"version":3,"file":"SessionManager.js","sourceRoot":"","sources":["../../src/manager/SessionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { dfw_credential, dfw_user } from "@prisma/client";
|
|
|
6
6
|
export default class UserManager extends DFWModule {
|
|
7
7
|
constructor(DFW: DFWInstance);
|
|
8
8
|
middleware: ({ dfw }: DFWRequest, res: Response) => Promise<void>;
|
|
9
|
-
createUserAsync(email: string, nick: string, password
|
|
9
|
+
createUserAsync(email: string, nick: string, password?: string): Promise<dfw_user>;
|
|
10
10
|
getUserAsync(reference: string): Promise<dfw_user | null>;
|
|
11
11
|
createCredentiaASync(name: string, description?: string): Promise<dfw_credential>;
|
|
12
12
|
createAccessAsync(name: string, description?: string): Promise<import(".prisma/client").dfw_access>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserManager.d.ts","sourceRoot":"","sources":["../../src/manager/UserManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGnC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;gBAElC,GAAG,EAAE,WAAW;IAIrB,UAAU,YAAmB,UAAU,OAAO,QAAQ,mBAE5D;IAEY,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"UserManager.d.ts","sourceRoot":"","sources":["../../src/manager/UserManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGnC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;gBAElC,GAAG,EAAE,WAAW;IAIrB,UAAU,YAAmB,UAAU,OAAO,QAAQ,mBAE5D;IAEY,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IAU9D,YAAY,CAAC,SAAS,EAAE,MAAM;IAQ9B,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAIvD,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAIpD,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAoCnI"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserManager.js","sourceRoot":"","sources":["../../src/manager/UserManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,wEAAgD;AAChD,2DAAmC;AACnC,4DAAoC;AAKpC,MAAqB,WAAY,SAAQ,mBAAS;IAE9C,YAAY,GAAgB;QACxB,KAAK,CAAC,GAAG,CAAC,CAAC;QAGR,eAAU,GAAG,CAAO,EAAE,GAAG,EAAc,EAAE,GAAa,EAAE,EAAE;YAC7D,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;QAC3B,CAAC,CAAA,CAAA;IAJD,CAAC;IAMY,eAAe,CAAC,KAAa,EAAE,IAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"UserManager.js","sourceRoot":"","sources":["../../src/manager/UserManager.ts"],"names":[],"mappings":"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"}
|
package/lib/test.js
CHANGED
|
@@ -24,12 +24,20 @@ DFW.APIManager.addListener("/logout", (req, res, dfw) => __awaiter(void 0, void
|
|
|
24
24
|
yield req.dfw.SessionManager.logoutAsync(req);
|
|
25
25
|
return dfw.boot();
|
|
26
26
|
}));
|
|
27
|
+
DFW.APIManager.addListener("/security", (req, res, dfw) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
|
+
console.log("Esto no debería haber pasado de aqui");
|
|
29
|
+
return dfw.boot();
|
|
30
|
+
}), {
|
|
31
|
+
security: {
|
|
32
|
+
session: true
|
|
33
|
+
}
|
|
34
|
+
});
|
|
27
35
|
DFW.APIManager.addListener("/boot", (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
36
|
return req.dfw.boot();
|
|
29
37
|
}));
|
|
30
38
|
DFW.APIManager.addListener("/file", (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
31
39
|
return req.dfw.FileManager.flushUpload(req, "file", { description: "File test" });
|
|
32
|
-
}), { method: "post", upload: true });
|
|
40
|
+
}), { method: "post", upload: true, security: { session: true } });
|
|
33
41
|
DFW.APIManager.addListener("/error", (req, res, dfw) => __awaiter(void 0, void 0, void 0, function* () {
|
|
34
42
|
return yield dfw.db.$transaction((db) => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
43
|
let t1 = performance.now();
|
package/lib/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,wBAA4B;AAE5B,IAAI,GAAG,GAAG,UAAO,CAAC,cAAc,EAAE,CAAC;AAEnC,uCAAuC;AAEvC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAEhC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC/C,OAAO,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC,CAAA,CAAC,CAAA;AAEF,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACzD,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,2BAA2B,EAAE,UAAU,CAAC,CAAC;IAClF,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC,CAAA,CAAC,CAAA;AAEF,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC1D,MAAM,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9C,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC,CAAA,CAAC,CAAA;AAEF,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACnD,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;AAC1B,CAAC,CAAA,CAAC,CAAA;AAEF,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACnD,OAAO,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;AACtF,CAAC,CAAA,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,10 @@ export declare type DFWRequest = {
|
|
|
11
11
|
} & Request;
|
|
12
12
|
export declare type DFWRequestScheme = {
|
|
13
13
|
__meta: {
|
|
14
|
-
config?: any;
|
|
15
14
|
noSession: boolean;
|
|
16
15
|
};
|
|
16
|
+
req: DFWRequest;
|
|
17
|
+
res: Response;
|
|
17
18
|
instance: DFWInstance;
|
|
18
19
|
session: {
|
|
19
20
|
isLogged: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWRequestScheme.d.ts","sourceRoot":"","sources":["../../src/types/DFWRequestScheme.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,eAAe,MAAM,4BAA4B,CAAC;AACzD,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"DFWRequestScheme.d.ts","sourceRoot":"","sources":["../../src/types/DFWRequestScheme.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,eAAe,MAAM,4BAA4B,CAAC;AACzD,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAErE,oBAAY,UAAU,GAAG;IACrB,GAAG,EAAE,gBAAgB,CAAC;CACzB,GAAG,OAAO,CAAA;AAEX,oBAAY,gBAAgB,GAAG;IAC3B,MAAM,EAAE;QACJ,SAAS,EAAE,OAAO,CAAA;KACrB,CAAC;IACF,GAAG,EAAC,UAAU,CAAA;IACd,GAAG,EAAC,QAAQ,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;IACrB,OAAO,EAAE;QACL,QAAQ,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,QAAQ,CAAA;QACf,MAAM,EAAE,WAAW,GAAG;YAAE,IAAI,CAAC,EAAE;gBAAE,EAAE,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,GAAG,CAAC;gBAAC,KAAK,EAAE,GAAG,CAAA;aAAE,GAAG,IAAI,CAAA;SAAE,CAAA;KAChF,CAAC;IAEF,EAAE,EAAE,YAAY,CAAC;IAEjB,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IAG5B,eAAe,EAAE,eAAe,CAAA;IAChC,cAAc,EAAE,cAAc,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAA;IACxB,WAAW,EAAE,WAAW,CAAA;CAC3B,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scefira/dfw",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.8",
|
|
4
4
|
"description": "nodejs express fast prototype library",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -17,15 +17,17 @@
|
|
|
17
17
|
},
|
|
18
18
|
"author": "Scefira Technologies",
|
|
19
19
|
"license": "ISC",
|
|
20
|
+
"peerDependencies": {
|
|
21
|
+
"@prisma/client": "^4.x",
|
|
22
|
+
"luxon": "^2.x"
|
|
23
|
+
},
|
|
20
24
|
"dependencies": {
|
|
21
|
-
"
|
|
22
|
-
"body-parser": "^1.19.2",
|
|
25
|
+
"body-parser": "^1.20.0",
|
|
23
26
|
"cookie-parser": "^1.4.6",
|
|
24
|
-
"express": "^4.
|
|
25
|
-
"express-fileupload": "^1.
|
|
26
|
-
"luxon": "^2.3.1",
|
|
27
|
+
"express": "^4.18.1",
|
|
28
|
+
"express-fileupload": "^1.4.0",
|
|
27
29
|
"md5-file": "^5.0.0",
|
|
28
|
-
"mime-types": "^2.1.
|
|
30
|
+
"mime-types": "^2.1.35",
|
|
29
31
|
"node-php-password": "^0.1.2",
|
|
30
32
|
"uuid": "^8.3.2"
|
|
31
33
|
},
|
|
@@ -42,7 +44,7 @@
|
|
|
42
44
|
"@types/uuid": "^8.3.4",
|
|
43
45
|
"cross-env": "^7.0.3",
|
|
44
46
|
"nodemon": "^2.0.15",
|
|
45
|
-
"prisma": "^
|
|
47
|
+
"prisma": "^4.0.0",
|
|
46
48
|
"ts-node": "^10.5.0",
|
|
47
49
|
"typescript": "^4.5.5"
|
|
48
50
|
}
|