@nmshd/runtime 1.2.3 → 1.2.4
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/useCases/common/validation/SchemaValidator.js +2 -2
- package/dist/useCases/common/validation/SchemaValidator.js.map +1 -1
- package/dist/useCases/transport/files/LoadPeerFile.js +6 -6
- package/dist/useCases/transport/files/LoadPeerFile.js.map +1 -1
- package/lib-web/nmshd.runtime.js +12 -12
- package/lib-web/nmshd.runtime.js.map +1 -1
- package/lib-web/nmshd.runtime.min.js +1 -1
- package/lib-web/nmshd.runtime.min.js.map +1 -1
- package/package.json +1 -1
package/dist/buildInformation.js
CHANGED
|
@@ -7,10 +7,10 @@ const content_1 = require("@nmshd/content");
|
|
|
7
7
|
const crypto_1 = require("@nmshd/crypto");
|
|
8
8
|
const transport_1 = require("@nmshd/transport");
|
|
9
9
|
exports.buildInformation = {
|
|
10
|
-
version: "1.2.
|
|
11
|
-
build: "
|
|
12
|
-
date: "2021-12-
|
|
13
|
-
commit: "
|
|
10
|
+
version: "1.2.4",
|
|
11
|
+
build: "19",
|
|
12
|
+
date: "2021-12-16T12:18:55+00:00",
|
|
13
|
+
commit: "13b03dd2843fc516dec483615cd1a10ca41d5417",
|
|
14
14
|
dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.6","@nmshd/content":"1.1.2","@nmshd/crypto":"1.0.6","@nmshd/transport":"1.1.1","ajv":"^8.8.2","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.2","luxon":"^2.2.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
|
|
15
15
|
libraries: {
|
|
16
16
|
serval: ts_serval_1.buildInformation,
|
|
@@ -18,9 +18,9 @@ class SchemaValidator {
|
|
|
18
18
|
result.addFailures(validationResult.errors.map(this.schemaErrorToValidationFailure));
|
|
19
19
|
return result;
|
|
20
20
|
}
|
|
21
|
-
schemaErrorToValidationFailure(err
|
|
21
|
+
schemaErrorToValidationFailure(err) {
|
|
22
22
|
const errorMessage = `${err.instancePath} ${err.message}`.replace(/^\//, "").replace(/"/g, "").trim();
|
|
23
|
-
return new fluent_ts_validator_1.ValidationFailure(
|
|
23
|
+
return new fluent_ts_validator_1.ValidationFailure(undefined, err.instancePath, undefined, undefined, errorMessage);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
exports.SchemaValidator = SchemaValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaValidator.js","sourceRoot":"","sources":["../../../../src/useCases/common/validation/SchemaValidator.ts"],"names":[],"mappings":";;;AACA,6DAA0E;AAI1E,MAAa,eAAe;IACxB,YAAsC,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;IAAG,CAAC;IAErD,QAAQ,CAAC,KAAQ;QACpB,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IAES,uBAAuB,CAAC,gBAA4C;QAC1E,MAAM,MAAM,GAAG,IAAI,sCAAgB,EAAE,CAAC;QAEtC,IAAI,gBAAgB,CAAC,OAAO,EAAE;YAC1B,OAAO,MAAM,CAAC;SACjB;QAED,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAO,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAEtF,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,8BAA8B,
|
|
1
|
+
{"version":3,"file":"SchemaValidator.js","sourceRoot":"","sources":["../../../../src/useCases/common/validation/SchemaValidator.ts"],"names":[],"mappings":";;;AACA,6DAA0E;AAI1E,MAAa,eAAe;IACxB,YAAsC,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;IAAG,CAAC;IAErD,QAAQ,CAAC,KAAQ;QACpB,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IAES,uBAAuB,CAAC,gBAA4C;QAC1E,MAAM,MAAM,GAAG,IAAI,sCAAgB,EAAE,CAAC;QAEtC,IAAI,gBAAgB,CAAC,OAAO,EAAE;YAC1B,OAAO,MAAM,CAAC;SACjB;QAED,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAO,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAEtF,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,8BAA8B,CAAC,GAAgB;QACnD,MAAM,YAAY,GAAG,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEtG,OAAO,IAAI,uCAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IAClG,CAAC;CACJ;AA1BD,0CA0BC"}
|
|
@@ -33,21 +33,21 @@ let Validator = class Validator extends common_1.SchemaValidator {
|
|
|
33
33
|
this.loadViaReferenceSchema = schemaRepository.getSchema("LoadPeerFileViaReferenceRequest");
|
|
34
34
|
}
|
|
35
35
|
validate(input) {
|
|
36
|
-
|
|
37
|
-
if (validationResult.isValid) {
|
|
36
|
+
if (this.schema.validate(input).isValid)
|
|
38
37
|
return new fluent_ts_validator_1.ValidationResult();
|
|
39
|
-
}
|
|
40
38
|
// any-of in combination with missing properties is a bit weird
|
|
41
39
|
// when { reference: null | undefined } is passed, it ignores reference
|
|
42
40
|
// and treats it like a LoadPeerFileViaSecret.
|
|
43
41
|
// That's why we validate with the specific schema afterwards
|
|
44
42
|
if (isLoadPeerFileViaReference(input)) {
|
|
45
|
-
|
|
43
|
+
return this.convertValidationResult(this.loadViaReferenceSchema.validate(input));
|
|
46
44
|
}
|
|
47
45
|
else if (isLoadPeerFileViaSecret(input)) {
|
|
48
|
-
|
|
46
|
+
return this.convertValidationResult(this.loadViaSecretSchema.validate(input));
|
|
49
47
|
}
|
|
50
|
-
|
|
48
|
+
const result = new fluent_ts_validator_1.ValidationResult();
|
|
49
|
+
result.addFailures([new fluent_ts_validator_1.ValidationFailure(undefined, "", undefined, common_1.RuntimeErrors.general.invalidPayload().code, common_1.RuntimeErrors.general.invalidPayload().message)]);
|
|
50
|
+
return result;
|
|
51
51
|
}
|
|
52
52
|
};
|
|
53
53
|
Validator = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadPeerFile.js","sourceRoot":"","sources":["../../../../src/useCases/transport/files/LoadPeerFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA2C;AAC3C,0CAAgD;AAChD,gDAAuH;AACvH,
|
|
1
|
+
{"version":3,"file":"LoadPeerFile.js","sourceRoot":"","sources":["../../../../src/useCases/transport/files/LoadPeerFile.ts"],"names":[],"mappings":"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"}
|
package/lib-web/nmshd.runtime.js
CHANGED
|
@@ -330,10 +330,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
|
330
330
|
const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
|
|
331
331
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
332
332
|
exports.buildInformation = {
|
|
333
|
-
version: "1.2.
|
|
334
|
-
build: "
|
|
335
|
-
date: "2021-12-
|
|
336
|
-
commit: "
|
|
333
|
+
version: "1.2.4",
|
|
334
|
+
build: "19",
|
|
335
|
+
date: "2021-12-16T12:18:55+00:00",
|
|
336
|
+
commit: "13b03dd2843fc516dec483615cd1a10ca41d5417",
|
|
337
337
|
dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.6","@nmshd/content":"1.1.2","@nmshd/crypto":"1.0.6","@nmshd/transport":"1.1.1","ajv":"^8.8.2","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.2","luxon":"^2.2.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
|
|
338
338
|
libraries: {
|
|
339
339
|
serval: ts_serval_1.buildInformation,
|
|
@@ -6072,9 +6072,9 @@ class SchemaValidator {
|
|
|
6072
6072
|
result.addFailures(validationResult.errors.map(this.schemaErrorToValidationFailure));
|
|
6073
6073
|
return result;
|
|
6074
6074
|
}
|
|
6075
|
-
schemaErrorToValidationFailure(err
|
|
6075
|
+
schemaErrorToValidationFailure(err) {
|
|
6076
6076
|
const errorMessage = `${err.instancePath} ${err.message}`.replace(/^\//, "").replace(/"/g, "").trim();
|
|
6077
|
-
return new fluent_ts_validator_1.ValidationFailure(
|
|
6077
|
+
return new fluent_ts_validator_1.ValidationFailure(undefined, err.instancePath, undefined, undefined, errorMessage);
|
|
6078
6078
|
}
|
|
6079
6079
|
}
|
|
6080
6080
|
exports.SchemaValidator = SchemaValidator;
|
|
@@ -10193,21 +10193,21 @@ let Validator = class Validator extends common_1.SchemaValidator {
|
|
|
10193
10193
|
this.loadViaReferenceSchema = schemaRepository.getSchema("LoadPeerFileViaReferenceRequest");
|
|
10194
10194
|
}
|
|
10195
10195
|
validate(input) {
|
|
10196
|
-
|
|
10197
|
-
if (validationResult.isValid) {
|
|
10196
|
+
if (this.schema.validate(input).isValid)
|
|
10198
10197
|
return new fluent_ts_validator_1.ValidationResult();
|
|
10199
|
-
}
|
|
10200
10198
|
// any-of in combination with missing properties is a bit weird
|
|
10201
10199
|
// when { reference: null | undefined } is passed, it ignores reference
|
|
10202
10200
|
// and treats it like a LoadPeerFileViaSecret.
|
|
10203
10201
|
// That's why we validate with the specific schema afterwards
|
|
10204
10202
|
if (isLoadPeerFileViaReference(input)) {
|
|
10205
|
-
|
|
10203
|
+
return this.convertValidationResult(this.loadViaReferenceSchema.validate(input));
|
|
10206
10204
|
}
|
|
10207
10205
|
else if (isLoadPeerFileViaSecret(input)) {
|
|
10208
|
-
|
|
10206
|
+
return this.convertValidationResult(this.loadViaSecretSchema.validate(input));
|
|
10209
10207
|
}
|
|
10210
|
-
|
|
10208
|
+
const result = new fluent_ts_validator_1.ValidationResult();
|
|
10209
|
+
result.addFailures([new fluent_ts_validator_1.ValidationFailure(undefined, "", undefined, common_1.RuntimeErrors.general.invalidPayload().code, common_1.RuntimeErrors.general.invalidPayload().message)]);
|
|
10210
|
+
return result;
|
|
10211
10211
|
}
|
|
10212
10212
|
};
|
|
10213
10213
|
Validator = __decorate([
|