@scefira/dfw 0.1.8 → 0.1.11
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 +3 -3
- package/lib/manager/APIManager.js.map +1 -1
- package/lib/manager/DFWModule.d.ts.map +1 -1
- package/lib/manager/DFWModule.js +0 -8
- package/lib/manager/DFWModule.js.map +1 -1
- package/lib/manager/FileManager.d.ts +4 -1
- package/lib/manager/FileManager.d.ts.map +1 -1
- package/lib/manager/FileManager.js +10 -5
- package/lib/manager/FileManager.js.map +1 -1
- package/lib/manager/SecurityManager.d.ts +1 -0
- package/lib/manager/SecurityManager.d.ts.map +1 -1
- package/lib/manager/SecurityManager.js +44 -0
- package/lib/manager/SecurityManager.js.map +1 -1
- package/lib/manager/SessionManager.d.ts.map +1 -1
- package/lib/manager/SessionManager.js +1 -1
- 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 +2 -40
- package/lib/manager/UserManager.js.map +1 -1
- package/lib/test.js +13 -3
- package/lib/test.js.map +1 -1
- package/lib/types/APIListenerConfig.d.ts +3 -1
- package/lib/types/APIListenerConfig.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -13,12 +13,12 @@ export declare class APIListener {
|
|
|
13
13
|
}
|
|
14
14
|
export declare type BootCallback = (req: DFWRequest, boot: DFWBoot) => Promise<any>;
|
|
15
15
|
export default class APIManager extends DFWModule {
|
|
16
|
-
server
|
|
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>;
|
|
21
|
-
startServer(port?: number
|
|
21
|
+
startServer(port?: number): void;
|
|
22
22
|
/**
|
|
23
23
|
*
|
|
24
24
|
* @param path
|
|
@@ -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;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,
|
|
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,EAAE,OAAO,CAAwB;IAEvC,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;IAK9B;;;;;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"}
|
|
@@ -35,6 +35,7 @@ exports.APIListener = APIListener;
|
|
|
35
35
|
class APIManager extends DFWModule_1.default {
|
|
36
36
|
constructor(DFW) {
|
|
37
37
|
super(DFW);
|
|
38
|
+
this.server = require("express")();
|
|
38
39
|
this.DFW_BASIC_ROUTER = express_1.default.Router();
|
|
39
40
|
this.bootCallbacks = [
|
|
40
41
|
/** add default callback on each APIManager instance */
|
|
@@ -106,8 +107,7 @@ class APIManager extends DFWModule_1.default {
|
|
|
106
107
|
req.dfw.boot = () => this.getBootAsync(req);
|
|
107
108
|
});
|
|
108
109
|
}
|
|
109
|
-
startServer(port = 3000
|
|
110
|
-
this.server = server;
|
|
110
|
+
startServer(port = 3000) {
|
|
111
111
|
this.server.listen(port);
|
|
112
112
|
console.log(`[DFW] Server listening on port ${port}`);
|
|
113
113
|
}
|
|
@@ -136,7 +136,7 @@ class APIManager extends DFWModule_1.default {
|
|
|
136
136
|
if (process.env.NODE_ENV == "development")
|
|
137
137
|
console.error(`[DFW_ERROR] ${err}`);
|
|
138
138
|
res.statusCode = 500;
|
|
139
|
-
if (err
|
|
139
|
+
if (typeof err === "object" && err.message) {
|
|
140
140
|
res.json({ error: err.message, stack: process.env.NODE_ENV == "development" ? err.stack : null }).end();
|
|
141
141
|
}
|
|
142
142
|
else {
|
|
@@ -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;AACzC,wEAAgD;AAKhD,MAAa,WAAW;IAIpB,YAAY,MAAuC,EAAE,QAAsB;QACvE,IAAI,OAAO,MAAM,IAAI,UAAU,IAAI,CAAC,QAAQ,EAAE;YAC1C,IAAI,CAAC,QAAQ,GAAG,MAAqB,CAAC;YACtC,IAAI,CAAC,MAAM,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAA;SAClC;aAAM;YACH,IAAI,CAAC,MAAM,GAAG,MAA2B,CAAC;YAC1C,IAAI,CAAC,QAAQ,GAAG,QAAuB,CAAC;SAC3C;IACL,CAAC;CACJ;AAbD,kCAaC;AAID,MAAqB,UAAW,SAAQ,mBAAS;IAmD7C,YAAY,GAAgB;QACxB,KAAK,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/manager/APIManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;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;
|
|
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;IAKlH,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
|
@@ -14,14 +14,6 @@ class DFWModule {
|
|
|
14
14
|
use(db) {
|
|
15
15
|
this._db = db;
|
|
16
16
|
return this;
|
|
17
|
-
/*
|
|
18
|
-
return new Proxy(this,{
|
|
19
|
-
get: (target, prop, receiver)=>{
|
|
20
|
-
if(prop === "db") return db;
|
|
21
|
-
return target[prop];
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
|
-
*/
|
|
25
17
|
}
|
|
26
18
|
}
|
|
27
19
|
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,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;
|
|
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;IAChB,CAAC;CAGJ;AAxBD,4BAwBC"}
|
|
@@ -31,8 +31,11 @@ export declare type UploadConfig = {
|
|
|
31
31
|
};
|
|
32
32
|
};
|
|
33
33
|
export default class FileManager extends DFWModule {
|
|
34
|
+
readonly LOCAL_PUBLIC_UPLOAD_DIR = ".dfw/upload/public";
|
|
35
|
+
readonly LOCAL_PROTECTED_UPLOAD_DIR = ".dfw/upload/protected";
|
|
34
36
|
readonly tmpDir: string;
|
|
35
|
-
|
|
37
|
+
private publicStaticFilesPath;
|
|
38
|
+
get PUBLIC_STATIC_FILES_PATH(): string;
|
|
36
39
|
constructor(DFW: DFWInstance);
|
|
37
40
|
middleware: (req: DFWRequest, res: Response) => Promise<void>;
|
|
38
41
|
/**
|
|
@@ -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,
|
|
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,OAAgB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAK5C,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;AAID,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAE9C,QAAQ,CAAC,uBAAuB,wBAAwB;IACxD,QAAQ,CAAC,0BAA0B,2BAA2B;IAE9D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,qBAAqB,CAAoC;IAEjE,IAAI,wBAAwB,WAE3B;gBAEW,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;IA8DnG;;;;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"}
|
|
@@ -34,6 +34,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
34
34
|
const util_1 = require("util");
|
|
35
35
|
const DFWModule_1 = __importDefault(require("./DFWModule"));
|
|
36
36
|
const md5_file_1 = __importDefault(require("md5-file"));
|
|
37
|
+
const express_1 = __importDefault(require("express"));
|
|
37
38
|
const fs = __importStar(require("fs"));
|
|
38
39
|
const path = __importStar(require("path"));
|
|
39
40
|
const DFWUtils_1 = __importDefault(require("../DFWUtils"));
|
|
@@ -46,11 +47,11 @@ const fileStat = (0, util_1.promisify)(fs.stat);
|
|
|
46
47
|
const fileUnlink = (0, util_1.promisify)(fs.unlink);
|
|
47
48
|
const fileCopy = (0, util_1.promisify)(fs.copyFile);
|
|
48
49
|
const DEFAULT_PUBLIC_STATIC_FILES_PATH = "/static/upload";
|
|
49
|
-
const LOCAL_PUBLIC_UPLOAD_DIR = ".dfw/upload/public";
|
|
50
|
-
const LOCAL_PROTECTED_UPLOAD_DIR = ".dfw/upload/protected";
|
|
51
50
|
class FileManager extends DFWModule_1.default {
|
|
52
51
|
constructor(DFW) {
|
|
53
52
|
super(DFW);
|
|
53
|
+
this.LOCAL_PUBLIC_UPLOAD_DIR = ".dfw/upload/public";
|
|
54
|
+
this.LOCAL_PROTECTED_UPLOAD_DIR = ".dfw/upload/protected";
|
|
54
55
|
this.publicStaticFilesPath = DEFAULT_PUBLIC_STATIC_FILES_PATH;
|
|
55
56
|
this.middleware = (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
56
57
|
req.dfw.FileManager = this;
|
|
@@ -70,7 +71,7 @@ class FileManager extends DFWModule_1.default {
|
|
|
70
71
|
}
|
|
71
72
|
this.tmpDir = path.normalize(fs.mkdtempSync(`${this.tmpDir}${path.sep}`));
|
|
72
73
|
// Public static upload path
|
|
73
|
-
|
|
74
|
+
DFW.APIManager.server.use(this.publicStaticFilesPath, express_1.default.static(this.LOCAL_PUBLIC_UPLOAD_DIR, { maxAge: 2592000 }));
|
|
74
75
|
// Clear expired files each 6 hours
|
|
75
76
|
/*
|
|
76
77
|
setInterval(() => {
|
|
@@ -78,6 +79,9 @@ class FileManager extends DFWModule_1.default {
|
|
|
78
79
|
}, 21600000);
|
|
79
80
|
*/
|
|
80
81
|
}
|
|
82
|
+
get PUBLIC_STATIC_FILES_PATH() {
|
|
83
|
+
return this.publicStaticFilesPath;
|
|
84
|
+
}
|
|
81
85
|
/**
|
|
82
86
|
* Takes a local tmp file and move to the files on DFW folder and save db record
|
|
83
87
|
*/
|
|
@@ -91,12 +95,13 @@ class FileManager extends DFWModule_1.default {
|
|
|
91
95
|
let stats = yield fileStat(filePath);
|
|
92
96
|
let filename = `${DFWUtils_1.default.uuid()}.${(_a = cfg.ext) !== null && _a !== void 0 ? _a : DFWUtils_1.default.getFilenameExtension(filePath)}`;
|
|
93
97
|
let mimetype = DFWUtils_1.default.getFileMimetype(filename);
|
|
94
|
-
let partialPath = `${cfg.protected ? LOCAL_PROTECTED_UPLOAD_DIR : LOCAL_PUBLIC_UPLOAD_DIR}/${luxon_1.DateTime.now().toFormat("y/MM")}`;
|
|
98
|
+
let partialPath = `${cfg.protected ? this.LOCAL_PROTECTED_UPLOAD_DIR : this.LOCAL_PUBLIC_UPLOAD_DIR}/${luxon_1.DateTime.now().toFormat("y/MM")}`;
|
|
95
99
|
let expire = cfg.expiration ? cfg.expiration : null;
|
|
96
100
|
let finalFilePath = `${partialPath}/${filename}`;
|
|
97
101
|
let description = cfg.description;
|
|
98
102
|
let variant = cfg.variant;
|
|
99
103
|
let idParent = typeof cfg.parent == "object" ? cfg.parent.id : cfg.parent;
|
|
104
|
+
let idUser = typeof cfg.user === "object" ? cfg.user.id : cfg.user;
|
|
100
105
|
if ((yield fileExistsAsync(partialPath)) == false) {
|
|
101
106
|
yield fileMakeDir(partialPath, { recursive: true });
|
|
102
107
|
}
|
|
@@ -130,8 +135,8 @@ class FileManager extends DFWModule_1.default {
|
|
|
130
135
|
expire,
|
|
131
136
|
variant,
|
|
132
137
|
description,
|
|
138
|
+
idUser,
|
|
133
139
|
path: finalFilePath,
|
|
134
|
-
idUser: cfg.user === null ? null : typeof cfg.user == "object" ? cfg.user.id : cfg.user,
|
|
135
140
|
slug: cfg.slug,
|
|
136
141
|
size: stats.size,
|
|
137
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../src/manager/FileManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAiC;AAGjC,4DAAoC;AACpC,wDAA+B;
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../src/manager/FileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ export default class SecurityManager extends DFWModule {
|
|
|
44
44
|
createCredentialAsync(name: string): Promise<dfw_credential>;
|
|
45
45
|
checkUserCredentialsAsync(user: dfw_user | null | undefined, credential: dfw_credential | dfw_credential[] | string | string[]): Promise<boolean>;
|
|
46
46
|
checkUserAccessAsync(user: dfw_user | null | undefined, access: dfw_access | dfw_access[] | string | string[]): Promise<boolean>;
|
|
47
|
+
addCredentialToAsync(user: number | dfw_user, credential: dfw_credential | number | string | any[]): any;
|
|
47
48
|
checkBodyParams(req: Request, params: string[]): boolean;
|
|
48
49
|
checkQueryParams(req: Request, params: string[]): boolean;
|
|
49
50
|
}
|
|
@@ -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,
|
|
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,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,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;IAK7G,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,EAAE,UAAU,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,GAAG,EAAE;IAqCxG,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"}
|
|
@@ -123,6 +123,50 @@ class SecurityManager extends DFWModule_1.default {
|
|
|
123
123
|
return false;
|
|
124
124
|
});
|
|
125
125
|
}
|
|
126
|
+
addCredentialToAsync(user, credential) {
|
|
127
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
128
|
+
const idUser = typeof user === "object" ? user.id : user;
|
|
129
|
+
if (Array.isArray(credential)) {
|
|
130
|
+
let result = yield Promise.all(credential.map((credentialObj) => this.addCredentialToAsync(user, credentialObj)));
|
|
131
|
+
return result.flat(1);
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
let idCredential;
|
|
135
|
+
if (typeof credential == "number") {
|
|
136
|
+
idCredential = credential;
|
|
137
|
+
}
|
|
138
|
+
else if (typeof credential == "string") {
|
|
139
|
+
let credentialObj = (yield this.db.dfw_credential.findFirst({ where: { name: credential } }));
|
|
140
|
+
if (credentialObj) {
|
|
141
|
+
idCredential = credentialObj.id;
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
return [];
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
idCredential = credential.id;
|
|
149
|
+
}
|
|
150
|
+
let newCredential = yield this.db.dfw_credential.update({
|
|
151
|
+
data: {
|
|
152
|
+
users: {
|
|
153
|
+
create: {
|
|
154
|
+
user: {
|
|
155
|
+
connect: {
|
|
156
|
+
id: idUser
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
},
|
|
162
|
+
where: {
|
|
163
|
+
id: idCredential
|
|
164
|
+
}
|
|
165
|
+
}).catch((e) => []);
|
|
166
|
+
return Array.isArray(newCredential) ? newCredential : [newCredential];
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
}
|
|
126
170
|
checkBodyParams(req, params) {
|
|
127
171
|
let keys = req.body ? Object.keys(req.body) : [];
|
|
128
172
|
return keys.length >= params.length && params.every(v => keys.includes(v));
|
|
@@ -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,GAAG,CAAC,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC;QACnC,CAAC,CAAA,CAAA;
|
|
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;AAQpC,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,mBAmCvD;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;IAevD;;OAEG;IACU,yBAAyB;CASzC"}
|
|
@@ -17,7 +17,6 @@ const luxon_1 = require("luxon");
|
|
|
17
17
|
const DFWUtils_1 = __importDefault(require("../DFWUtils"));
|
|
18
18
|
const SecurityManager_1 = __importDefault(require("./SecurityManager"));
|
|
19
19
|
const DEFAULT_SESSION_EXPIRE_DAYS = 7;
|
|
20
|
-
const DEFAULT_COOKIES_SETTINGS = {};
|
|
21
20
|
class SessionManager extends DFWModule_1.default {
|
|
22
21
|
constructor(DFW) {
|
|
23
22
|
super(DFW);
|
|
@@ -147,6 +146,7 @@ class SessionManager extends DFWModule_1.default {
|
|
|
147
146
|
let diffCookies = req.cookies.sid != req.dfw.session.record.id || req.cookies.stk != req.dfw.session.record.token;
|
|
148
147
|
if (!diffCookies)
|
|
149
148
|
return; // no diference in cookies prevent reset cookies
|
|
149
|
+
console.log(cookieOptions);
|
|
150
150
|
res.cookie(this.sidFieldName, req.dfw.session.record.id, cookieOptions);
|
|
151
151
|
res.cookie(this.stkFieldName, req.dfw.session.record.token, cookieOptions);
|
|
152
152
|
req.cookies.sid = req.dfw.session.record.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionManager.js","sourceRoot":"","sources":["../../src/manager/SessionManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAGA,4DAAoC;AACpC,iCAAiC;AACjC,2DAAmC;AACnC,wEAAgD;AAGhD,MAAM,2BAA2B,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"SessionManager.js","sourceRoot":"","sources":["../../src/manager/SessionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,6 @@ export default class UserManager extends DFWModule {
|
|
|
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>;
|
|
13
|
-
|
|
13
|
+
assignCredentialAsync(user: number | dfw_user, credential: dfw_credential | number | string | any[]): Promise<dfw_credential[]>;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=UserManager.d.ts.map
|
|
@@ -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,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,
|
|
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,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,EAAE,UAAU,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAI/I"}
|
|
@@ -53,47 +53,9 @@ class UserManager extends DFWModule_1.default {
|
|
|
53
53
|
return this.db.dfw_access.create({ data: { name, description } });
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
-
|
|
56
|
+
assignCredentialAsync(user, credential) {
|
|
57
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
|
|
59
|
-
let result = yield Promise.all(credential.map((credentialObj) => this.addCredentialAsync(user, credentialObj)));
|
|
60
|
-
return result.flat(1);
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
let idCredential;
|
|
64
|
-
if (typeof credential == "number") {
|
|
65
|
-
idCredential = credential;
|
|
66
|
-
}
|
|
67
|
-
else if (typeof credential == "string") {
|
|
68
|
-
let credentialObj = (yield this.db.dfw_credential.findFirst({ where: { name: credential } }));
|
|
69
|
-
if (credentialObj) {
|
|
70
|
-
idCredential = credentialObj.id;
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
return [];
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
idCredential = credential.id;
|
|
78
|
-
}
|
|
79
|
-
let newCredential = yield this.db.dfw_credential.update({
|
|
80
|
-
data: {
|
|
81
|
-
users: {
|
|
82
|
-
create: {
|
|
83
|
-
user: {
|
|
84
|
-
connect: {
|
|
85
|
-
id: user.id
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
},
|
|
91
|
-
where: {
|
|
92
|
-
id: idCredential
|
|
93
|
-
}
|
|
94
|
-
}).catch((e) => []);
|
|
95
|
-
return Array.isArray(newCredential) ? newCredential : [newCredential];
|
|
96
|
-
}
|
|
58
|
+
return this.instance.SecurityManager.use(this.db).addCredentialToAsync(user, credential);
|
|
97
59
|
});
|
|
98
60
|
}
|
|
99
61
|
}
|
|
@@ -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,QAAiB;;YACvE,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC3B,IAAI,EAAE;oBACF,IAAI;oBACJ,KAAK;oBACL,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,yBAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;iBAC/E;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;IAEY,YAAY,CAAC,SAAiB;;YACvC,IAAI,kBAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBAC7B,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;aAC5E;iBAAM;gBACH,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;aAC3E;QACL,CAAC;KAAA;IAEY,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,
|
|
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,QAAiB;;YACvE,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC3B,IAAI,EAAE;oBACF,IAAI;oBACJ,KAAK;oBACL,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,yBAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;iBAC/E;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;IAEY,YAAY,CAAC,SAAiB;;YACvC,IAAI,kBAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBAC7B,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;aAC5E;iBAAM;gBACH,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;aAC3E;QACL,CAAC;KAAA;IAEY,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,qBAAqB,CAAC,IAAuB,EAAE,UAAoD;;YAC5G,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC7F,CAAC;KAAA;CAEJ;AAxCD,8BAwCC"}
|
package/lib/test.js
CHANGED
|
@@ -10,7 +10,17 @@ 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
|
+
session: {
|
|
15
|
+
cookieOptions: {
|
|
16
|
+
sameSite: "lax",
|
|
17
|
+
secure: false,
|
|
18
|
+
httpOnly: true,
|
|
19
|
+
domain: "localhost",
|
|
20
|
+
maxAge: 60 * 1000 * 60 * 24 * 365 // 365 days
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
});
|
|
14
24
|
//DFW.DatabaseManager.database.sync();
|
|
15
25
|
DFW.APIManager.startServer(300);
|
|
16
26
|
DFW.APIManager.addListener("/", (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -43,7 +53,7 @@ DFW.APIManager.addListener("/error", (req, res, dfw) => __awaiter(void 0, void 0
|
|
|
43
53
|
let t1 = performance.now();
|
|
44
54
|
yield dfw.UserManager.use(db).createCredentiaASync("DUMMY-1");
|
|
45
55
|
console.log(performance.now() - t1);
|
|
46
|
-
throw new Error("
|
|
56
|
+
throw new Error("ERROR");
|
|
47
57
|
yield dfw.UserManager.use(db).createCredentiaASync("DUMMY-2");
|
|
48
58
|
yield dfw.UserManager.use(db).createCredentiaASync("DUMMY-2");
|
|
49
59
|
})).catch((e) => {
|
|
@@ -55,7 +65,7 @@ DFW.APIManager.addListener("/strap", ({ dfw }, res) => __awaiter(void 0, void 0,
|
|
|
55
65
|
let newUser = yield dfw.UserManager.createUserAsync("aldodelacomarca@gmail.com", "zerozelta", "Aldo1234");
|
|
56
66
|
let newCredential = yield dfw.SecurityManager.createCredentialAsync("ADMIN");
|
|
57
67
|
let user = yield dfw.db.dfw_user.findUnique({ where: { id: 1 } });
|
|
58
|
-
let credential = yield dfw.UserManager.
|
|
68
|
+
let credential = yield dfw.UserManager.assignCredentialAsync(user, ["ADMIN", "TESTER"]);
|
|
59
69
|
return { credential };
|
|
60
70
|
}));
|
|
61
71
|
//# sourceMappingURL=test.js.map
|
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;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RequestHandler } from "express";
|
|
2
|
+
import fileUpload from "express-fileupload";
|
|
2
3
|
import { APIMethods } from "../manager/APIManager";
|
|
3
4
|
import { DFWRequest } from "./DFWRequestScheme";
|
|
4
5
|
export declare type APIListenerConfig = {
|
|
@@ -22,8 +23,9 @@ export declare type APIListenerConfig = {
|
|
|
22
23
|
parseBody?: boolean;
|
|
23
24
|
/**
|
|
24
25
|
* allow/disallow to upload files
|
|
26
|
+
* @default false
|
|
25
27
|
*/
|
|
26
|
-
upload?:
|
|
28
|
+
upload?: true | fileUpload.Options;
|
|
27
29
|
/**
|
|
28
30
|
* Disable the autosend system, allows you to specify what send to the clien and when
|
|
29
31
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIListenerConfig.d.ts","sourceRoot":"","sources":["../../src/types/APIListenerConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,oBAAY,iBAAiB,GAAG;IAC5B;;OAEG;IACF,MAAM,CAAC,EAAC,UAAU,CAAC;IAEnB;;OAEG;IACH,UAAU,CAAC,EAAC,cAAc,GAAC,cAAc,EAAE,CAAC;IAE5C;;OAEG;IACH,QAAQ,CAAC,EAAC,sBAAsB,CAAC;IAEjC;;;;OAIG;IACH,SAAS,CAAC,EAAC,OAAO,CAAC;IAEnB
|
|
1
|
+
{"version":3,"file":"APIListenerConfig.d.ts","sourceRoot":"","sources":["../../src/types/APIListenerConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,oBAAY,iBAAiB,GAAG;IAC5B;;OAEG;IACF,MAAM,CAAC,EAAC,UAAU,CAAC;IAEnB;;OAEG;IACH,UAAU,CAAC,EAAC,cAAc,GAAC,cAAc,EAAE,CAAC;IAE5C;;OAEG;IACH,QAAQ,CAAC,EAAC,sBAAsB,CAAC;IAEjC;;;;OAIG;IACH,SAAS,CAAC,EAAC,OAAO,CAAC;IAEnB;;;OAGG;IACH,MAAM,CAAC,EAAC,IAAI,GAAC,UAAU,CAAC,OAAO,CAAC;IAEhC;;OAEG;IACH,QAAQ,CAAC,EAAC,OAAO,CAAC;IAElB;;OAEG;IACH,QAAQ,CAAC,EAAC,CAAC,GAAG,EAAC,UAAU,EAAC,WAAW,EAAC,GAAG,KAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7D,CAAA;AAGD,MAAM,WAAW,sBAAsB;IACnC,OAAO,CAAC,EAAC,OAAO,CAAC;IACjB,UAAU,CAAC,EAAC;QACR,IAAI,CAAC,EAAC,MAAM,EAAE,CAAC;QACf,KAAK,CAAC,EAAC,MAAM,EAAE,CAAC;KACnB,CAAA;IACD,QAAQ,CAAC,EAAC,CAAC,MAAM,EAAC,GAAG,CAAC,EAAE,CAAC;IACzB,WAAW,CAAC,EAAC,MAAM,EAAE,GAAC,MAAM,EAAE,CAAC;IAC/B,MAAM,CAAC,EAAC,MAAM,EAAE,GAAC,MAAM,EAAE,CAAC;CAC7B"}
|