@nmshd/consumption 2.0.0-alpha.5 → 2.0.0-alpha.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/dist/buildInformation.js +4 -4
- package/dist/modules/requests/incoming/DecideRequestParametersValidator.d.ts +5 -1
- package/dist/modules/requests/incoming/DecideRequestParametersValidator.js +55 -1
- package/dist/modules/requests/incoming/DecideRequestParametersValidator.js.map +1 -1
- package/dist/modules/requests/incoming/IncomingRequestsController.js +2 -2
- package/dist/modules/requests/incoming/IncomingRequestsController.js.map +1 -1
- package/dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.d.ts +1 -0
- package/dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js +5 -0
- package/dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js.map +1 -1
- package/dist/modules/requests/incoming/decide/DecideRequestItemParameters.d.ts +1 -0
- package/dist/modules/requests/incoming/decide/DecideRequestItemParameters.js +5 -0
- package/dist/modules/requests/incoming/decide/DecideRequestItemParameters.js.map +1 -1
- package/lib-web/nmshd.consumption.js +71 -7
- package/lib-web/nmshd.consumption.js.map +1 -1
- package/lib-web/nmshd.consumption.min.js +1 -1
- package/lib-web/nmshd.consumption.min.js.map +1 -1
- package/package.json +1 -1
package/dist/buildInformation.js
CHANGED
|
@@ -6,10 +6,10 @@ const content_1 = require("@nmshd/content");
|
|
|
6
6
|
const crypto_1 = require("@nmshd/crypto");
|
|
7
7
|
const transport_1 = require("@nmshd/transport");
|
|
8
8
|
exports.buildInformation = {
|
|
9
|
-
version: "2.0.0-alpha.
|
|
10
|
-
build: "
|
|
11
|
-
date: "2022-04-
|
|
12
|
-
commit: "
|
|
9
|
+
version: "2.0.0-alpha.6",
|
|
10
|
+
build: "24",
|
|
11
|
+
date: "2022-04-29T10:52:56+00:00",
|
|
12
|
+
commit: "9c39230181fc6db8e9c6d2bca3d56fcd7fccf3ad",
|
|
13
13
|
dependencies: {},
|
|
14
14
|
libraries: {
|
|
15
15
|
transport: transport_1.buildInformation,
|
|
@@ -2,5 +2,9 @@ import { Result } from "@js-soft/ts-utils";
|
|
|
2
2
|
import { ConsumptionRequest } from "../local/ConsumptionRequest";
|
|
3
3
|
import { InternalDecideRequestParametersJSON } from "./decide/InternalDecideRequestParameters";
|
|
4
4
|
export declare class DecideRequestParametersValidator {
|
|
5
|
-
validate(params: InternalDecideRequestParametersJSON, request: ConsumptionRequest): Result<
|
|
5
|
+
validate(params: InternalDecideRequestParametersJSON, request: ConsumptionRequest): Result<void>;
|
|
6
|
+
private checkItemOrGroup;
|
|
7
|
+
private checkItem;
|
|
8
|
+
private checkItemGroup;
|
|
9
|
+
private invalidNumberOfItemsError;
|
|
6
10
|
}
|
|
@@ -2,13 +2,67 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DecideRequestParametersValidator = void 0;
|
|
4
4
|
const ts_utils_1 = require("@js-soft/ts-utils");
|
|
5
|
+
const content_1 = require("@nmshd/content");
|
|
6
|
+
const transport_1 = require("@nmshd/transport");
|
|
7
|
+
const DecideRequestItemGroupParameters_1 = require("./decide/DecideRequestItemGroupParameters");
|
|
8
|
+
const DecideRequestItemParameters_1 = require("./decide/DecideRequestItemParameters");
|
|
5
9
|
class DecideRequestParametersValidator {
|
|
6
10
|
validate(params, request) {
|
|
11
|
+
if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
|
|
12
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the request does not match the id of the response"));
|
|
13
|
+
}
|
|
7
14
|
if (params.items.length !== request.content.items.length) {
|
|
8
|
-
return ts_utils_1.Result.fail(
|
|
15
|
+
return ts_utils_1.Result.fail(this.invalidNumberOfItemsError("Number of items in Request and Response do not match"));
|
|
16
|
+
}
|
|
17
|
+
for (let i = 0; i < params.items.length; i++) {
|
|
18
|
+
const validationResult = this.checkItemOrGroup(request.content.items[i], params.items[i], i.toString(), params.accept);
|
|
19
|
+
if (validationResult.isError)
|
|
20
|
+
return validationResult;
|
|
21
|
+
}
|
|
22
|
+
return ts_utils_1.Result.ok(undefined);
|
|
23
|
+
}
|
|
24
|
+
checkItemOrGroup(requestItem, responseItem, index, isParentAccepted) {
|
|
25
|
+
if (requestItem instanceof content_1.RequestItem) {
|
|
26
|
+
return this.checkItem(requestItem, responseItem, index, isParentAccepted);
|
|
27
|
+
}
|
|
28
|
+
return this.checkItemGroup(requestItem, responseItem, index, isParentAccepted);
|
|
29
|
+
}
|
|
30
|
+
checkItem(requestItem, response, index, isParentAccepted) {
|
|
31
|
+
if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
|
|
32
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}' was answered as a RequestItemGroup.`));
|
|
33
|
+
}
|
|
34
|
+
if (!isParentAccepted && response.accept) {
|
|
35
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}' was accepted, but the parent was not accepted.`));
|
|
36
|
+
}
|
|
37
|
+
if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
|
|
38
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}', which is flagged as 'mustBeAccepted', was not accepted.`));
|
|
9
39
|
}
|
|
10
40
|
return ts_utils_1.Result.ok(undefined);
|
|
11
41
|
}
|
|
42
|
+
checkItemGroup(requestItemGroup, responseItemGroup, index, isParentAccepted) {
|
|
43
|
+
if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
|
|
44
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}' was answered as a RequestItem.`));
|
|
45
|
+
}
|
|
46
|
+
if (responseItemGroup.items.length !== requestItemGroup.items.length) {
|
|
47
|
+
return ts_utils_1.Result.fail(this.invalidNumberOfItemsError("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
|
|
48
|
+
}
|
|
49
|
+
const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
|
|
50
|
+
if (!isParentAccepted && isGroupAccepted) {
|
|
51
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}' was accepted, but the parent was not accepted.`));
|
|
52
|
+
}
|
|
53
|
+
if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
|
|
54
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}', which is flagged as 'mustBeAccepted', was not accepted. Please accept all 'mustBeAccepted' items in this group.`));
|
|
55
|
+
}
|
|
56
|
+
for (let i = 0; i < responseItemGroup.items.length; i++) {
|
|
57
|
+
const validationResult = this.checkItem(requestItemGroup.items[i], responseItemGroup.items[i], `${index}.${i}`, isGroupAccepted);
|
|
58
|
+
if (validationResult.isError)
|
|
59
|
+
return validationResult;
|
|
60
|
+
}
|
|
61
|
+
return ts_utils_1.Result.ok(undefined);
|
|
62
|
+
}
|
|
63
|
+
invalidNumberOfItemsError(message) {
|
|
64
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
|
|
65
|
+
}
|
|
12
66
|
}
|
|
13
67
|
exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
|
|
14
68
|
//# sourceMappingURL=DecideRequestParametersValidator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DecideRequestParametersValidator.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/DecideRequestParametersValidator.ts"],"names":[],"mappings":";;;AAAA,gDAA4D;
|
|
1
|
+
{"version":3,"file":"DecideRequestParametersValidator.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/DecideRequestParametersValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,7 +104,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
|
|
|
104
104
|
return request;
|
|
105
105
|
}
|
|
106
106
|
async canAccept(params) {
|
|
107
|
-
return await this.canDecide({ ...params, accept:
|
|
107
|
+
return await this.canDecide({ ...params, accept: true });
|
|
108
108
|
}
|
|
109
109
|
async canReject(params) {
|
|
110
110
|
return await this.canDecide({ ...params, accept: false });
|
|
@@ -153,7 +153,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
|
|
|
153
153
|
if (!canAccept.isSuccess()) {
|
|
154
154
|
throw new Error("Cannot accept the Request with the given parameters. Call 'canAccept' to get more information.");
|
|
155
155
|
}
|
|
156
|
-
return await this.decide({ ...params, accept:
|
|
156
|
+
return await this.decide({ ...params, accept: true });
|
|
157
157
|
}
|
|
158
158
|
async reject(params) {
|
|
159
159
|
const canReject = await this.canReject(params);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IncomingRequestsController.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/IncomingRequestsController.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"IncomingRequestsController.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/IncomingRequestsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,3 +2,4 @@ import { DecideRequestItemParametersJSON } from "./DecideRequestItemParameters";
|
|
|
2
2
|
export interface DecideRequestItemGroupParametersJSON {
|
|
3
3
|
items: DecideRequestItemParametersJSON[];
|
|
4
4
|
}
|
|
5
|
+
export declare function isDecideRequestItemGroupParametersJSON(json: any): json is DecideRequestItemGroupParametersJSON;
|
|
@@ -1,3 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isDecideRequestItemGroupParametersJSON = void 0;
|
|
4
|
+
function isDecideRequestItemGroupParametersJSON(json) {
|
|
5
|
+
return typeof json.items !== "undefined" && typeof json.accept === "undefined";
|
|
6
|
+
}
|
|
7
|
+
exports.isDecideRequestItemGroupParametersJSON = isDecideRequestItemGroupParametersJSON;
|
|
3
8
|
//# sourceMappingURL=DecideRequestItemGroupParameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DecideRequestItemGroupParameters.js","sourceRoot":"","sources":["../../../../../src/modules/requests/incoming/decide/DecideRequestItemGroupParameters.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"DecideRequestItemGroupParameters.js","sourceRoot":"","sources":["../../../../../src/modules/requests/incoming/decide/DecideRequestItemGroupParameters.ts"],"names":[],"mappings":";;;AAMA,SAAgB,sCAAsC,CAAC,IAAS;IAC5D,OAAO,OAAO,IAAI,CAAC,KAAK,KAAK,WAAW,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,WAAW,CAAA;AAClF,CAAC;AAFD,wFAEC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { AcceptRequestItemParametersJSON } from "./AcceptRequestItemParameters";
|
|
2
2
|
import { RejectRequestItemParametersJSON } from "./RejectRequestItemParameters";
|
|
3
3
|
export declare type DecideRequestItemParametersJSON = AcceptRequestItemParametersJSON | RejectRequestItemParametersJSON;
|
|
4
|
+
export declare function isDecideRequestItemParametersJSON(json: any): json is DecideRequestItemParametersJSON;
|
|
@@ -1,3 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isDecideRequestItemParametersJSON = void 0;
|
|
4
|
+
function isDecideRequestItemParametersJSON(json) {
|
|
5
|
+
return typeof json.items === "undefined" && typeof json.accept !== "undefined";
|
|
6
|
+
}
|
|
7
|
+
exports.isDecideRequestItemParametersJSON = isDecideRequestItemParametersJSON;
|
|
3
8
|
//# sourceMappingURL=DecideRequestItemParameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DecideRequestItemParameters.js","sourceRoot":"","sources":["../../../../../src/modules/requests/incoming/decide/DecideRequestItemParameters.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"DecideRequestItemParameters.js","sourceRoot":"","sources":["../../../../../src/modules/requests/incoming/decide/DecideRequestItemParameters.ts"],"names":[],"mappings":";;;AAKA,SAAgB,iCAAiC,CAAC,IAAS;IACvD,OAAO,OAAO,IAAI,CAAC,KAAK,KAAK,WAAW,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,WAAW,CAAA;AAClF,CAAC;AAFD,8EAEC"}
|
|
@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
|
17
17
|
const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
|
|
18
18
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
19
19
|
exports.buildInformation = {
|
|
20
|
-
version: "2.0.0-alpha.
|
|
21
|
-
build: "
|
|
22
|
-
date: "2022-04-
|
|
23
|
-
commit: "
|
|
20
|
+
version: "2.0.0-alpha.6",
|
|
21
|
+
build: "24",
|
|
22
|
+
date: "2022-04-29T10:52:56+00:00",
|
|
23
|
+
commit: "9c39230181fc6db8e9c6d2bca3d56fcd7fccf3ad",
|
|
24
24
|
dependencies: {},
|
|
25
25
|
libraries: {
|
|
26
26
|
transport: transport_1.buildInformation,
|
|
@@ -1233,13 +1233,67 @@ exports.RelationshipTheme = RelationshipTheme;
|
|
|
1233
1233
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
1234
1234
|
exports.DecideRequestParametersValidator = void 0;
|
|
1235
1235
|
const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
|
|
1236
|
+
const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
1237
|
+
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
1238
|
+
const DecideRequestItemGroupParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemGroupParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js");
|
|
1239
|
+
const DecideRequestItemParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemParameters.js");
|
|
1236
1240
|
class DecideRequestParametersValidator {
|
|
1237
1241
|
validate(params, request) {
|
|
1242
|
+
if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
|
|
1243
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the request does not match the id of the response"));
|
|
1244
|
+
}
|
|
1238
1245
|
if (params.items.length !== request.content.items.length) {
|
|
1239
|
-
return ts_utils_1.Result.fail(
|
|
1246
|
+
return ts_utils_1.Result.fail(this.invalidNumberOfItemsError("Number of items in Request and Response do not match"));
|
|
1247
|
+
}
|
|
1248
|
+
for (let i = 0; i < params.items.length; i++) {
|
|
1249
|
+
const validationResult = this.checkItemOrGroup(request.content.items[i], params.items[i], i.toString(), params.accept);
|
|
1250
|
+
if (validationResult.isError)
|
|
1251
|
+
return validationResult;
|
|
1252
|
+
}
|
|
1253
|
+
return ts_utils_1.Result.ok(undefined);
|
|
1254
|
+
}
|
|
1255
|
+
checkItemOrGroup(requestItem, responseItem, index, isParentAccepted) {
|
|
1256
|
+
if (requestItem instanceof content_1.RequestItem) {
|
|
1257
|
+
return this.checkItem(requestItem, responseItem, index, isParentAccepted);
|
|
1258
|
+
}
|
|
1259
|
+
return this.checkItemGroup(requestItem, responseItem, index, isParentAccepted);
|
|
1260
|
+
}
|
|
1261
|
+
checkItem(requestItem, response, index, isParentAccepted) {
|
|
1262
|
+
if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
|
|
1263
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}' was answered as a RequestItemGroup.`));
|
|
1264
|
+
}
|
|
1265
|
+
if (!isParentAccepted && response.accept) {
|
|
1266
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}' was accepted, but the parent was not accepted.`));
|
|
1267
|
+
}
|
|
1268
|
+
if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
|
|
1269
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}', which is flagged as 'mustBeAccepted', was not accepted.`));
|
|
1240
1270
|
}
|
|
1241
1271
|
return ts_utils_1.Result.ok(undefined);
|
|
1242
1272
|
}
|
|
1273
|
+
checkItemGroup(requestItemGroup, responseItemGroup, index, isParentAccepted) {
|
|
1274
|
+
if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
|
|
1275
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}' was answered as a RequestItem.`));
|
|
1276
|
+
}
|
|
1277
|
+
if (responseItemGroup.items.length !== requestItemGroup.items.length) {
|
|
1278
|
+
return ts_utils_1.Result.fail(this.invalidNumberOfItemsError("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
|
|
1279
|
+
}
|
|
1280
|
+
const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
|
|
1281
|
+
if (!isParentAccepted && isGroupAccepted) {
|
|
1282
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}' was accepted, but the parent was not accepted.`));
|
|
1283
|
+
}
|
|
1284
|
+
if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
|
|
1285
|
+
return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}', which is flagged as 'mustBeAccepted', was not accepted. Please accept all 'mustBeAccepted' items in this group.`));
|
|
1286
|
+
}
|
|
1287
|
+
for (let i = 0; i < responseItemGroup.items.length; i++) {
|
|
1288
|
+
const validationResult = this.checkItem(requestItemGroup.items[i], responseItemGroup.items[i], `${index}.${i}`, isGroupAccepted);
|
|
1289
|
+
if (validationResult.isError)
|
|
1290
|
+
return validationResult;
|
|
1291
|
+
}
|
|
1292
|
+
return ts_utils_1.Result.ok(undefined);
|
|
1293
|
+
}
|
|
1294
|
+
invalidNumberOfItemsError(message) {
|
|
1295
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
|
|
1296
|
+
}
|
|
1243
1297
|
}
|
|
1244
1298
|
exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
|
|
1245
1299
|
//# sourceMappingURL=DecideRequestParametersValidator.js.map
|
|
@@ -1359,7 +1413,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
|
|
|
1359
1413
|
return request;
|
|
1360
1414
|
}
|
|
1361
1415
|
async canAccept(params) {
|
|
1362
|
-
return await this.canDecide({ ...params, accept:
|
|
1416
|
+
return await this.canDecide({ ...params, accept: true });
|
|
1363
1417
|
}
|
|
1364
1418
|
async canReject(params) {
|
|
1365
1419
|
return await this.canDecide({ ...params, accept: false });
|
|
@@ -1408,7 +1462,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
|
|
|
1408
1462
|
if (!canAccept.isSuccess()) {
|
|
1409
1463
|
throw new Error("Cannot accept the Request with the given parameters. Call 'canAccept' to get more information.");
|
|
1410
1464
|
}
|
|
1411
|
-
return await this.decide({ ...params, accept:
|
|
1465
|
+
return await this.decide({ ...params, accept: true });
|
|
1412
1466
|
}
|
|
1413
1467
|
async reject(params) {
|
|
1414
1468
|
const canReject = await this.canReject(params);
|
|
@@ -1635,6 +1689,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
1635
1689
|
"use strict";
|
|
1636
1690
|
|
|
1637
1691
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
1692
|
+
exports.isDecideRequestItemGroupParametersJSON = void 0;
|
|
1693
|
+
function isDecideRequestItemGroupParametersJSON(json) {
|
|
1694
|
+
return typeof json.items !== "undefined" && typeof json.accept === "undefined";
|
|
1695
|
+
}
|
|
1696
|
+
exports.isDecideRequestItemGroupParametersJSON = isDecideRequestItemGroupParametersJSON;
|
|
1638
1697
|
//# sourceMappingURL=DecideRequestItemGroupParameters.js.map
|
|
1639
1698
|
|
|
1640
1699
|
/***/ }),
|
|
@@ -1648,6 +1707,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
1648
1707
|
"use strict";
|
|
1649
1708
|
|
|
1650
1709
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
1710
|
+
exports.isDecideRequestItemParametersJSON = void 0;
|
|
1711
|
+
function isDecideRequestItemParametersJSON(json) {
|
|
1712
|
+
return typeof json.items === "undefined" && typeof json.accept !== "undefined";
|
|
1713
|
+
}
|
|
1714
|
+
exports.isDecideRequestItemParametersJSON = isDecideRequestItemParametersJSON;
|
|
1651
1715
|
//# sourceMappingURL=DecideRequestItemParameters.js.map
|
|
1652
1716
|
|
|
1653
1717
|
/***/ }),
|