itrm-tools 1.0.17 → 1.0.19
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/dist/api/APIRequest.d.ts +4 -0
- package/dist/api/APIRequest.js +26 -7
- package/dist/api/APIRequest.js.map +1 -1
- package/dist/api/request/RequestAxiosCall.d.ts +5 -4
- package/dist/api/request/RequestAxiosCall.js +8 -8
- package/dist/api/request/RequestAxiosCall.js.map +1 -1
- package/package.json +1 -1
package/dist/api/APIRequest.d.ts
CHANGED
|
@@ -23,6 +23,7 @@ export declare abstract class APIRequest {
|
|
|
23
23
|
method: RequestMethod;
|
|
24
24
|
path: string;
|
|
25
25
|
private params;
|
|
26
|
+
private bodyParams;
|
|
26
27
|
constructor(method: RequestMethod, config: APIRequestConfig);
|
|
27
28
|
abstract addToApp(app: Express): void;
|
|
28
29
|
abstract addToRouter(router: Router): void;
|
|
@@ -30,6 +31,9 @@ export declare abstract class APIRequest {
|
|
|
30
31
|
process(req: Request, res: Response): Promise<any>;
|
|
31
32
|
static buildKey(req: Request): string;
|
|
32
33
|
private checkParameters;
|
|
34
|
+
private checkValuesPropertyParameters;
|
|
35
|
+
private hasValidValuesProperty;
|
|
36
|
+
private checkItem;
|
|
33
37
|
private buildResponseMessage;
|
|
34
38
|
private buildMissingParametersMessage;
|
|
35
39
|
private findMissingParameters;
|
package/dist/api/APIRequest.js
CHANGED
|
@@ -30,6 +30,7 @@ class APIRequest {
|
|
|
30
30
|
this.method = method;
|
|
31
31
|
this.path = config.path;
|
|
32
32
|
this.params = config.params;
|
|
33
|
+
this.bodyParams = config.params.filter(param => { return param.context === RequestContext.BODY; });
|
|
33
34
|
}
|
|
34
35
|
process(req, res) {
|
|
35
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -47,20 +48,38 @@ class APIRequest {
|
|
|
47
48
|
return req.method + "_" + req.baseUrl + req.route.path;
|
|
48
49
|
}
|
|
49
50
|
checkParameters(req) {
|
|
51
|
+
let result = this.checkItem(req, this.params);
|
|
52
|
+
if (this.hasValidValuesProperty(req.body))
|
|
53
|
+
result = this.checkValuesPropertyParameters(req);
|
|
54
|
+
return result;
|
|
55
|
+
}
|
|
56
|
+
checkValuesPropertyParameters(req) {
|
|
50
57
|
let result = {};
|
|
51
|
-
for (let
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
result[
|
|
58
|
+
for (let i = 0; i < req.body.values.length; i++) {
|
|
59
|
+
result = this.checkItem({ body: req.body.values[i] }, this.bodyParams);
|
|
60
|
+
if (result[RequestContext.BODY].status === 'Error') {
|
|
61
|
+
result[RequestContext.BODY].message += ', item ' + (i + 1);
|
|
62
|
+
return result;
|
|
55
63
|
}
|
|
64
|
+
}
|
|
65
|
+
return result;
|
|
66
|
+
}
|
|
67
|
+
hasValidValuesProperty(context) {
|
|
68
|
+
return context && context.values && Array.isArray(context.values);
|
|
69
|
+
}
|
|
70
|
+
checkItem(item, params) {
|
|
71
|
+
let result = {};
|
|
72
|
+
for (let group of params)
|
|
73
|
+
if (item[group.context])
|
|
74
|
+
result[group.context] = this.buildResponseMessage(result[group.context], group, this.findMissingParameters(item[group.context], group.properties));
|
|
56
75
|
else
|
|
57
76
|
return { status: 'Error', message: group.context + " was not found, check your express configuration" };
|
|
58
77
|
return result;
|
|
59
78
|
}
|
|
60
|
-
buildResponseMessage(response,
|
|
79
|
+
buildResponseMessage(response, group, missing) {
|
|
61
80
|
if (missing.length > 0)
|
|
62
|
-
return response ? response : { status: 'Error', message: this.buildMissingParametersMessage(context, missing) };
|
|
63
|
-
return { status: 'OK' };
|
|
81
|
+
return (response && response.blocked) ? response : { status: 'Error', message: this.buildMissingParametersMessage(group.context, missing), blocked: group.properties.length > missing.length };
|
|
82
|
+
return { status: 'OK', blocked: true };
|
|
64
83
|
}
|
|
65
84
|
buildMissingParametersMessage(context, missing) {
|
|
66
85
|
let message = "Parameters";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIRequest.js","sourceRoot":"","sources":["../../src/api/APIRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAAoD;AAEpD,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,4BAAW,CAAA;IACX,8BAAa,CAAA;IACb,4BAAW,CAAA;IACX,kCAAiB,CAAA;AACrB,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB;AAED,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,qCAAmB,CAAA;IACnB,mCAAiB,CAAA;IACjB,iCAAe,CAAA;AACnB,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;AAYD,MAAsB,UAAU;
|
|
1
|
+
{"version":3,"file":"APIRequest.js","sourceRoot":"","sources":["../../src/api/APIRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { AxiosRequestConfig } from "axios";
|
|
1
2
|
export declare class RequestAxiosCall {
|
|
2
|
-
static get(url: string,
|
|
3
|
-
static post(url: string, body: any,
|
|
4
|
-
static put(url: string, body: any,
|
|
5
|
-
static delete(url: string,
|
|
3
|
+
static get(url: string, config?: AxiosRequestConfig<any>): Promise<unknown>;
|
|
4
|
+
static post(url: string, body: any, config?: AxiosRequestConfig): Promise<unknown>;
|
|
5
|
+
static put(url: string, body: any, config?: AxiosRequestConfig): Promise<unknown>;
|
|
6
|
+
static delete(url: string, config?: AxiosRequestConfig): Promise<unknown>;
|
|
6
7
|
}
|
|
@@ -17,37 +17,37 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
17
17
|
const axios_retry_1 = __importDefault(require("axios-retry"));
|
|
18
18
|
(0, axios_retry_1.default)(axios_1.default, { retries: 3 });
|
|
19
19
|
class RequestAxiosCall {
|
|
20
|
-
static get(url,
|
|
20
|
+
static get(url, config) {
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
return new Promise((resolve, reject) => {
|
|
23
|
-
axios_1.default.get(url, { headers:
|
|
23
|
+
axios_1.default.get(url, config !== null && config !== void 0 ? config : { headers: { 'Content-Type': 'application/json' } })
|
|
24
24
|
.then(response => { resolve(response.data); })
|
|
25
25
|
.catch(err => { reject(err); });
|
|
26
26
|
});
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
|
-
static post(url, body,
|
|
29
|
+
static post(url, body, config) {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
return new Promise((resolve, reject) => {
|
|
32
|
-
axios_1.default.post(url, body, { headers:
|
|
32
|
+
axios_1.default.post(url, body, config !== null && config !== void 0 ? config : { headers: { 'Content-Type': 'application/json' } })
|
|
33
33
|
.then(response => { resolve(response.data); })
|
|
34
34
|
.catch(err => { reject(err); });
|
|
35
35
|
});
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
|
-
static put(url, body,
|
|
38
|
+
static put(url, body, config) {
|
|
39
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
40
40
|
return new Promise((resolve, reject) => {
|
|
41
|
-
axios_1.default.put(url, body, { headers:
|
|
41
|
+
axios_1.default.put(url, body, config !== null && config !== void 0 ? config : { headers: { 'Content-Type': 'application/json' } })
|
|
42
42
|
.then(response => { resolve(response.data); })
|
|
43
43
|
.catch(err => { reject(err); });
|
|
44
44
|
});
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
|
-
static delete(url,
|
|
47
|
+
static delete(url, config) {
|
|
48
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
49
|
return new Promise((resolve, reject) => {
|
|
50
|
-
axios_1.default.delete(url, { headers:
|
|
50
|
+
axios_1.default.delete(url, config !== null && config !== void 0 ? config : { headers: { 'Content-Type': 'application/json' } })
|
|
51
51
|
.then(response => { resolve(response.data); })
|
|
52
52
|
.catch(err => { reject(err); });
|
|
53
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestAxiosCall.js","sourceRoot":"","sources":["../../../src/api/request/RequestAxiosCall.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"RequestAxiosCall.js","sourceRoot":"","sources":["../../../src/api/request/RequestAxiosCall.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAkD;AAClD,8DAAqC;AAErC,IAAA,qBAAU,EAAC,eAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;AAElC,MAAa,gBAAgB;IAClB,MAAM,CAAO,GAAG,CAAC,GAAW,EAAE,MAAgC;;YACjE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CAAC;qBAC5E,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA,CAAC,CAAC,CAAC;qBAC5C,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,MAAM,CAAO,IAAI,CAAC,GAAW,EAAE,IAAS,EAAE,MAA2B;;YACxE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,eAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CAAC;qBACnF,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA,CAAC,CAAC,CAAC;qBAC5C,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,MAAM,CAAO,GAAG,CAAC,GAAW,EAAE,IAAS,EAAE,MAA2B;;YACvE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CAAC;qBAClF,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA,CAAC,CAAC,CAAC;qBAC5C,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,MAAM,CAAO,MAAM,CAAC,GAAW,EAAE,MAA2B;;YAC/D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,eAAK,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CAAC;qBAC/E,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA,CAAC,CAAC,CAAC;qBAC5C,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;CACJ;AAhCD,4CAgCC"}
|