chyz 2.0.0-rc.43 → 2.0.0-rc.44
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/BaseChyz.d.ts +4 -4
- package/BaseChyz.d.ts.map +1 -1
- package/BaseChyz.js +103 -100
- package/README.md +1 -1
- package/base/BaseError.d.ts +1 -1
- package/base/BaseError.d.ts.map +1 -1
- package/base/Model.d.ts +1 -1
- package/base/Model.d.ts.map +1 -1
- package/filters/AccessControl.d.ts +1 -1
- package/filters/AccessControl.d.ts.map +1 -1
- package/filters/AccessControl.js +4 -4
- package/filters/AccessRule.d.ts +4 -4
- package/filters/AccessRule.d.ts.map +1 -1
- package/filters/AccessRule.js +7 -7
- package/filters/auth/AuthMethod.d.ts +4 -4
- package/filters/auth/AuthMethod.d.ts.map +1 -1
- package/filters/auth/AuthMethod.js +5 -5
- package/filters/auth/HttpBearerAuth.d.ts +1 -1
- package/filters/auth/HttpBearerAuth.d.ts.map +1 -1
- package/filters/auth/HttpBearerAuth.js +1 -0
- package/filters/auth/JwtHttpBearerAuth.js +2 -2
- package/index.d.ts +1 -1
- package/index.js +1 -1
- package/package.json +1 -1
- package/rbac/AuthManager.d.ts.map +1 -1
- package/rbac/AuthManager.js +1 -2
- package/requiments/ReflectUtil.js +2 -2
- package/requiments/Utils.js +3 -3
package/BaseChyz.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logs } from "./base
|
|
1
|
+
import { Logs } from "./base";
|
|
2
2
|
export default class BaseChyz {
|
|
3
3
|
private config;
|
|
4
4
|
static httpServer: any;
|
|
@@ -21,7 +21,7 @@ export default class BaseChyz {
|
|
|
21
21
|
/**
|
|
22
22
|
*
|
|
23
23
|
*/
|
|
24
|
-
init(): void
|
|
24
|
+
init(): Promise<void>;
|
|
25
25
|
/**
|
|
26
26
|
* Listen port number
|
|
27
27
|
* Server port number get
|
|
@@ -35,7 +35,7 @@ export default class BaseChyz {
|
|
|
35
35
|
set port(value: number);
|
|
36
36
|
static get validate(): any;
|
|
37
37
|
static set validate(value: any);
|
|
38
|
-
app(config?: any): BaseChyz
|
|
38
|
+
app(config?: any): Promise<BaseChyz>;
|
|
39
39
|
static trace(...args: any[]): void;
|
|
40
40
|
static debug(...args: any[]): void;
|
|
41
41
|
static info(...args: any[]): void;
|
|
@@ -52,7 +52,7 @@ export default class BaseChyz {
|
|
|
52
52
|
/**
|
|
53
53
|
* load model
|
|
54
54
|
*/
|
|
55
|
-
loadModels():
|
|
55
|
+
loadModels(): void;
|
|
56
56
|
/**
|
|
57
57
|
* load contoller
|
|
58
58
|
*/
|
package/BaseChyz.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseChyz.d.ts","sourceRoot":"","sources":["../src/BaseChyz.ts"],"names":[],"mappings":"AAcA,OAAO,EAAC,IAAI,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"BaseChyz.d.ts","sourceRoot":"","sources":["../src/BaseChyz.ts"],"names":[],"mappings":"AAcA,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAkH5B,MAAM,CAAC,OAAO,OAAO,QAAQ;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,SAAS,EAAE,GAAG,CAAS;IAC9B,OAAO,CAAC,KAAK,CAAgB;IAC7B,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,IAAI,EAAE,GAAG,CAAS;IACzB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACnB,MAAM,CAAC,IAAI,EAAE,IAAI,CAAe;IAChC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAiB;IACzC,OAAO,CAAC,eAAe,CAAwB;IAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAA4B;IACtD,OAAc,UAAU,EAAE,GAAG,CAAK;IAClC,OAAc,WAAW,EAAE,GAAG,CAAK;IACnC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAU;IAGtC,MAAM,KAAK,YAAY,IAAI,GAAG,CAE7B;IAED,MAAM,KAAK,YAAY,CAAC,KAAK,EAAE,GAAG,EAEjC;IAED,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,EAE/B;IAED;;OAEG;IACG,IAAI;IAmCV;;;OAGG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;OAIG;IACH,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAErB;IAGD,MAAM,KAAK,QAAQ,IAAI,GAAG,CAEzB;IAED,MAAM,KAAK,QAAQ,CAAC,KAAK,EAAE,GAAG,EAE7B;IAEK,GAAG,CAAC,MAAM,GAAE,GAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;WAsEhC,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAInB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAKpB,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAItB,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG;IAanC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAKrD,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAUxD,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;WAQ7C,YAAY,CAAC,GAAG,EAAE,GAAG;WAKrB,cAAc,CAAC,GAAG,EAAE,GAAG;IAIrC;;OAEG;IACD,UAAU;IAyBZ;;OAEG;IACG,cAAc;IA6Eb,UAAU;IAyDV,KAAK;CA2Bf"}
|
package/BaseChyz.js
CHANGED
|
@@ -48,8 +48,8 @@ const fs = require("fs");
|
|
|
48
48
|
*/
|
|
49
49
|
const base_1 = require("./base");
|
|
50
50
|
const Utils_1 = require("./requiments/Utils");
|
|
51
|
-
const
|
|
52
|
-
const
|
|
51
|
+
const base_2 = require("./base");
|
|
52
|
+
const base_3 = require("./base");
|
|
53
53
|
const http_request = require('debug')('http:request');
|
|
54
54
|
const http_request_body = http_request.extend('body');
|
|
55
55
|
const http_request_headers = http_request.extend('headers');
|
|
@@ -135,7 +135,7 @@ validate.extend(validate.validators.datetime, {
|
|
|
135
135
|
},
|
|
136
136
|
// Input is a unix timestamp
|
|
137
137
|
format: function (value, options) {
|
|
138
|
-
|
|
138
|
+
const format = options.dateOnly ? "YYYY-MM-DD" : "YYYY-MM-DD hh:mm:ss";
|
|
139
139
|
return dayjs().utc(value).format(format);
|
|
140
140
|
}
|
|
141
141
|
});
|
|
@@ -160,29 +160,31 @@ class BaseChyz {
|
|
|
160
160
|
*
|
|
161
161
|
*/
|
|
162
162
|
init() {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
163
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
164
|
+
/**
|
|
165
|
+
* server port setting
|
|
166
|
+
*/
|
|
167
|
+
if (this.config.hasOwnProperty("port"))
|
|
168
|
+
this.port = this.config.port;
|
|
169
|
+
/**
|
|
170
|
+
* controller path
|
|
171
|
+
*/
|
|
172
|
+
if (this.config.controllerpath) {
|
|
173
|
+
this.controllerpath = this.config.controllerpath;
|
|
174
|
+
}
|
|
175
|
+
/**
|
|
176
|
+
* Model Register
|
|
177
|
+
*/
|
|
178
|
+
this.loadModels();
|
|
179
|
+
/**
|
|
180
|
+
* Express Server
|
|
181
|
+
*/
|
|
182
|
+
this.middleware();
|
|
183
|
+
/**
|
|
184
|
+
* Load Controller
|
|
185
|
+
*/
|
|
186
|
+
yield this.loadController();
|
|
187
|
+
});
|
|
186
188
|
}
|
|
187
189
|
/**
|
|
188
190
|
* Listen port number
|
|
@@ -207,61 +209,63 @@ class BaseChyz {
|
|
|
207
209
|
}
|
|
208
210
|
app(config = {}) {
|
|
209
211
|
var _a, _b;
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
* Config set
|
|
213
|
-
*/
|
|
214
|
-
this.config = config;
|
|
215
|
-
/**
|
|
216
|
-
* log setting
|
|
217
|
-
*/
|
|
218
|
-
if (this.config.logs instanceof Logs_1.Logs) {
|
|
219
|
-
BaseChyz.logs = this.config.logs;
|
|
220
|
-
}
|
|
221
|
-
else if (!this.config.hasOwnProperty('logs')) {
|
|
222
|
-
BaseChyz.logs = new Logs_1.Logs();
|
|
223
|
-
}
|
|
224
|
-
let components = Utils_1.Utils.findKeyValue(config, "components");
|
|
225
|
-
if (components) {
|
|
212
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
213
|
+
BaseChyz.EventEmitter.emit(base_3.CEvents.ON_INIT_BEFORE, this, config);
|
|
226
214
|
/**
|
|
227
|
-
*
|
|
215
|
+
* Config set
|
|
228
216
|
*/
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
BaseChyz.error("Create Component Error", e);
|
|
239
|
-
}
|
|
217
|
+
this.config = config;
|
|
218
|
+
/**
|
|
219
|
+
* log setting
|
|
220
|
+
*/
|
|
221
|
+
if (this.config.logs instanceof base_2.Logs) {
|
|
222
|
+
BaseChyz.logs = this.config.logs;
|
|
223
|
+
}
|
|
224
|
+
else if (!this.config.hasOwnProperty('logs')) {
|
|
225
|
+
BaseChyz.logs = new base_2.Logs();
|
|
240
226
|
}
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
227
|
+
let components = Utils_1.Utils.findKeyValue(config, "components");
|
|
228
|
+
if (components) {
|
|
229
|
+
/**
|
|
230
|
+
* first initial database component
|
|
231
|
+
*/
|
|
232
|
+
if (components.db) {
|
|
233
|
+
let comp = components['db'];
|
|
234
|
+
BaseChyz.debug("First initial database component ", "db");
|
|
235
|
+
try {
|
|
236
|
+
BaseChyz.components["db"] = Utils_1.Utils.createObject(new comp.class, comp);
|
|
237
|
+
(_a = BaseChyz.components["db"]) === null || _a === void 0 ? void 0 : _a.init();
|
|
238
|
+
delete components.db;
|
|
239
|
+
}
|
|
240
|
+
catch (e) {
|
|
241
|
+
BaseChyz.error("Create Component Error", e);
|
|
242
|
+
}
|
|
247
243
|
}
|
|
248
|
-
|
|
249
|
-
|
|
244
|
+
for (const componentsKey in components) {
|
|
245
|
+
let comp = components[componentsKey];
|
|
246
|
+
BaseChyz.debug("Create Component ", componentsKey);
|
|
247
|
+
try {
|
|
248
|
+
BaseChyz.components[componentsKey] = Utils_1.Utils.createObject(new comp.class, comp);
|
|
249
|
+
(_b = BaseChyz.components[componentsKey]) === null || _b === void 0 ? void 0 : _b.init();
|
|
250
|
+
}
|
|
251
|
+
catch (e) {
|
|
252
|
+
BaseChyz.error("Create Component Error", e);
|
|
253
|
+
}
|
|
250
254
|
}
|
|
251
255
|
}
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
256
|
+
let middlewares = Utils_1.Utils.findKeyValue(config, "middlewares");
|
|
257
|
+
if (middlewares) {
|
|
258
|
+
for (const middlewareKey in middlewares) {
|
|
259
|
+
let middleware1 = middlewares[middlewareKey];
|
|
260
|
+
BaseChyz.debug("Create middlewares ", middlewareKey);
|
|
261
|
+
BaseChyz.middlewares[middlewareKey] = middleware1;
|
|
262
|
+
// BaseChyz.middlewares[middlewareKey] = Utils.createObject(new middleware1.class, middleware1);
|
|
263
|
+
}
|
|
260
264
|
}
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
+
yield this.init();
|
|
266
|
+
BaseChyz.EventEmitter.emit(base_3.CEvents.ON_INIT_AFTER, this, config);
|
|
267
|
+
return this;
|
|
268
|
+
});
|
|
265
269
|
}
|
|
266
270
|
static trace(...args) {
|
|
267
271
|
BaseChyz.logs.fatal(...arguments);
|
|
@@ -324,28 +328,26 @@ class BaseChyz {
|
|
|
324
328
|
* load model
|
|
325
329
|
*/
|
|
326
330
|
loadModels() {
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
models[className.replace("Class", "")] = new model[className];
|
|
337
|
-
}
|
|
338
|
-
});
|
|
339
|
-
/**
|
|
340
|
-
*
|
|
341
|
-
*/
|
|
342
|
-
base_1.ModelManager._register(models);
|
|
343
|
-
for (const key of Object.keys(base_1.ModelManager)) {
|
|
344
|
-
if (key != "_register") {
|
|
345
|
-
base_1.ModelManager[key].init();
|
|
346
|
-
}
|
|
331
|
+
let models = {};
|
|
332
|
+
let path = `${this._controllerpath}/../Models`;
|
|
333
|
+
fs.readdirSync(path).forEach((file) => {
|
|
334
|
+
if (file !== "index.ts") {
|
|
335
|
+
let model = require(`${path}/${file}`);
|
|
336
|
+
// @ts-ignore
|
|
337
|
+
let className = file.split(".")[0] + "Class";
|
|
338
|
+
if (model[className])
|
|
339
|
+
models[className.replace("Class", "")] = new model[className];
|
|
347
340
|
}
|
|
348
341
|
});
|
|
342
|
+
/**
|
|
343
|
+
*
|
|
344
|
+
*/
|
|
345
|
+
base_1.ModelManager._register(models);
|
|
346
|
+
for (const key of Object.keys(base_1.ModelManager)) {
|
|
347
|
+
if (key != "_register") {
|
|
348
|
+
base_1.ModelManager[key].init();
|
|
349
|
+
}
|
|
350
|
+
}
|
|
349
351
|
}
|
|
350
352
|
/**
|
|
351
353
|
* load contoller
|
|
@@ -363,7 +365,7 @@ class BaseChyz {
|
|
|
363
365
|
controller = controller.default;
|
|
364
366
|
}
|
|
365
367
|
else {
|
|
366
|
-
throw new base_1.InvalidConfigException(BaseChyz.t(
|
|
368
|
+
throw new base_1.InvalidConfigException(BaseChyz.t(`Invalid Controller ${file}`));
|
|
367
369
|
}
|
|
368
370
|
// This is our instantiated class
|
|
369
371
|
const instance = new controller();
|
|
@@ -460,6 +462,7 @@ class BaseChyz {
|
|
|
460
462
|
for (const middleware1 of Object.keys(BaseChyz.middlewares)) {
|
|
461
463
|
if ((_a = BaseChyz.middlewares[middleware1]) === null || _a === void 0 ? void 0 : _a.keycloak) {
|
|
462
464
|
let keycloak = BaseChyz.middlewares[middleware1].keycloak;
|
|
465
|
+
//@ts-ignore
|
|
463
466
|
BaseChyz.propvider.use(keycloak.middleware(BaseChyz.middlewares[middleware1].config));
|
|
464
467
|
}
|
|
465
468
|
else {
|
|
@@ -468,12 +471,12 @@ class BaseChyz {
|
|
|
468
471
|
}
|
|
469
472
|
BaseChyz.propvider.use(this.errorResponder);
|
|
470
473
|
BaseChyz.propvider.use(this.errorHandler);
|
|
471
|
-
BaseChyz.EventEmitter.emit(
|
|
474
|
+
BaseChyz.EventEmitter.emit(base_3.CEvents.ON_MIDDLEWARE, this);
|
|
472
475
|
}
|
|
473
476
|
Start() {
|
|
474
477
|
var _a, _b;
|
|
475
478
|
BaseChyz.info("Express Server Starting");
|
|
476
|
-
BaseChyz.EventEmitter.emit(
|
|
479
|
+
BaseChyz.EventEmitter.emit(base_3.CEvents.ON_BEFORE_START, this);
|
|
477
480
|
if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.ssl) {
|
|
478
481
|
BaseChyz.httpServer = (0, https_1.createServer)((_b = this.config) === null || _b === void 0 ? void 0 : _b.ssl, BaseChyz.propvider);
|
|
479
482
|
BaseChyz.httpServer.listen(this._port, () => {
|
|
@@ -481,7 +484,7 @@ class BaseChyz {
|
|
|
481
484
|
BaseChyz.info(`Liten Port ${this._port}`);
|
|
482
485
|
BaseChyz.info(`https://localhost:${this._port}`);
|
|
483
486
|
BaseChyz.info(`https://${ip.address()}:${this._port}`);
|
|
484
|
-
BaseChyz.EventEmitter.emit(
|
|
487
|
+
BaseChyz.EventEmitter.emit(base_3.CEvents.ON_START, this);
|
|
485
488
|
});
|
|
486
489
|
}
|
|
487
490
|
else {
|
|
@@ -491,7 +494,7 @@ class BaseChyz {
|
|
|
491
494
|
BaseChyz.info(`Liten Port ${this._port}`);
|
|
492
495
|
BaseChyz.info(`http://localhost:${this._port}`);
|
|
493
496
|
BaseChyz.info(`http://${ip.address()}:${this._port}`);
|
|
494
|
-
BaseChyz.EventEmitter.emit(
|
|
497
|
+
BaseChyz.EventEmitter.emit(base_3.CEvents.ON_START, this);
|
|
495
498
|
});
|
|
496
499
|
}
|
|
497
500
|
return this;
|
|
@@ -499,7 +502,7 @@ class BaseChyz {
|
|
|
499
502
|
}
|
|
500
503
|
BaseChyz.propvider = Server;
|
|
501
504
|
BaseChyz.date = dayjs;
|
|
502
|
-
BaseChyz.logs = new
|
|
505
|
+
BaseChyz.logs = new base_2.Logs();
|
|
503
506
|
BaseChyz._validate = validate;
|
|
504
507
|
BaseChyz.controllers = [];
|
|
505
508
|
BaseChyz.components = {};
|
package/README.md
CHANGED
package/base/BaseError.d.ts
CHANGED
package/base/BaseError.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseError.d.ts","sourceRoot":"","sources":["../../src/base/BaseError.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,SAAU,SAAQ,KAAK;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,OAAO,CAAU;
|
|
1
|
+
{"version":3,"file":"BaseError.d.ts","sourceRoot":"","sources":["../../src/base/BaseError.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,SAAU,SAAQ,KAAK;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,OAAO,EAAE,GAAG,EAAE,UAAU,SAAM;IAW1C,QAAQ;IAIR,MAAM;;;;;;;;;;;;;;;CAcT"}
|
package/base/Model.d.ts
CHANGED
package/base/Model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/base/Model.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,
|
|
1
|
+
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/base/Model.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,EAIH,KAAK,IAAI,MAAM,EAQlB,MAAM,WAAW,CAAC;AAInB,OAAO,EAAC,SAAS,EAAE,GAAG,EAAC,MAAM,WAAW,CAAC;AAGzC,MAAM,WAAW,QAAQ;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAEnB,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,eAAe,GAAG,WAAW,CAAC;IAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,KAAK,CAAC,EAAE,GAAG,CAAA;CACd;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAEH,qBAAa,KAAM,SAAQ,SAAS;IAChC,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,WAAW,CAAW;IAC9B,OAAO,CAAC,OAAO,CAAU;gBAGb,SAAS,CAAC,EAAE,WAAW;IAmEnC;;;;;OAKG;IACI,KAAK;IAIL,eAAe;IAItB,IAAI,QAAQ,IAAI,GAAG,CAElB;IAED,IAAI,QAAQ,CAAC,KAAK,EAAE,GAAG,EAEtB;IAGD;;OAEG;IACH,IAAI,MAAM,IAAI,GAAG,CAEhB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,EAEpB;IAEM,IAAI;IAqCJ,KAAK;IAIL,SAAS;IAIT,QAAQ;IAIR,KAAK;IAKL,QAAQ,CAAC,KAAK,EAAE,GAAG;IAInB,KAAK;IAKC,IAAI,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAoC9B,UAAU,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAmC1C,MAAM,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAMhC,MAAM,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAMvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmKG;IACU,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,GAA2C;IAMzF;;;OAGG;IACI,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAI7B;;;OAGG;IACI,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAI7B;;;OAGG;IACI,eAAe,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAK9B,QAAQ;IAIf;;;;OAIG;IACI,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAU;IAYpC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAU;IAYxC,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,UAAO;IAazC,UAAU;IAIjB;;;;;OAKG;IACI,SAAS,IAAI,QAAQ,EAAE;CAKjC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="express" />
|
|
2
2
|
import { Request, Response } from "../index";
|
|
3
|
-
import { ActionFilter } from "../base
|
|
3
|
+
import { ActionFilter } from "../base";
|
|
4
4
|
import { WebUser } from "../web/WebUser";
|
|
5
5
|
export declare class AccessControl extends ActionFilter {
|
|
6
6
|
user: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessControl.d.ts","sourceRoot":"","sources":["../../src/filters/AccessControl.ts"],"names":[],"mappings":";AAMA,OAAO,EAAC,OAAO,EAAC,QAAQ,EAAU,MAAM,UAAU,CAAC;AAEnD,OAAO,EAAC,YAAY,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"AccessControl.d.ts","sourceRoot":"","sources":["../../src/filters/AccessControl.ts"],"names":[],"mappings":";AAMA,OAAO,EAAC,OAAO,EAAC,QAAQ,EAAU,MAAM,UAAU,CAAC;AAEnD,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAErC,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAIvC,qBAAa,aAAc,SAAQ,YAAY;IAEpC,IAAI,EAAE,GAAG,CAAQ;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,YAAY,EAAE,GAAG,CAAQ;IAEzB,IAAI;IAgBE,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,EAAC,QAAQ;IAiC7D,UAAU,CAAC,IAAI,EAAE,OAAO;CAMlC"}
|
package/filters/AccessControl.js
CHANGED
|
@@ -17,12 +17,12 @@ exports.AccessControl = void 0;
|
|
|
17
17
|
* Github:https://github.com/cihan53/
|
|
18
18
|
*/
|
|
19
19
|
const index_1 = require("../index");
|
|
20
|
-
const
|
|
21
|
-
const
|
|
20
|
+
const base_1 = require("../base");
|
|
21
|
+
const base_2 = require("../base");
|
|
22
22
|
const AccessRule_1 = require("./AccessRule");
|
|
23
23
|
const WebUser_1 = require("../web/WebUser");
|
|
24
24
|
const Utils_1 = require("../requiments/Utils");
|
|
25
|
-
class AccessControl extends
|
|
25
|
+
class AccessControl extends base_2.ActionFilter {
|
|
26
26
|
constructor() {
|
|
27
27
|
super(...arguments);
|
|
28
28
|
this.user = null;
|
|
@@ -77,7 +77,7 @@ class AccessControl extends ActionFilter_1.ActionFilter {
|
|
|
77
77
|
user.loginRequired();
|
|
78
78
|
}
|
|
79
79
|
else
|
|
80
|
-
throw new
|
|
80
|
+
throw new base_1.ForbiddenHttpException(index_1.BaseChyz.t('You are not allowed to perform this action.'));
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
exports.AccessControl = AccessControl;
|
package/filters/AccessRule.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { WebUser } from "../web/WebUser";
|
|
2
|
-
import { Component } from "../base
|
|
2
|
+
import { Component } from "../base";
|
|
3
3
|
import { Request } from "express";
|
|
4
4
|
export declare class AccessRule extends Component {
|
|
5
5
|
/**
|
|
6
|
-
* @var
|
|
6
|
+
* @var allow whether this is an 'allow' rule or 'deny' rule.
|
|
7
7
|
*/
|
|
8
8
|
allow: any;
|
|
9
9
|
/**
|
|
@@ -69,12 +69,12 @@ export declare class AccessRule extends Component {
|
|
|
69
69
|
ips: any;
|
|
70
70
|
allows(action: any, user: WebUser, request: Request): Promise<any>;
|
|
71
71
|
/**
|
|
72
|
-
* @param
|
|
72
|
+
* @param action $action the action
|
|
73
73
|
* @return bool whether the rule applies to the action
|
|
74
74
|
*/
|
|
75
75
|
protected matchAction(action: any): any;
|
|
76
76
|
/**
|
|
77
|
-
* @param
|
|
77
|
+
* @param controller $controller the controller
|
|
78
78
|
* @return bool whether the rule applies to the controller
|
|
79
79
|
*/
|
|
80
80
|
protected matchController(controller: any): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessRule.d.ts","sourceRoot":"","sources":["../../src/filters/AccessRule.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"AccessRule.d.ts","sourceRoot":"","sources":["../../src/filters/AccessRule.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,SAAS,CAAC;AAElC,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIhC,qBAAa,UAAW,SAAQ,SAAS;IAErC;;OAEG;IACI,KAAK,EAAE,GAAG,CAAC;IAClB;;;OAGG;IACI,OAAO,EAAE,GAAG,CAAC;IAEpB;;OAEG;IACI,WAAW,EAAE,GAAG,CAAC;IAExB;;;OAGG;IAEI,KAAK,EAAE,GAAG,CAAC;IAElB;;OAEG;IACI,WAAW,EAAE,GAAG,CAAC;IAExB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACI,UAAU,EAAE,GAAG,CAAM;IAG5B;;;;;;;OAOG;IACI,GAAG,EAAE,GAAG,CAAC;IAGH,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO;IAoBhE;;;OAGG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG;IAIjC;;;OAGG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,GAAG;cAezB,SAAS,CAAC,IAAI,EAAE,OAAO;CA6C1C"}
|
package/filters/AccessRule.js
CHANGED
|
@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.AccessRule = void 0;
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const base_1 = require("../base");
|
|
14
|
+
const base_2 = require("../base");
|
|
15
15
|
const Utils_1 = require("../requiments/Utils");
|
|
16
|
-
class AccessRule extends
|
|
16
|
+
class AccessRule extends base_1.Component {
|
|
17
17
|
constructor() {
|
|
18
18
|
super(...arguments);
|
|
19
19
|
/**
|
|
@@ -70,14 +70,14 @@ class AccessRule extends Component_1.Component {
|
|
|
70
70
|
});
|
|
71
71
|
}
|
|
72
72
|
/**
|
|
73
|
-
* @param
|
|
73
|
+
* @param action $action the action
|
|
74
74
|
* @return bool whether the rule applies to the action
|
|
75
75
|
*/
|
|
76
76
|
matchAction(action) {
|
|
77
77
|
return Utils_1.Utils.isEmpty(this.actions) || this.actions.includes(action.id);
|
|
78
78
|
}
|
|
79
79
|
/**
|
|
80
|
-
* @param
|
|
80
|
+
* @param controller $controller the controller
|
|
81
81
|
* @return bool whether the rule applies to the controller
|
|
82
82
|
*/
|
|
83
83
|
matchController(controller) {
|
|
@@ -103,7 +103,7 @@ class AccessRule extends Component_1.Component {
|
|
|
103
103
|
return true;
|
|
104
104
|
}
|
|
105
105
|
if (!user) {
|
|
106
|
-
throw new
|
|
106
|
+
throw new base_2.InvalidConfigException('The user application component must be available to specify roles in AccessRule.');
|
|
107
107
|
}
|
|
108
108
|
// @ts-ignore
|
|
109
109
|
let roleParams = [];
|
|
@@ -120,7 +120,7 @@ class AccessRule extends Component_1.Component {
|
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
else {
|
|
123
|
-
//
|
|
123
|
+
//role-params
|
|
124
124
|
if (!Utils_1.Utils.isEmpty(this.roleParams)) {
|
|
125
125
|
roleParams = !Utils_1.Utils.isArray(this.roleParams) ? this.roleParams.apply(this) : this.roleParams;
|
|
126
126
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { ActionFilter } from "../../base
|
|
1
|
+
import { ActionFilter } from "../../base";
|
|
2
2
|
import { AuthInterface } from "./AuthInterface";
|
|
3
3
|
import { WebUser } from "../../web/WebUser";
|
|
4
4
|
import { Request, Response } from "express";
|
|
5
5
|
export declare abstract class AuthMethod extends ActionFilter implements AuthInterface {
|
|
6
6
|
/**
|
|
7
|
-
* @var
|
|
7
|
+
* @var user the user object representing the user authentication status. If not set, the `user` application component will be used.
|
|
8
8
|
*/
|
|
9
9
|
user: WebUser | undefined;
|
|
10
10
|
/**
|
|
@@ -30,8 +30,8 @@ export declare abstract class AuthMethod extends ActionFilter implements AuthInt
|
|
|
30
30
|
* @param response
|
|
31
31
|
*/
|
|
32
32
|
authenticate(user: WebUser, request: Request, response: Response): void;
|
|
33
|
-
challenge(response: Response):
|
|
34
|
-
handleFailure(response: Response):
|
|
33
|
+
challenge(response: Response): Response;
|
|
34
|
+
handleFailure(response: Response): Response;
|
|
35
35
|
getHeaderByKey(headers: any, findKey: any): any;
|
|
36
36
|
patternCheck(headerText: any, pattern: RegExp): any;
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthMethod.d.ts","sourceRoot":"","sources":["../../../src/filters/auth/AuthMethod.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,YAAY,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"AuthMethod.d.ts","sourceRoot":"","sources":["../../../src/filters/auth/AuthMethod.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAC,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE1C,8BAAsB,UAAW,SAAQ,YAAa,YAAW,aAAa;IAE1E;;OAEG;IACI,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAEjC;;OAEG;IACI,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAEpC;;OAEG;IACI,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;IAG/B,QAAQ,UAAM;IAErB;;;;;OAKG;IACU,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IAoB3E;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IAKhE,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ;IAKvC,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ;IAI3C,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;IASzC,YAAY,CAAC,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM;CAYhD"}
|
|
@@ -16,10 +16,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.AuthMethod = void 0;
|
|
19
|
-
const
|
|
20
|
-
const
|
|
19
|
+
const base_1 = require("../../base");
|
|
20
|
+
const base_2 = require("../../base");
|
|
21
21
|
const WebUser_1 = require("../../web/WebUser");
|
|
22
|
-
class AuthMethod extends
|
|
22
|
+
class AuthMethod extends base_1.ActionFilter {
|
|
23
23
|
constructor() {
|
|
24
24
|
super(...arguments);
|
|
25
25
|
this.optional = [];
|
|
@@ -33,7 +33,7 @@ class AuthMethod extends ActionFilter_1.ActionFilter {
|
|
|
33
33
|
beforeAction(action, request, response) {
|
|
34
34
|
var _a;
|
|
35
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
36
|
-
let identity =
|
|
36
|
+
let identity = this.authenticate((_a = this.user) !== null && _a !== void 0 ? _a : new WebUser_1.WebUser(), request, response);
|
|
37
37
|
// @ts-ignore
|
|
38
38
|
request.identity = identity;
|
|
39
39
|
if (identity !== null) {
|
|
@@ -57,7 +57,7 @@ class AuthMethod extends ActionFilter_1.ActionFilter {
|
|
|
57
57
|
}
|
|
58
58
|
// @ts-ignore
|
|
59
59
|
handleFailure(response) {
|
|
60
|
-
throw new
|
|
60
|
+
throw new base_2.UnauthorizedHttpException('Your request was made with invalid credentials.');
|
|
61
61
|
}
|
|
62
62
|
getHeaderByKey(headers, findKey) {
|
|
63
63
|
let key = Object.keys(headers).find(key => key.toLowerCase() === findKey.toLowerCase());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpBearerAuth.d.ts","sourceRoot":"","sources":["../../../src/filters/auth/HttpBearerAuth.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AAEjC,qBAAa,cAAe,SAAQ,cAAc;IAE9C;;OAEG;IACI,MAAM,SAAmB;IAEzB,OAAO,SAAsB;IACpC;;OAEG;IACI,KAAK,SAAS;IAGrB;;OAEG;IACI,SAAS,CAAC,QAAQ,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"HttpBearerAuth.d.ts","sourceRoot":"","sources":["../../../src/filters/auth/HttpBearerAuth.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AAEjC,qBAAa,cAAe,SAAQ,cAAc;IAE9C;;OAEG;IACI,MAAM,SAAmB;IAEzB,OAAO,SAAsB;IACpC;;OAEG;IACI,KAAK,SAAS;IAGrB;;OAEG;IACI,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAE,QAAQ;CAIhD"}
|
|
@@ -21,7 +21,7 @@ exports.JwtHttpBearerAuth = void 0;
|
|
|
21
21
|
*/
|
|
22
22
|
const BaseChyz_1 = __importDefault(require("../../BaseChyz"));
|
|
23
23
|
const HttpBearerAuth_1 = require("./HttpBearerAuth");
|
|
24
|
-
const
|
|
24
|
+
const base_1 = require("../../base");
|
|
25
25
|
const JsonWebToken = require("jsonwebtoken");
|
|
26
26
|
class JwtHttpBearerAuth extends HttpBearerAuth_1.HttpBearerAuth {
|
|
27
27
|
constructor() {
|
|
@@ -40,7 +40,7 @@ class JwtHttpBearerAuth extends HttpBearerAuth_1.HttpBearerAuth {
|
|
|
40
40
|
var _a;
|
|
41
41
|
super.init();
|
|
42
42
|
if (!this.pattern) {
|
|
43
|
-
throw new
|
|
43
|
+
throw new base_1.InvalidConfigException('You must provide pattern to use to extract the HTTP authentication value!');
|
|
44
44
|
}
|
|
45
45
|
this.user = (_a = BaseChyz_1.default.getComponent("user")) !== null && _a !== void 0 ? _a : null;
|
|
46
46
|
}
|
package/index.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ declare module "express-serve-static-core" {
|
|
|
13
13
|
/**
|
|
14
14
|
*
|
|
15
15
|
*/
|
|
16
|
-
export declare const Chyz_Version = "2.0.0-rc.
|
|
16
|
+
export declare const Chyz_Version = "2.0.0-rc.44";
|
|
17
17
|
declare const Chyz: BaseChyz;
|
|
18
18
|
export { Request, Response, NextFunction } from "./base/CRequest";
|
|
19
19
|
export { RouteDefinition } from "./model/RouteDefinition";
|
package/index.js
CHANGED
|
@@ -41,7 +41,7 @@ String.prototype.tokenReplace = function (obj) {
|
|
|
41
41
|
/**
|
|
42
42
|
*
|
|
43
43
|
*/
|
|
44
|
-
exports.Chyz_Version = "2.0.0-rc.
|
|
44
|
+
exports.Chyz_Version = "2.0.0-rc.44";
|
|
45
45
|
const Chyz = new BaseChyz_1.default();
|
|
46
46
|
var WebUser_1 = require("./web/WebUser");
|
|
47
47
|
Object.defineProperty(exports, "WebUser", { enumerable: true, get: function () { return WebUser_1.WebUser; } });
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthManager.d.ts","sourceRoot":"","sources":["../../src/rbac/AuthManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAuC,MAAM,SAAS,CAAC;AAKxE,UAAU,IAAI;IACV,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAYD,qBAAa,WAAY,SAAQ,SAAS;IACtC,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK;IAC9B,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK;IAEpC,IAAI;IAIJ;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC;IACrB,sBAAsB,EAAE,GAAG,CAAK;IAChC,YAAY,EAAE,GAAG,CAAK;IAGtB;;OAEG;IAEU,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBhG,oBAAoB;IAKb,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B7H;;;OAGG;IACU,OAAO,CAAC,IAAI,EAAE,MAAM;IAOpB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAYrB,cAAc,CAAC,MAAM,EAAE,MAAM;IAyB1C;;;OAGG;IACU,aAAa,CAAC,QAAQ,EAAE,MAAM;IAoB3C;;;OAGG;IACU,oBAAoB,CAAC,QAAQ,EAAE,MAAM;IAuBlD;;;OAGG;IACU,oBAAoB,CAAC,MAAM,EAAE,MAAM;IAYhD;;;OAGG;cACa,0BAA0B,CAAC,MAAM,EAAE,MAAM;cAuBzC,6BAA6B,CAAC,MAAM,EAAE,MAAM;IA4B5D;;;OAGG;IACU,cAAc,CAAC,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"AuthManager.d.ts","sourceRoot":"","sources":["../../src/rbac/AuthManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAuC,MAAM,SAAS,CAAC;AAKxE,UAAU,IAAI;IACV,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAYD,qBAAa,WAAY,SAAQ,SAAS;IACtC,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK;IAC9B,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK;IAEpC,IAAI;IAIJ;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC;IACrB,sBAAsB,EAAE,GAAG,CAAK;IAChC,YAAY,EAAE,GAAG,CAAK;IAGtB;;OAEG;IAEU,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBhG,oBAAoB;IAKb,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B7H;;;OAGG;IACU,OAAO,CAAC,IAAI,EAAE,MAAM;IAOpB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAYrB,cAAc,CAAC,MAAM,EAAE,MAAM;IAyB1C;;;OAGG;IACU,aAAa,CAAC,QAAQ,EAAE,MAAM;IAoB3C;;;OAGG;IACU,oBAAoB,CAAC,QAAQ,EAAE,MAAM;IAuBlD;;;OAGG;IACU,oBAAoB,CAAC,MAAM,EAAE,MAAM;IAYhD;;;OAGG;cACa,0BAA0B,CAAC,MAAM,EAAE,MAAM;cAuBzC,6BAA6B,CAAC,MAAM,EAAE,MAAM;IA4B5D;;;OAGG;IACU,cAAc,CAAC,MAAM,EAAE,MAAM;IAY1C;;;OAGG;IACU,gBAAgB,CAAC,QAAQ,EAAE,MAAM;IAO9C;;OAEG;IACU,OAAO,CAAC,IAAI,EAAE,MAAM;IAMjC;;OAEG;IACI,QAAQ;IAIf;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG;IAW1E;;;;OAIG;IACI,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAQrD;;OAEG;IACU,cAAc,CAAC,MAAM,EAAE,MAAM;IAkB1C;;;;OAIG;cACa,eAAe;IAU/B;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM;IAItC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,GAAG;CAG9C"}
|
package/rbac/AuthManager.js
CHANGED
|
@@ -234,7 +234,7 @@ class AuthManager extends base_1.Component {
|
|
|
234
234
|
*/
|
|
235
235
|
getItemsByUser(userId) {
|
|
236
236
|
return __awaiter(this, void 0, void 0, function* () {
|
|
237
|
-
|
|
237
|
+
return yield base_1.ModelManager.AuthAssignment.findAll({
|
|
238
238
|
where: {
|
|
239
239
|
user_id: userId.toString()
|
|
240
240
|
},
|
|
@@ -242,7 +242,6 @@ class AuthManager extends base_1.Component {
|
|
|
242
242
|
model: base_1.ModelManager.AuthItem.model()
|
|
243
243
|
}]
|
|
244
244
|
});
|
|
245
|
-
return items;
|
|
246
245
|
});
|
|
247
246
|
}
|
|
248
247
|
/**
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
*/
|
|
14
14
|
// @ts-ignore
|
|
15
15
|
Reflect.newInstance = function (strClass) {
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
const args = Array.prototype.slice.call(arguments, 1);
|
|
17
|
+
const clsClass = eval(strClass);
|
|
18
18
|
const F = () => {
|
|
19
19
|
return clsClass.apply(this, args);
|
|
20
20
|
};
|
package/requiments/Utils.js
CHANGED
|
@@ -15,7 +15,7 @@ const _ = require('lodash');
|
|
|
15
15
|
* @param val
|
|
16
16
|
* @param top
|
|
17
17
|
*/
|
|
18
|
-
|
|
18
|
+
const buildParams = function (prefix, val, top) {
|
|
19
19
|
if (_.isUndefined(top))
|
|
20
20
|
top = true;
|
|
21
21
|
if (_.isArray(val)) {
|
|
@@ -73,7 +73,7 @@ const findKeyValue = (object, findKey) => {
|
|
|
73
73
|
* @param seconds
|
|
74
74
|
*/
|
|
75
75
|
const sleep = (seconds = 1) => {
|
|
76
|
-
|
|
76
|
+
const waitTill = new Date(new Date().getTime() + seconds * 1000);
|
|
77
77
|
while (waitTill > new Date()) {
|
|
78
78
|
}
|
|
79
79
|
};
|
|
@@ -102,7 +102,7 @@ const matchWildcard = (pattern, string, options = {}) => {
|
|
|
102
102
|
* @param randomString
|
|
103
103
|
*/
|
|
104
104
|
const generateRandomString = function (length, randomString = "") {
|
|
105
|
-
randomString += Math.random().toString(20).
|
|
105
|
+
randomString += Math.random().toString(20).substring(2, length);
|
|
106
106
|
if (randomString.length > length)
|
|
107
107
|
return randomString.slice(0, length);
|
|
108
108
|
return generateRandomString(length, randomString);
|