@scefira/dfw 0.1.3 → 0.1.6
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/DFWInstance.js +1 -1
- package/lib/DFWInstance.js.map +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +4 -1
- package/lib/index.js.map +1 -1
- package/lib/manager/APIManager.d.ts +2 -2
- package/lib/manager/APIManager.d.ts.map +1 -1
- package/lib/manager/APIManager.js +43 -30
- package/lib/manager/APIManager.js.map +1 -1
- package/lib/manager/DFWModule.d.ts +1 -0
- package/lib/manager/DFWModule.d.ts.map +1 -1
- package/lib/manager/DFWModule.js +9 -0
- package/lib/manager/DFWModule.js.map +1 -1
- package/lib/manager/FileManager.d.ts +15 -2
- package/lib/manager/FileManager.d.ts.map +1 -1
- package/lib/manager/FileManager.js +78 -48
- package/lib/manager/FileManager.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/test.js +25 -9
- package/lib/test.js.map +1 -1
- package/lib/types/DFWConfig.d.ts +3 -0
- package/lib/types/DFWConfig.d.ts.map +1 -1
- package/lib/types/DFWRequestScheme.d.ts +0 -1
- package/lib/types/DFWRequestScheme.d.ts.map +1 -1
- package/package.json +1 -1
- package/prisma/schema.prisma +1 -1
package/lib/DFWInstance.js
CHANGED
|
@@ -34,7 +34,7 @@ class DFWInstance {
|
|
|
34
34
|
constructor(config) {
|
|
35
35
|
this.config = config;
|
|
36
36
|
this.database = new client_1.PrismaClient({
|
|
37
|
-
|
|
37
|
+
log: config.database ? config.database.log ? ['query', 'info', 'warn', 'error'] : undefined : undefined,
|
|
38
38
|
});
|
|
39
39
|
if (fs.existsSync(".dfw") == false) {
|
|
40
40
|
fs.mkdirSync(".dfw");
|
package/lib/DFWInstance.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWInstance.js","sourceRoot":"","sources":["../src/DFWInstance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAA8C;AAC9C,gFAAwD;AACxD,wEAAgD;AAChD,gFAAwD;AACxD,8EAAsD;AACtD,wEAAgD;AAEhD,uCAAyB;AACzB,2CAA8C;AAE9C,MAAM,WAAW;IAYb,YAAY,MAAiB;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,QAAQ,GAAG,IAAI,qBAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"DFWInstance.js","sourceRoot":"","sources":["../src/DFWInstance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAA8C;AAC9C,gFAAwD;AACxD,wEAAgD;AAChD,gFAAwD;AACxD,8EAAsD;AACtD,wEAAgD;AAEhD,uCAAyB;AACzB,2CAA8C;AAE9C,MAAM,WAAW;IAYb,YAAY,MAAiB;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,QAAQ,GAAG,IAAI,qBAAY,CAAC;YAC7B,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;SAC1G,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE;YAChC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SACxB;QAED,IAAI,CAAC,eAAe,GAAG,IAAI,yBAAe,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,GAAG,IAAI,oBAAU,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,wBAAc,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,eAAe,GAAG,IAAI,yBAAe,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,WAAW,GAAG,IAAI,qBAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,IAAI,qBAAW,CAAC,IAAI,CAAC,CAAC;QAEzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB;IACnD,CAAC;CAEJ;AAED,kBAAe,WAAW,CAAC"}
|
package/lib/index.d.ts
CHANGED
|
@@ -3,7 +3,8 @@ import { DFWConfig } from "./types/DFWConfig";
|
|
|
3
3
|
export declare class DFWCore {
|
|
4
4
|
static DFW: DFWInstance;
|
|
5
5
|
private static instances;
|
|
6
|
-
static
|
|
6
|
+
private static listeners;
|
|
7
|
+
static createInstance(config?: DFWConfig, name?: string): DFWInstance;
|
|
7
8
|
static get(name?: string): DFWInstance | undefined;
|
|
8
9
|
}
|
|
9
10
|
export default DFWCore;
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,qBAAa,OAAO;IAChB,OAAc,GAAG,EAAC,WAAW,CAAC;IAE9B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,qBAAa,OAAO;IAChB,OAAc,GAAG,EAAC,WAAW,CAAC;IAE9B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;IAExD,OAAO,CAAC,MAAM,CAAC,SAAS,CAAK;WAEf,cAAc,CAAC,MAAM,GAAC,SAAc,EAAC,IAAI,SAAS;WAWlD,GAAG,CAAC,IAAI,GAAC,MAAe,GAAE,WAAW,GAAC,SAAS;CAGhE;AAED,eAAe,OAAO,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.DFWCore = void 0;
|
|
7
7
|
const DFWInstance_1 = __importDefault(require("./DFWInstance"));
|
|
8
8
|
class DFWCore {
|
|
9
|
-
static createInstance(config, name = "main") {
|
|
9
|
+
static createInstance(config = {}, name = "main") {
|
|
10
10
|
let DFW = new DFWInstance_1.default(config);
|
|
11
11
|
if (name == "main")
|
|
12
12
|
this.DFW = DFW;
|
|
13
|
+
if (this.instances[name])
|
|
14
|
+
throw new Error(`[DFW_ERROR] DFW Instance '${name}' already exist`);
|
|
13
15
|
this.instances[name] = DFW;
|
|
14
16
|
return DFW;
|
|
15
17
|
}
|
|
@@ -19,5 +21,6 @@ class DFWCore {
|
|
|
19
21
|
}
|
|
20
22
|
exports.DFWCore = DFWCore;
|
|
21
23
|
DFWCore.instances = {};
|
|
24
|
+
DFWCore.listeners = {}; //TODO Implement some listeners
|
|
22
25
|
exports.default = DFWCore;
|
|
23
26
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AAGxC,MAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AAGxC,MAAa,OAAO;IAOT,MAAM,CAAC,cAAc,CAAC,SAAmB,EAAE,EAAC,IAAI,GAAG,MAAM;QAC5D,IAAI,GAAG,GAAG,IAAI,qBAAW,CAAC,MAAM,CAAC,CAAC;QAElC,IAAG,IAAI,IAAI,MAAM;YAAE,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAClC,IAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,iBAAiB,CAAC,CAAC;QAE7F,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAE3B,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,OAAc,MAAM;QAClC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;;AApBL,0BAqBC;AAlBkB,iBAAS,GAA8B,EAAE,CAAA;AAEzC,iBAAS,GAAG,EAAE,CAAA,CAAC,+BAA+B;AAkBjE,kBAAe,OAAO,CAAC"}
|
|
@@ -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;IA8Bf,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,28 @@ 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
|
+
};
|
|
85
|
+
next();
|
|
86
|
+
}));
|
|
87
|
+
this.DFW_BASIC_ROUTER.use((0, exports.MiddlewareAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
88
|
+
try {
|
|
89
|
+
yield this.instance.DatabaseManager.middleware(req, res);
|
|
90
|
+
yield this.instance.SessionManager.middleware(req, res);
|
|
91
|
+
yield this.instance.SecurityManager.middleware(req, res);
|
|
92
|
+
yield this.instance.UserManager.middleware(req, res);
|
|
93
|
+
yield this.instance.FileManager.middleware(req, res);
|
|
94
|
+
yield this.instance.APIManager.middleware(req, res);
|
|
95
|
+
next();
|
|
96
|
+
}
|
|
97
|
+
catch (e) {
|
|
98
|
+
next(e);
|
|
99
|
+
}
|
|
100
|
+
})));
|
|
78
101
|
}
|
|
79
102
|
middleware(req, res) {
|
|
80
103
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -82,9 +105,8 @@ class APIManager extends DFWModule_1.default {
|
|
|
82
105
|
});
|
|
83
106
|
}
|
|
84
107
|
startServer(port = 3000, server = require("express")()) {
|
|
85
|
-
this.API_ROUTER.use((0, cookie_parser_1.default)());
|
|
86
|
-
server.listen(port);
|
|
87
108
|
this.server = server;
|
|
109
|
+
this.server.listen(port);
|
|
88
110
|
console.log(`[DFW] Server listening on port ${port}`);
|
|
89
111
|
}
|
|
90
112
|
/**
|
|
@@ -96,7 +118,7 @@ class APIManager extends DFWModule_1.default {
|
|
|
96
118
|
addListener(path, apiFunction, config = {}) {
|
|
97
119
|
if (!this.server)
|
|
98
120
|
throw `you must start an DFW/Express Server before add a listener`;
|
|
99
|
-
let handlers = this.
|
|
121
|
+
let handlers = this.makeAPIListenerMiddlewares(config);
|
|
100
122
|
// APIFunction middleware
|
|
101
123
|
handlers.push((0, exports.MiddlewareAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
102
124
|
yield Promise.resolve(apiFunction(req, res, req.dfw)).then((data) => {
|
|
@@ -107,6 +129,7 @@ class APIManager extends DFWModule_1.default {
|
|
|
107
129
|
next();
|
|
108
130
|
}).catch((err) => next(err));
|
|
109
131
|
})));
|
|
132
|
+
// error handler middleware
|
|
110
133
|
handlers.push(((err, req, res, next) => {
|
|
111
134
|
if (process.env.NODE_ENV == "development")
|
|
112
135
|
console.error(`[DFW_ERROR] ${err}`);
|
|
@@ -119,43 +142,33 @@ class APIManager extends DFWModule_1.default {
|
|
|
119
142
|
}
|
|
120
143
|
next(err);
|
|
121
144
|
}));
|
|
122
|
-
this.server.use(path, this.
|
|
145
|
+
this.server.use(path, this.DFW_BASIC_ROUTER); // Install basic middleware
|
|
123
146
|
this.server[config.method ? config.method.toLowerCase() : "get"](path, handlers);
|
|
124
147
|
console.log(`[API][${config.method ? config.method.toUpperCase() : "GET"}] ${path}`);
|
|
125
148
|
}
|
|
126
|
-
|
|
127
|
-
let handlers = [
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
149
|
+
makeAPIListenerMiddlewares(config = {}) {
|
|
150
|
+
let handlers = [];
|
|
151
|
+
//Check security middleware
|
|
152
|
+
if (config.security) {
|
|
153
|
+
handlers.push((0, exports.MiddlewareAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
154
|
+
let bindings = config.security ? SecurityManager_1.default.jsonToBindings(config.security) : [];
|
|
155
|
+
for (let binding of bindings) {
|
|
156
|
+
console.log(binding);
|
|
157
|
+
if ((yield req.dfw.SecurityManager.checkBindingAsync(req, binding[0], binding[1])) === false) {
|
|
158
|
+
next(`${SecurityManager_1.default.RULE_LABELS[binding[0]]}`);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
135
161
|
next();
|
|
136
|
-
}
|
|
137
|
-
|
|
162
|
+
})));
|
|
163
|
+
}
|
|
138
164
|
// Body parser
|
|
139
165
|
if (config.parseBody !== false) { // Body parser middleware
|
|
140
166
|
handlers.push(body_parser_1.default.json(), body_parser_1.default.urlencoded({ extended: true }));
|
|
141
167
|
}
|
|
168
|
+
// Upload handler
|
|
142
169
|
if (config.upload) {
|
|
143
170
|
handlers.push((0, express_fileupload_1.default)(Object.assign(config.upload, config, { useTempFiles: true, tempFileDir: this.instance.FileManager.tmpDir })));
|
|
144
171
|
}
|
|
145
|
-
handlers.push((0, exports.MiddlewareAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
146
|
-
try {
|
|
147
|
-
yield this.instance.DatabaseManager.middleware(req, res);
|
|
148
|
-
yield this.instance.SessionManager.middleware(req, res);
|
|
149
|
-
yield this.instance.SecurityManager.middleware(req, res);
|
|
150
|
-
yield this.instance.UserManager.middleware(req, res);
|
|
151
|
-
yield this.instance.FileManager.middleware(req, res);
|
|
152
|
-
yield this.instance.APIManager.middleware(req, res);
|
|
153
|
-
next();
|
|
154
|
-
}
|
|
155
|
-
catch (e) {
|
|
156
|
-
next(e);
|
|
157
|
-
}
|
|
158
|
-
})));
|
|
159
172
|
return handlers;
|
|
160
173
|
}
|
|
161
174
|
/**
|
|
@@ -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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"}
|
|
@@ -5,6 +5,7 @@ export default abstract class DFWModule {
|
|
|
5
5
|
instance: DFWInstance;
|
|
6
6
|
db: PrismaClient;
|
|
7
7
|
constructor(DFW: DFWInstance);
|
|
8
|
+
use(db: PrismaClient | Omit<PrismaClient, '$connect' | '$disconnect' | '$on' | '$transaction' | '$use'>): this;
|
|
8
9
|
static middleware?: (req: Request, res: Response, next: NextFunction) => void;
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=DFWModule.d.ts.map
|
|
@@ -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;IAE5B,QAAQ,EAAE,WAAW,CAAC;IACtB,EAAE,
|
|
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;IAE5B,QAAQ,EAAE,WAAW,CAAC;IACtB,EAAE,EAAE,YAAY,CAAC;gBAEZ,GAAG,EAAE,WAAW;IAKrB,GAAG,CAAC,EAAE,EAAC,YAAY,GAAC,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,aAAa,GAAG,KAAK,GAAG,cAAc,GAAG,MAAM,CAAC,GAAG,IAAI;IASlH,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
|
@@ -5,6 +5,15 @@ class DFWModule {
|
|
|
5
5
|
this.instance = DFW;
|
|
6
6
|
this.db = this.instance.database;
|
|
7
7
|
}
|
|
8
|
+
use(db) {
|
|
9
|
+
return new Proxy(this, {
|
|
10
|
+
get: (target, prop, receiver) => {
|
|
11
|
+
if (prop === "db")
|
|
12
|
+
return db;
|
|
13
|
+
return target[prop];
|
|
14
|
+
}
|
|
15
|
+
});
|
|
16
|
+
}
|
|
8
17
|
}
|
|
9
18
|
exports.default = DFWModule;
|
|
10
19
|
//# sourceMappingURL=DFWModule.js.map
|
|
@@ -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,QAAQ,GAAG,GAAG,CAAC;QACpB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACrC,CAAC;CAGJ;
|
|
1
|
+
{"version":3,"file":"DFWModule.js","sourceRoot":"","sources":["../../src/manager/DFWModule.ts"],"names":[],"mappings":";;AAIA,MAA8B,SAAS;IAKnC,YAAY,GAAgB;QACxB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;QACpB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACrC,CAAC;IAEM,GAAG,CAAC,EAAgG;QACvG,OAAO,IAAI,KAAK,CAAC,IAAI,EAAC;YAClB,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAC,EAAE;gBAC3B,IAAG,IAAI,KAAK,IAAI;oBAAE,OAAO,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;CAGJ;AApBD,4BAoBC"}
|
|
@@ -45,11 +45,24 @@ export default class FileManager extends DFWModule {
|
|
|
45
45
|
* @param cfg
|
|
46
46
|
*/
|
|
47
47
|
flushUpload(req: DFWRequest, file: string, cfg?: FileConfig): Promise<dfw_file | Promise<dfw_file>[]>;
|
|
48
|
+
/**
|
|
49
|
+
*
|
|
50
|
+
* @param posfix
|
|
51
|
+
* @returns
|
|
52
|
+
*/
|
|
48
53
|
generateTempFileName(posfix?: string): string;
|
|
49
54
|
/**
|
|
50
|
-
*
|
|
55
|
+
* Get an array of all childrens of the file in the tree (including 2 levels of nested files)
|
|
56
|
+
* @param file
|
|
57
|
+
*/
|
|
58
|
+
getChildrenFileIdsAsync(file: number | {
|
|
59
|
+
id: number;
|
|
60
|
+
}): Promise<number[]>;
|
|
61
|
+
/**
|
|
62
|
+
*
|
|
63
|
+
* @param file
|
|
51
64
|
*/
|
|
52
|
-
removeFileAsync(file: number | dfw_file): Promise<
|
|
65
|
+
removeFileAsync(file: number | dfw_file): Promise<dfw_file[]>;
|
|
53
66
|
/**
|
|
54
67
|
*
|
|
55
68
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../../src/manager/FileManager.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,SAAS,MAAM,aAAa,CAAC;AAGpC,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../../src/manager/FileManager.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,SAAS,MAAM,aAAa,CAAC;AAGpC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKnC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAYpD,aAAK,UAAU,GAAG;IACd,SAAS,CAAC,EAAE,OAAO,GAAG,GAAG,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAA;AAED,oBAAY,YAAY,GAAG;IACvB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE;QACL,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;CACL,CAAA;AAMD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAE9C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,qBAAqB,oBAAoC;gBAEtD,GAAG,EAAE,WAAW;IA6BrB,UAAU,QAAe,UAAU,OAAO,QAAQ,mBAGxD;IAED;;OAEG;IACU,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,aAAa,GAAE,OAAe;IA6DnG;;;;OAIG;IACU,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,UAAe;IAmB5E;;;;OAIG;IACI,oBAAoB,CAAC,MAAM,CAAC,EAAE,MAAM;IAI3C;;;OAGG;IACU,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAwBtF;;;OAGG;IACU,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAoCpD;;OAEG;IACU,sBAAsB;CAItC"}
|
|
@@ -110,34 +110,32 @@ class FileManager extends DFWModule_1.default {
|
|
|
110
110
|
throw new Error("Process uploaded file async error, unable to copy file uploaded: " + e);
|
|
111
111
|
});
|
|
112
112
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
where: {
|
|
118
|
-
idParent,
|
|
119
|
-
variant,
|
|
120
|
-
}
|
|
121
|
-
});
|
|
122
|
-
for (let df of dfl) {
|
|
123
|
-
yield this.removeFileAsync(df);
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
return this.db.dfw_file.create({
|
|
127
|
-
data: {
|
|
113
|
+
// Removing same variant if has variant and parent
|
|
114
|
+
if (cfg.parent && cfg.variant) {
|
|
115
|
+
let variantFiles = yield this.db.dfw_file.findMany({
|
|
116
|
+
where: {
|
|
128
117
|
idParent,
|
|
129
|
-
mimetype,
|
|
130
|
-
checksum,
|
|
131
|
-
expire,
|
|
132
118
|
variant,
|
|
133
|
-
description,
|
|
134
|
-
path: finalFilePath,
|
|
135
|
-
idUser: cfg.user === null ? null : typeof cfg.user == "object" ? cfg.user.id : cfg.user,
|
|
136
|
-
slug: cfg.slug,
|
|
137
|
-
size: stats.size,
|
|
138
119
|
}
|
|
139
120
|
});
|
|
140
|
-
|
|
121
|
+
for (let vFile of variantFiles) {
|
|
122
|
+
yield this.removeFileAsync(vFile);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return this.db.dfw_file.create({
|
|
126
|
+
data: {
|
|
127
|
+
idParent,
|
|
128
|
+
mimetype,
|
|
129
|
+
checksum,
|
|
130
|
+
expire,
|
|
131
|
+
variant,
|
|
132
|
+
description,
|
|
133
|
+
path: finalFilePath,
|
|
134
|
+
idUser: cfg.user === null ? null : typeof cfg.user == "object" ? cfg.user.id : cfg.user,
|
|
135
|
+
slug: cfg.slug,
|
|
136
|
+
size: stats.size,
|
|
137
|
+
}
|
|
138
|
+
});
|
|
141
139
|
});
|
|
142
140
|
}
|
|
143
141
|
/**
|
|
@@ -167,41 +165,73 @@ class FileManager extends DFWModule_1.default {
|
|
|
167
165
|
}
|
|
168
166
|
});
|
|
169
167
|
}
|
|
168
|
+
/**
|
|
169
|
+
*
|
|
170
|
+
* @param posfix
|
|
171
|
+
* @returns
|
|
172
|
+
*/
|
|
170
173
|
generateTempFileName(posfix) {
|
|
171
174
|
return path.join(this.tmpDir, `${DFWUtils_1.default.uuid()}${posfix ? `.${posfix}` : ""}`);
|
|
172
175
|
}
|
|
173
176
|
/**
|
|
174
|
-
*
|
|
177
|
+
* Get an array of all childrens of the file in the tree (including 2 levels of nested files)
|
|
178
|
+
* @param file
|
|
175
179
|
*/
|
|
176
|
-
|
|
180
|
+
getChildrenFileIdsAsync(file) {
|
|
177
181
|
return __awaiter(this, void 0, void 0, function* () {
|
|
178
|
-
let
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
else {
|
|
185
|
-
throw `Unable to find file`;
|
|
186
|
-
}
|
|
187
|
-
let childrenFiles = yield this.db.dfw_file.findMany({
|
|
182
|
+
let queryRes = yield this.db.dfw_file.findMany({
|
|
183
|
+
select: {
|
|
184
|
+
id: true,
|
|
185
|
+
idParent: true,
|
|
186
|
+
children: true,
|
|
187
|
+
},
|
|
188
188
|
where: {
|
|
189
|
-
idParent:
|
|
189
|
+
idParent: typeof file == "number" ? file : file.id
|
|
190
190
|
}
|
|
191
191
|
});
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
192
|
+
let res = [];
|
|
193
|
+
for (let f of queryRes) {
|
|
194
|
+
res.push(f.id);
|
|
195
|
+
for (let fc of f.children) {
|
|
196
|
+
res.push(fc.id);
|
|
197
|
+
}
|
|
195
198
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
199
|
+
return res.flat();
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
/**
|
|
203
|
+
*
|
|
204
|
+
* @param file
|
|
205
|
+
*/
|
|
206
|
+
removeFileAsync(file) {
|
|
207
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
208
|
+
let ids = [typeof file == "object" ? file.id : file, ...yield this.getChildrenFileIdsAsync(file)];
|
|
209
|
+
let deletableFiles = yield this.db.dfw_file.findMany({
|
|
210
|
+
where: {
|
|
211
|
+
id: {
|
|
212
|
+
in: ids
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
});
|
|
216
|
+
yield this.db.dfw_file.deleteMany({
|
|
217
|
+
where: {
|
|
218
|
+
id: {
|
|
219
|
+
in: ids
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
}).catch((e) => { throw new Error(`Unable to delete file records in DB ` + e); });
|
|
223
|
+
for (let file of deletableFiles) {
|
|
224
|
+
if (fs.existsSync(file.path)) {
|
|
225
|
+
yield fileUnlink(file.path).then(() => {
|
|
226
|
+
this.db.dfw_file.delete({
|
|
227
|
+
where: {
|
|
228
|
+
id: file.id
|
|
229
|
+
}
|
|
230
|
+
});
|
|
231
|
+
}).catch(() => { });
|
|
232
|
+
}
|
|
204
233
|
}
|
|
234
|
+
return deletableFiles;
|
|
205
235
|
});
|
|
206
236
|
}
|
|
207
237
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../src/manager/FileManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../src/manager/FileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
package/lib/test.js
CHANGED
|
@@ -10,11 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const _1 = require(".");
|
|
13
|
-
var DFW = _1.DFWCore.createInstance(
|
|
13
|
+
var DFW = _1.DFWCore.createInstance();
|
|
14
14
|
//DFW.DatabaseManager.database.sync();
|
|
15
15
|
DFW.APIManager.startServer(300);
|
|
16
16
|
DFW.APIManager.addListener("/", (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
-
return
|
|
17
|
+
return DFW.FileManager.removeFileAsync(1);
|
|
18
18
|
}));
|
|
19
19
|
DFW.APIManager.addListener("/login", (req, res, dfw) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
20
|
yield dfw.SessionManager.loginAsync(req, "aldodelacomarca@gmail.com", "Aldo1234");
|
|
@@ -24,20 +24,36 @@ 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 });
|
|
33
|
-
DFW.APIManager.addListener("/error", (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
34
|
-
|
|
35
|
-
|
|
40
|
+
}), { method: "post", upload: true, security: { session: true } });
|
|
41
|
+
DFW.APIManager.addListener("/error", (req, res, dfw) => __awaiter(void 0, void 0, void 0, function* () {
|
|
42
|
+
return yield dfw.db.$transaction((db) => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
|
+
let t1 = performance.now();
|
|
44
|
+
yield dfw.UserManager.use(db).createCredentiaASync("DUMMY-1");
|
|
45
|
+
console.log(performance.now() - t1);
|
|
46
|
+
throw new Error("ERROR_TONTO");
|
|
47
|
+
yield dfw.UserManager.use(db).createCredentiaASync("DUMMY-2");
|
|
48
|
+
yield dfw.UserManager.use(db).createCredentiaASync("DUMMY-2");
|
|
49
|
+
})).catch((e) => {
|
|
50
|
+
throw e.message;
|
|
51
|
+
console.log(Object.keys(e));
|
|
52
|
+
});
|
|
36
53
|
}));
|
|
37
54
|
DFW.APIManager.addListener("/strap", ({ dfw }, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
//await dfw.SecurityManager.createCredentialAsync("TESTER");
|
|
55
|
+
let newUser = yield dfw.UserManager.createUserAsync("aldodelacomarca@gmail.com", "zerozelta", "Aldo1234");
|
|
56
|
+
let newCredential = yield dfw.SecurityManager.createCredentialAsync("ADMIN");
|
|
41
57
|
let user = yield dfw.db.dfw_user.findUnique({ where: { id: 1 } });
|
|
42
58
|
let credential = yield dfw.UserManager.addCredentialAsync(user, ["ADMIN", "TESTER"]);
|
|
43
59
|
return { credential };
|
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,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
package/lib/types/DFWConfig.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWConfig.d.ts","sourceRoot":"","sources":["../../src/types/DFWConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,oBAAY,SAAS,GAAG;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE;QACN;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC;QAEb;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC;QAEb;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB;;WAEG;QACH,UAAU,CAAC,EAAC,OAAO,CAAC;QAGpB;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;KACjC,CAAA;IAED;;OAEG;IACH,MAAM,CAAC,EAAE;QACL,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,MAAM,CAAC,EAAE;YACL,aAAa,CAAC,EAAE,MAAM,CAAC;YACvB,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,WAAW,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC;KACL,CAAC;
|
|
1
|
+
{"version":3,"file":"DFWConfig.d.ts","sourceRoot":"","sources":["../../src/types/DFWConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,oBAAY,SAAS,GAAG;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE;QACN;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC;QAEb;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC;QAEb;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB;;WAEG;QACH,UAAU,CAAC,EAAC,OAAO,CAAC;QAGpB;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;KACjC,CAAA;IAED;;OAEG;IACH,MAAM,CAAC,EAAE;QACL,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,MAAM,CAAC,EAAE;YACL,aAAa,CAAC,EAAE,MAAM,CAAC;YACvB,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,WAAW,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC;KACL,CAAC;IAEF,QAAQ,CAAC,EAAC;QACN,GAAG,CAAC,EAAC,OAAO,CAAC;KAChB,CAAA;CACJ,CAAA"}
|
|
@@ -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,EAAc,WAAW,EAAE,QAAQ,EAAU,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEzF,oBAAY,UAAU,GAAG;IACrB,GAAG,EAAE,gBAAgB,CAAC;CACzB,GAAG,OAAO,CAAA;AAEX,oBAAY,gBAAgB,GAAG;IAC3B,MAAM,EAAE;QACJ,
|
|
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,EAAc,WAAW,EAAE,QAAQ,EAAU,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEzF,oBAAY,UAAU,GAAG;IACrB,GAAG,EAAE,gBAAgB,CAAC;CACzB,GAAG,OAAO,CAAA;AAEX,oBAAY,gBAAgB,GAAG;IAC3B,MAAM,EAAE;QACJ,SAAS,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,QAAQ,EAAE,WAAW,CAAC;IACtB,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,CAAC;IAG7B,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;CAC5B,CAAA"}
|
package/package.json
CHANGED
package/prisma/schema.prisma
CHANGED
|
@@ -41,7 +41,7 @@ model dfw_file {
|
|
|
41
41
|
description String? @db.VarChar(255)
|
|
42
42
|
idUser Int? @db.UnsignedInt
|
|
43
43
|
variant String? @db.VarChar(255)
|
|
44
|
-
size
|
|
44
|
+
size Int? @db.UnsignedInt
|
|
45
45
|
checksum String? @db.VarChar(255)
|
|
46
46
|
slug String? @db.VarChar(255)
|
|
47
47
|
mimetype String? @db.VarChar(255)
|