itrm-tools 1.0.2 → 1.0.3

package/dist/api/check/CheckableAPIRequest.d.ts

@@ -3,8 +3,11 @@ import { APIRequest, APIRequestConfig, RequestMethod } from "../APIRequest";
 import { APIChecker, APICheckResult } from "./APIChecker";
 export declare abstract class CheckableAPIRequest extends APIRequest {
     private checkers;
-    constructor(method: RequestMethod, config: APIRequestConfig, checkers: APIChecker[]);
+    constructor(method: RequestMethod, config: APIRequestConfig);
+    addChecker(checker: APIChecker): void;
     check(req: Request, res: Response, next: NextFunction): Promise<void | Response<any, Record<string, any>>>;
-    applyChecks(request: CheckableAPIRequest, req: Request): Promise<APICheckResult>;
-    abstract getCheckConfiguration(): any;
+    private reject;
+    protected applyChecks(req: Request): Promise<APICheckResult>;
+    private applyCheck;
+    protected abstract getCheckConfiguration(): any;
 }

package/dist/api/check/CheckableAPIRequest.js

@@ -13,41 +13,51 @@ exports.CheckableAPIRequest = void 0;
 const APIRequest_1 = require("../APIRequest");
 const APIService_1 = require("../APIService");
 class CheckableAPIRequest extends APIRequest_1.APIRequest {
-    constructor(method, config, checkers) {
+    constructor(method, config) {
         super(method, config);
-        this.checkers = checkers;
+        this.checkers = [];
+    }
+    addChecker(checker) {
+        this.checkers.push(checker);
     }
     check(req, res, next) {
         return __awaiter(this, void 0, void 0, function* () {
             let request = APIService_1.ITRMAPIServiceGlobal.requests[req.method + "_" + req.route.path];
-            let result = yield request.applyChecks(request, req);
+            let result = yield request.applyChecks(req);
             if (result.approved)
-                return next();
-            if (result.rejection)
-                return res.status(result.rejection.code).json(result.rejection.payload);
-            return res.status(401).json({ message: 'Unknown reason' });
+                return yield next();
+            return yield request.reject(res, result);
         });
     }
-    applyChecks(request, req) {
+    reject(res, result) {
+        if (result.rejection)
+            return res.status(result.rejection.code).json(result.rejection.payload);
+        return res.status(401).json({ message: 'Unknown reason' });
+    }
+    applyChecks(req) {
         return __awaiter(this, void 0, void 0, function* () {
-            let config = request.getCheckConfiguration();
-            for (let checker of request.checkers)
-                if (checker.isValidConfiguration(config)) {
-                    let result = yield checker.apply(config, req);
-                    if (!result.approved)
-                        return result;
-                }
-                else
-                    return {
-                        approved: false,
-                        rejection: {
-                            code: 500,
-                            payload: { message: 'Invalid check configuration' }
-                        }
-                    };
+            for (let checker of this.checkers) {
+                let result = yield this.applyCheck(checker, req);
+                if (!result.approved)
+                    return result;
+            }
             return { approved: true };
         });
     }
+    applyCheck(checker, req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let config = this.getCheckConfiguration();
+            if (checker.isValidConfiguration(config))
+                return yield checker.apply(config, req);
+            return {
+                approved: false,
+                rejection: {
+                    code: 500,
+                    payload: { message: 'Invalid check configuration' }
+                }
+            };
+        });
+    }
 }
 exports.CheckableAPIRequest = CheckableAPIRequest;
 //# sourceMappingURL=CheckableAPIRequest.js.map

package/dist/api/check/CheckableAPIRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CheckableAPIRequest.js","sourceRoot":"","sources":["../../../src/api/check/CheckableAPIRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,8CAA4E;AAC5E,8CAAqD;AAGrD,MAAsB,mBAAoB,SAAQ,uBAAU;IAGxD,YAAY,MAAqB,EAAE,MAAwB,EAAE,QAAsB;QAC/E,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAEY,KAAK,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;;YAC9D,IAAI,OAAO,GAAwB,iCAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpG,IAAI,MAAM,GAAmB,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YACpE,IAAI,MAAM,CAAC,QAAQ;gBACf,OAAO,IAAI,EAAE,CAAC;YAClB,IAAI,MAAM,CAAC,SAAS;gBAChB,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC5E,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC/D,CAAC;KAAA;IAEY,WAAW,CAAC,OAA4B,EAAE,GAAY;;YAC/D,IAAI,MAAM,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAC7C,KAAK,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ;gBAChC,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE;oBACtC,IAAI,MAAM,GAAmB,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;oBAC9D,IAAI,CAAC,MAAM,CAAC,QAAQ;wBAChB,OAAO,MAAM,CAAC;iBACrB;;oBACG,OAAO;wBACH,QAAQ,EAAE,KAAK;wBACf,SAAS,EAAE;4BACP,IAAI,EAAE,GAAG;4BACT,OAAO,EAAE,EAAE,OAAO,EAAE,6BAA6B,EAAE;yBACtD;qBACJ,CAAC;YACV,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC9B,CAAC;KAAA;CAGJ;AArCD,kDAqCC"}
+{"version":3,"file":"CheckableAPIRequest.js","sourceRoot":"","sources":["../../../src/api/check/CheckableAPIRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,8CAA4E;AAC5E,8CAAqD;AAGrD,MAAsB,mBAAoB,SAAQ,uBAAU;IAGxD,YAAY,MAAqB,EAAE,MAAwB;QACvD,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAHlB,aAAQ,GAAiB,EAAE,CAAC;IAIpC,CAAC;IAEM,UAAU,CAAC,OAAmB;QACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAEY,KAAK,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;;YAC9D,IAAI,OAAO,GAAwB,iCAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpG,IAAI,MAAM,GAAmB,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YAC3D,IAAI,MAAM,CAAC,QAAQ;gBACf,OAAO,MAAM,IAAI,EAAE,CAAC;YACxB,OAAO,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7C,CAAC;KAAA;IAEO,MAAM,CAAC,GAAa,EAAE,MAAsB;QAChD,IAAI,MAAM,CAAC,SAAS;YAChB,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC5E,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC/D,CAAC;IAEe,WAAW,CAAC,GAAY;;YACpC,KAAK,IAAI,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC/B,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBACjD,IAAI,CAAC,MAAM,CAAC,QAAQ;oBAChB,OAAO,MAAM,CAAC;aACrB;YACD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC9B,CAAC;KAAA;IAEa,UAAU,CAAC,OAAmB,EAAE,GAAY;;YACtD,IAAI,MAAM,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC1C,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC;gBACpC,OAAO,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC5C,OAAO;gBACH,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE;oBACP,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,EAAE,OAAO,EAAE,6BAA6B,EAAE;iBACtD;aACJ,CAAC;QACN,CAAC;KAAA;CAGJ;AAhDD,kDAgDC"}

package/dist/api/check/request/CheckableDeleteRequest.d.ts

@@ -1,8 +1,7 @@
 import { Express } from "express";
 import { APIRequestConfig } from "../../APIRequest";
-import { APIChecker } from "../APIChecker";
 import { CheckableAPIRequest } from "../CheckableAPIRequest";
 export declare abstract class CheckableDeleteRequest extends CheckableAPIRequest {
-    constructor(config: APIRequestConfig, checkers: APIChecker[]);
+    constructor(config: APIRequestConfig);
     init(app: Express): void;
 }

package/dist/api/check/request/CheckableDeleteRequest.js

@@ -4,8 +4,8 @@ exports.CheckableDeleteRequest = void 0;
 const APIRequest_1 = require("../../APIRequest");
 const CheckableAPIRequest_1 = require("../CheckableAPIRequest");
 class CheckableDeleteRequest extends CheckableAPIRequest_1.CheckableAPIRequest {
-    constructor(config, checkers) {
-        super(APIRequest_1.RequestMethod.DELETE, config, checkers);
+    constructor(config) {
+        super(APIRequest_1.RequestMethod.DELETE, config);
     }
     init(app) {
         app.delete(this.path, this.check, this.process);

package/dist/api/check/request/CheckableDeleteRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CheckableDeleteRequest.js","sourceRoot":"","sources":["../../../../src/api/check/request/CheckableDeleteRequest.ts"],"names":[],"mappings":";;;AACA,iDAAmE;AAEnE,gEAA6D;AAE7D,MAAsB,sBAAuB,SAAQ,yCAAmB;IACpE,YAAY,MAAwB,EAAE,QAAsB;QACxD,KAAK,CAAC,0BAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;IAEM,IAAI,CAAC,GAAY;QACpB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;CACJ;AARD,wDAQC"}
+{"version":3,"file":"CheckableDeleteRequest.js","sourceRoot":"","sources":["../../../../src/api/check/request/CheckableDeleteRequest.ts"],"names":[],"mappings":";;;AACA,iDAAmE;AACnE,gEAA6D;AAE7D,MAAsB,sBAAuB,SAAQ,yCAAmB;IACpE,YAAY,MAAwB;QAChC,KAAK,CAAC,0BAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAEM,IAAI,CAAC,GAAY;QACpB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;CACJ;AARD,wDAQC"}

package/dist/api/check/request/CheckableGetRequest.d.ts

@@ -1,8 +1,7 @@
 import { Express } from "express";
 import { APIRequestConfig } from "../../APIRequest";
-import { APIChecker } from "../APIChecker";
 import { CheckableAPIRequest } from "../CheckableAPIRequest";
 export declare abstract class CheckableGetRequest extends CheckableAPIRequest {
-    constructor(config: APIRequestConfig, checkers: APIChecker[]);
+    constructor(config: APIRequestConfig);
     init(app: Express): void;
 }

package/dist/api/check/request/CheckableGetRequest.js

@@ -4,8 +4,8 @@ exports.CheckableGetRequest = void 0;
 const APIRequest_1 = require("../../APIRequest");
 const CheckableAPIRequest_1 = require("../CheckableAPIRequest");
 class CheckableGetRequest extends CheckableAPIRequest_1.CheckableAPIRequest {
-    constructor(config, checkers) {
-        super(APIRequest_1.RequestMethod.GET, config, checkers);
+    constructor(config) {
+        super(APIRequest_1.RequestMethod.GET, config);
     }
     init(app) {
         app.get(this.path, this.check, this.process);

package/dist/api/check/request/CheckableGetRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CheckableGetRequest.js","sourceRoot":"","sources":["../../../../src/api/check/request/CheckableGetRequest.ts"],"names":[],"mappings":";;;AACA,iDAAmE;AAEnE,gEAA6D;AAE7D,MAAsB,mBAAoB,SAAQ,yCAAmB;IACjE,YAAY,MAAwB,EAAE,QAAsB;QACxD,KAAK,CAAC,0BAAa,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAEM,IAAI,CAAC,GAAY;QACpB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ;AARD,kDAQC"}
+{"version":3,"file":"CheckableGetRequest.js","sourceRoot":"","sources":["../../../../src/api/check/request/CheckableGetRequest.ts"],"names":[],"mappings":";;;AACA,iDAAmE;AACnE,gEAA6D;AAE7D,MAAsB,mBAAoB,SAAQ,yCAAmB;IACjE,YAAY,MAAwB;QAChC,KAAK,CAAC,0BAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IAEM,IAAI,CAAC,GAAY;QACpB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ;AARD,kDAQC"}

package/dist/api/check/request/CheckablePostRequest.d.ts

@@ -1,8 +1,7 @@
 import { Express } from "express";
 import { APIRequestConfig } from "../../APIRequest";
-import { APIChecker } from "../APIChecker";
 import { CheckableAPIRequest } from "../CheckableAPIRequest";
 export declare abstract class CheckablePostRequest extends CheckableAPIRequest {
-    constructor(config: APIRequestConfig, checkers: APIChecker[]);
+    constructor(config: APIRequestConfig);
     init(app: Express): void;
 }

package/dist/api/check/request/CheckablePostRequest.js

@@ -4,8 +4,8 @@ exports.CheckablePostRequest = void 0;
 const APIRequest_1 = require("../../APIRequest");
 const CheckableAPIRequest_1 = require("../CheckableAPIRequest");
 class CheckablePostRequest extends CheckableAPIRequest_1.CheckableAPIRequest {
-    constructor(config, checkers) {
-        super(APIRequest_1.RequestMethod.POST, config, checkers);
+    constructor(config) {
+        super(APIRequest_1.RequestMethod.POST, config);
     }
     init(app) {
         app.post(this.path, this.check, this.process);

package/dist/api/check/request/CheckablePostRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CheckablePostRequest.js","sourceRoot":"","sources":["../../../../src/api/check/request/CheckablePostRequest.ts"],"names":[],"mappings":";;;AACA,iDAAmE;AAEnE,gEAA6D;AAE7D,MAAsB,oBAAqB,SAAQ,yCAAmB;IAClE,YAAY,MAAwB,EAAE,QAAsB;QACxD,KAAK,CAAC,0BAAa,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAEM,IAAI,CAAC,GAAY;QACpB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ;AARD,oDAQC"}
+{"version":3,"file":"CheckablePostRequest.js","sourceRoot":"","sources":["../../../../src/api/check/request/CheckablePostRequest.ts"],"names":[],"mappings":";;;AACA,iDAAmE;AACnE,gEAA6D;AAE7D,MAAsB,oBAAqB,SAAQ,yCAAmB;IAClE,YAAY,MAAwB;QAChC,KAAK,CAAC,0BAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAEM,IAAI,CAAC,GAAY;QACpB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ;AARD,oDAQC"}

package/dist/api/check/request/CheckablePutRequest.d.ts

@@ -1,8 +1,7 @@
 import { Express } from "express";
 import { APIRequestConfig } from "../../APIRequest";
-import { APIChecker } from "../APIChecker";
 import { CheckableAPIRequest } from "../CheckableAPIRequest";
 export declare abstract class CheckablePutRequest extends CheckableAPIRequest {
-    constructor(config: APIRequestConfig, checkers: APIChecker[]);
+    constructor(config: APIRequestConfig);
     init(app: Express): void;
 }

package/dist/api/check/request/CheckablePutRequest.js

@@ -4,8 +4,8 @@ exports.CheckablePutRequest = void 0;
 const APIRequest_1 = require("../../APIRequest");
 const CheckableAPIRequest_1 = require("../CheckableAPIRequest");
 class CheckablePutRequest extends CheckableAPIRequest_1.CheckableAPIRequest {
-    constructor(config, checkers) {
-        super(APIRequest_1.RequestMethod.PUT, config, checkers);
+    constructor(config) {
+        super(APIRequest_1.RequestMethod.PUT, config);
     }
     init(app) {
         app.put(this.path, this.check, this.process);

package/dist/api/check/request/CheckablePutRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CheckablePutRequest.js","sourceRoot":"","sources":["../../../../src/api/check/request/CheckablePutRequest.ts"],"names":[],"mappings":";;;AACA,iDAAmE;AAEnE,gEAA6D;AAE7D,MAAsB,mBAAoB,SAAQ,yCAAmB;IACjE,YAAY,MAAwB,EAAE,QAAsB;QACxD,KAAK,CAAC,0BAAa,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAEM,IAAI,CAAC,GAAY;QACpB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ;AARD,kDAQC"}
+{"version":3,"file":"CheckablePutRequest.js","sourceRoot":"","sources":["../../../../src/api/check/request/CheckablePutRequest.ts"],"names":[],"mappings":";;;AACA,iDAAmE;AACnE,gEAA6D;AAE7D,MAAsB,mBAAoB,SAAQ,yCAAmB;IACjE,YAAY,MAAwB;QAChC,KAAK,CAAC,0BAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IAEM,IAAI,CAAC,GAAY;QACpB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ;AARD,kDAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itrm-tools",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",