@scefira/dfw 0.2.4 → 0.2.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/DFWUtils.d.ts.map +1 -1
- package/lib/DFWUtils.js.map +1 -1
- package/lib/manager/SecurityManager.d.ts +2 -2
- package/lib/manager/SecurityManager.d.ts.map +1 -1
- package/lib/manager/SecurityManager.js +16 -3
- package/lib/manager/SecurityManager.js.map +1 -1
- package/lib/manager/SessionManager.d.ts.map +1 -1
- package/lib/manager/SessionManager.js +12 -9
- package/lib/manager/SessionManager.js.map +1 -1
- package/lib/manager/UserManager.js +1 -1
- package/lib/manager/UserManager.js.map +1 -1
- package/lib/test.js +6 -2
- package/lib/test.js.map +1 -1
- package/package.json +4 -3
package/lib/DFWUtils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWUtils.d.ts","sourceRoot":"","sources":["../src/DFWUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DFWUtils.d.ts","sourceRoot":"","sources":["../src/DFWUtils.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,OAAO,QAAQ;IAEzB,gBAAuB,WAAW,SAA6J;WAEjL,OAAO,CAAC,KAAK,EAAC,MAAM,GAAE,OAAO;IAI3C;;;OAGG;WACiB,UAAU,CAAC,QAAQ,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAM7D;;;OAGG;WACW,eAAe,CAAC,IAAI,EAAC,MAAM,GAAE,MAAM,GAAC,IAAI;IAKtD;;;OAGG;WACW,oBAAoB,CAAC,QAAQ,EAAC,MAAM,GAAE,MAAM;IAI1D;;OAEG;WACW,uBAAuB,CAAC,GAAG,EAAC,MAAM,GAAE,MAAM;IAYxD;;OAEG;WACW,IAAI,IAAG,MAAM;CAG9B"}
|
package/lib/DFWUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWUtils.js","sourceRoot":"","sources":["../src/DFWUtils.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2CAAoC;
|
|
1
|
+
{"version":3,"file":"DFWUtils.js","sourceRoot":"","sources":["../src/DFWUtils.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2CAAoC;AAEpC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,MAAqB,QAAQ;IAIlB,MAAM,CAAC,OAAO,CAAC,KAAY;QAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;OAGG;IACI,MAAM,CAAO,UAAU,CAAC,QAAe;;YAC1C,MAAM,IAAI,OAAO,CAAC,UAAS,OAAO;gBAChC,UAAU,CAAC,GAAE,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAED;;;OAGG;IACI,MAAM,CAAC,eAAe,CAAC,IAAW;QACrC,IAAI,QAAQ,GAAG,IAAA,mBAAM,EAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;IACtC,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,oBAAoB,CAAC,QAAe;QAC9C,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,uBAAuB,CAAC,GAAU;QAC5C,IAAI,MAAM,GAAG,CAAC,EACV,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAC,MAAM,CAAC,GAAC,CAAC,CAAC,EACzC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAC3C,CAAC,GAAK,IAAI,CAAC,KAAK,CAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAC,GAAG,GAAC,CAAC,CAAC,CAAE,GAAG,GAAG,EACrD,CAAC,GAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACzB,OAAQ,CAAC,CAAC,MAAM,GAAG,GAAG,EAAG;YACtB,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,uBAAuB,CAAE,GAAG,GAAG,MAAM,CAAE,CAAC;SAC3D;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAAA,CAAC;IAEF;;OAEG;IACI,MAAM,CAAC,IAAI;QACd,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC;IACrB,CAAC;;AArDsB,oBAAW,GAAG,yJAAyJ,CAAC;kBAF9K,QAAQ"}
|
|
@@ -26,8 +26,8 @@ export default class SecurityManager extends DFWModule {
|
|
|
26
26
|
* @param securityObject
|
|
27
27
|
*/
|
|
28
28
|
static jsonToBindings(securityObject: ListenerSecurityConfig): [number, any][];
|
|
29
|
-
static verifyPassword(encoded: string, test: string): boolean
|
|
30
|
-
static encryptPassword(password: string): string
|
|
29
|
+
static verifyPassword(encoded: string, test: string): Promise<boolean>;
|
|
30
|
+
static encryptPassword(password: string): Promise<string>;
|
|
31
31
|
/**
|
|
32
32
|
* Check all security bindings from a request
|
|
33
33
|
* @param req
|
|
@@ -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;
|
|
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;AAC5C,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;AAGtE,MAAM,MAAM,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;WAiCjE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAS/D,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQtE;;;;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;IAkCxG,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"}
|
|
@@ -12,8 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const node_php_password_1 = __importDefault(require("node-php-password"));
|
|
16
15
|
const DFWModule_1 = __importDefault(require("./DFWModule"));
|
|
16
|
+
const bcrypt_1 = __importDefault(require("bcrypt"));
|
|
17
17
|
class SecurityManager extends DFWModule_1.default {
|
|
18
18
|
constructor() {
|
|
19
19
|
super(...arguments);
|
|
@@ -53,10 +53,23 @@ class SecurityManager extends DFWModule_1.default {
|
|
|
53
53
|
}
|
|
54
54
|
;
|
|
55
55
|
static verifyPassword(encoded, test) {
|
|
56
|
-
return
|
|
56
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
57
|
+
return bcrypt_1.default
|
|
58
|
+
.compare(test, encoded)
|
|
59
|
+
.catch(err => {
|
|
60
|
+
console.error(err.message);
|
|
61
|
+
return false;
|
|
62
|
+
});
|
|
63
|
+
});
|
|
57
64
|
}
|
|
58
65
|
static encryptPassword(password) {
|
|
59
|
-
return
|
|
66
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
return bcrypt_1.default
|
|
68
|
+
.hash(password, 9).catch(err => {
|
|
69
|
+
console.error(err.message);
|
|
70
|
+
throw "[DFW] ERROR HASHING PASSWORD";
|
|
71
|
+
});
|
|
72
|
+
});
|
|
60
73
|
}
|
|
61
74
|
/**
|
|
62
75
|
* Check all security bindings from a request
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SecurityManager.js","sourceRoot":"","sources":["../../src/manager/SecurityManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
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;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;
|
|
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;IAOrB,UAAU,QAAe,UAAU,OAAO,QAAQ,mBAuDvD;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;IA2C1F;;;;OAIG;IACU,WAAW,CAAC,GAAG,EAAE,UAAU;IAWxC;;;;OAIG;IACI,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAavD;;OAEG;IACU,yBAAyB;CASzC"}
|
|
@@ -19,6 +19,7 @@ const SecurityManager_1 = __importDefault(require("./SecurityManager"));
|
|
|
19
19
|
const DEFAULT_SESSION_EXPIRE_DAYS = 7;
|
|
20
20
|
class SessionManager extends DFWModule_1.default {
|
|
21
21
|
constructor(DFW) {
|
|
22
|
+
var _a, _b, _c, _d;
|
|
22
23
|
super(DFW);
|
|
23
24
|
this.stkFieldName = "stk";
|
|
24
25
|
this.sidFieldName = "sid";
|
|
@@ -31,12 +32,12 @@ class SessionManager extends DFWModule_1.default {
|
|
|
31
32
|
req.dfw.SessionManager = this;
|
|
32
33
|
if (req.dfw.__meta.config.noSession)
|
|
33
34
|
return;
|
|
34
|
-
if (!req.cookies || !req.cookies.
|
|
35
|
+
if (!req.cookies || !req.cookies[this.sidFieldName] || !req.cookies[this.stkFieldName]) {
|
|
35
36
|
req.dfw.session = yield this.regenerateSessionAsync(req);
|
|
36
37
|
}
|
|
37
38
|
else {
|
|
38
39
|
let session = yield this.db.dfw_session.findFirst({
|
|
39
|
-
where: { id: Number(req.cookies.
|
|
40
|
+
where: { id: Number(req.cookies[this.sidFieldName]), token: req.cookies[this.stkFieldName], expire: { gte: new Date() } },
|
|
40
41
|
include: {
|
|
41
42
|
user: {
|
|
42
43
|
include: {
|
|
@@ -60,13 +61,13 @@ class SessionManager extends DFWModule_1.default {
|
|
|
60
61
|
}
|
|
61
62
|
this.setSessionCookies(req, res);
|
|
62
63
|
res.on("finish", () => __awaiter(this, void 0, void 0, function* () {
|
|
63
|
-
var
|
|
64
|
+
var _e, _f;
|
|
64
65
|
if (!req.dfw.__meta.config.noSession) {
|
|
65
|
-
if (req.dfw.session.record.ip !== req.ip || req.dfw.session.record.agent !== ((
|
|
66
|
+
if (req.dfw.session.record.ip !== req.ip || req.dfw.session.record.agent !== ((_e = req.headers['user-agent']) !== null && _e !== void 0 ? _e : "")) {
|
|
66
67
|
yield req.dfw.db.dfw_session.update({
|
|
67
68
|
data: {
|
|
68
69
|
ip: req.ip,
|
|
69
|
-
agent: (
|
|
70
|
+
agent: (_f = req.headers['user-agent']) !== null && _f !== void 0 ? _f : "",
|
|
70
71
|
},
|
|
71
72
|
where: {
|
|
72
73
|
id: Number(req.dfw.session.record.id)
|
|
@@ -77,6 +78,8 @@ class SessionManager extends DFWModule_1.default {
|
|
|
77
78
|
}));
|
|
78
79
|
});
|
|
79
80
|
this.sessionExpirationDays = DFW.config.session && DFW.config.session.daysToExpire ? DFW.config.session.daysToExpire : DEFAULT_SESSION_EXPIRE_DAYS;
|
|
81
|
+
this.sidFieldName = (_b = (_a = DFW.config.session) === null || _a === void 0 ? void 0 : _a.sid) !== null && _b !== void 0 ? _b : this.sidFieldName;
|
|
82
|
+
this.stkFieldName = (_d = (_c = DFW.config.session) === null || _c === void 0 ? void 0 : _c.stk) !== null && _d !== void 0 ? _d : this.stkFieldName;
|
|
80
83
|
}
|
|
81
84
|
/**
|
|
82
85
|
*
|
|
@@ -111,7 +114,7 @@ class SessionManager extends DFWModule_1.default {
|
|
|
111
114
|
// Retrive user with credentials
|
|
112
115
|
let userObj = yield req.dfw.UserManager.getUserAsync(user);
|
|
113
116
|
if (userObj) {
|
|
114
|
-
if (SecurityManager_1.default.verifyPassword(userObj.encodedKey, password)) {
|
|
117
|
+
if (yield SecurityManager_1.default.verifyPassword(userObj.encodedKey, password)) {
|
|
115
118
|
let sessionUpdated = yield this.db.dfw_session.update({
|
|
116
119
|
include: {
|
|
117
120
|
user: {
|
|
@@ -169,13 +172,13 @@ class SessionManager extends DFWModule_1.default {
|
|
|
169
172
|
setSessionCookies(req, res) {
|
|
170
173
|
var _a;
|
|
171
174
|
let cookieOptions = this.instance.config.session ? (_a = this.instance.config.session.cookieOptions) !== null && _a !== void 0 ? _a : {} : {};
|
|
172
|
-
let diffCookies = req.cookies.
|
|
175
|
+
let diffCookies = req.cookies[this.sidFieldName] != req.dfw.session.record.id || req.cookies[this.stkFieldName] != req.dfw.session.record.token;
|
|
173
176
|
if (!diffCookies)
|
|
174
177
|
return; // no diference in cookies prevent reset cookies
|
|
175
178
|
res.cookie(this.sidFieldName, req.dfw.session.record.id, cookieOptions);
|
|
176
179
|
res.cookie(this.stkFieldName, req.dfw.session.record.token, cookieOptions);
|
|
177
|
-
req.cookies.
|
|
178
|
-
req.cookies.
|
|
180
|
+
req.cookies[this.sidFieldName] = req.dfw.session.record.id;
|
|
181
|
+
req.cookies[this.stkFieldName] = req.dfw.session.record.token;
|
|
179
182
|
}
|
|
180
183
|
/**
|
|
181
184
|
* Destroy all sessions that expires 1 day ago
|
|
@@ -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;AAEtC,MAAqB,cAAe,SAAQ,mBAAS;IAMjD,YAAY,GAAgB
|
|
1
|
+
{"version":3,"file":"SessionManager.js","sourceRoot":"","sources":["../../src/manager/SessionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ class UserManager extends DFWModule_1.default {
|
|
|
28
28
|
data: {
|
|
29
29
|
nick,
|
|
30
30
|
email,
|
|
31
|
-
encodedKey: password ? SecurityManager_1.default.encryptPassword(password) : undefined
|
|
31
|
+
encodedKey: password ? yield SecurityManager_1.default.encryptPassword(password) : undefined
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
});
|
|
@@ -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;
|
|
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,MAAM,yBAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;iBACrF;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
|
@@ -12,6 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
const _1 = require(".");
|
|
13
13
|
var DFW = _1.DFWCore.createInstance({
|
|
14
14
|
session: {
|
|
15
|
+
sid: 'test_sid',
|
|
16
|
+
stk: 'test_stk',
|
|
15
17
|
cookieOptions: {
|
|
16
18
|
sameSite: "lax",
|
|
17
19
|
secure: false,
|
|
@@ -27,7 +29,9 @@ DFW.APIManager.addListener("/", (req, res) => __awaiter(void 0, void 0, void 0,
|
|
|
27
29
|
return DFW.FileManager.removeFileAsync(1);
|
|
28
30
|
}));
|
|
29
31
|
DFW.APIManager.addListener("/login", (req, res, dfw) => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
|
-
yield dfw.SessionManager.loginAsync(req, "
|
|
32
|
+
yield dfw.SessionManager.loginAsync(req, "test", "test").catch(() => {
|
|
33
|
+
throw 'ERROR';
|
|
34
|
+
});
|
|
31
35
|
return dfw.boot();
|
|
32
36
|
}));
|
|
33
37
|
DFW.APIManager.addListener("/logout", (req, res, dfw) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -67,7 +71,7 @@ DFW.APIManager.addListener("/error", (req, res, dfw) => __awaiter(void 0, void 0
|
|
|
67
71
|
});
|
|
68
72
|
}));
|
|
69
73
|
DFW.APIManager.addListener("/strap", ({ dfw }, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
70
|
-
let newUser = yield dfw.UserManager.createUserAsync("
|
|
74
|
+
let newUser = yield dfw.UserManager.createUserAsync("test@gmail.com", "test", "test");
|
|
71
75
|
//let newCredential = await dfw.SecurityManager.createCredentialAsync("TESTER");
|
|
72
76
|
let user = yield dfw.db.dfw_user.findUnique({ where: { id: newUser.id } });
|
|
73
77
|
let credential = yield dfw.UserManager.assignCredentialAsync(user, ["ADMIN", "TESTER"]);
|
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,CAAC;IAC7B,OAAO,EAAE;QACL,aAAa,EAAE;YACX,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,WAAW;SAChD;KACJ;CACJ,CAAC,CAAC;AAEH,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,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scefira/dfw",
|
|
3
|
-
"version": "0.2.
|
|
4
|
-
"description": "nodejs
|
|
3
|
+
"version": "0.2.6",
|
|
4
|
+
"description": "nodejs server prototype framework",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
7
7
|
"files": [
|
|
@@ -23,16 +23,17 @@
|
|
|
23
23
|
"luxon": "^2.x"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
+
"bcrypt": "^5.1.1",
|
|
26
27
|
"body-parser": "^1.20.0",
|
|
27
28
|
"cookie-parser": "^1.4.6",
|
|
28
29
|
"express": "^4.18.1",
|
|
29
30
|
"express-fileupload": "^1.4.0",
|
|
30
31
|
"md5-file": "^5.0.0",
|
|
31
32
|
"mime-types": "^2.1.35",
|
|
32
|
-
"node-php-password": "^0.1.2",
|
|
33
33
|
"uuid": "^8.3.2"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
+
"@types/bcrypt": "^5.0.2",
|
|
36
37
|
"@types/body-parser": "^1.19.2",
|
|
37
38
|
"@types/busboy": "^1.3.0",
|
|
38
39
|
"@types/cookie-parser": "^1.4.2",
|