@nmshd/consumption 2.2.0 → 2.3.0
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/attributes/AttributesController.d.ts +3 -2
- package/dist/modules/attributes/AttributesController.js +34 -8
- package/dist/modules/attributes/AttributesController.js.map +1 -1
- package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js +1 -1
- package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js.map +1 -1
- package/lib-web/nmshd.consumption.js +38 -12
- 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 +4 -4
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.
|
|
10
|
-
build: "
|
|
11
|
-
date: "2022-
|
|
12
|
-
commit: "
|
|
9
|
+
version: "2.3.0",
|
|
10
|
+
build: "91",
|
|
11
|
+
date: "2022-12-02T15:28:29+00:00",
|
|
12
|
+
commit: "164dc528ce954031df4bac7662310b24a7ce56d0",
|
|
13
13
|
dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
|
|
14
14
|
libraries: {
|
|
15
15
|
transport: transport_1.buildInformation,
|
|
@@ -21,8 +21,9 @@ export declare class AttributesController extends ConsumptionBaseController {
|
|
|
21
21
|
findCurrent(attributes: LocalAttribute[]): LocalAttribute | undefined;
|
|
22
22
|
filterCurrent(attributes: LocalAttribute[]): LocalAttribute[];
|
|
23
23
|
getLocalAttribute(id: CoreId): Promise<LocalAttribute | undefined>;
|
|
24
|
-
getLocalAttributes(query?: any): Promise<LocalAttribute[]>;
|
|
25
|
-
|
|
24
|
+
getLocalAttributes(query?: any, hideTechnical?: boolean, onlyValid?: boolean): Promise<LocalAttribute[]>;
|
|
25
|
+
private enrichQuery;
|
|
26
|
+
getValidLocalAttributes(query?: any, hideTechnical?: boolean): Promise<LocalAttribute[]>;
|
|
26
27
|
executeRelationshipAttributeQuery(query: IRelationshipAttributeQuery): Promise<LocalAttribute | undefined>;
|
|
27
28
|
executeThirdPartyRelationshipAttributeQuery(query: IThirdPartyRelationshipAttributeQuery): Promise<LocalAttribute[]>;
|
|
28
29
|
executeIdentityAttributeQuery(query: IIdentityAttributeQuery): Promise<LocalAttribute[]>;
|
|
@@ -77,14 +77,40 @@ class AttributesController extends consumption_1.ConsumptionBaseController {
|
|
|
77
77
|
return;
|
|
78
78
|
return LocalAttribute_1.LocalAttribute.from(result);
|
|
79
79
|
}
|
|
80
|
-
async getLocalAttributes(query) {
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
80
|
+
async getLocalAttributes(query, hideTechnical = false, onlyValid = false) {
|
|
81
|
+
const enrichedQuery = this.enrichQuery(query, hideTechnical);
|
|
82
|
+
const attributes = await this.attributes.find(enrichedQuery);
|
|
83
|
+
const parsed = this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
|
|
84
|
+
if (!onlyValid)
|
|
85
|
+
return parsed;
|
|
86
|
+
return this.filterCurrent(parsed);
|
|
87
|
+
}
|
|
88
|
+
enrichQuery(query, hideTechnical) {
|
|
89
|
+
if (!hideTechnical)
|
|
90
|
+
return query;
|
|
91
|
+
const hideTechnicalQuery = {
|
|
92
|
+
$or: [
|
|
93
|
+
{
|
|
94
|
+
[`${(0, ts_simple_nameof_1.nameof)((c) => c.content)}.@type`]: "IdentityAttribute"
|
|
95
|
+
},
|
|
96
|
+
{
|
|
97
|
+
$and: [
|
|
98
|
+
{
|
|
99
|
+
[`${(0, ts_simple_nameof_1.nameof)((c) => c.content)}.@type`]: "RelationshipAttribute"
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
[`${(0, ts_simple_nameof_1.nameof)((c) => c.content)}.${(0, ts_simple_nameof_1.nameof)((c) => c.isTechnical)}`]: false
|
|
103
|
+
}
|
|
104
|
+
]
|
|
105
|
+
}
|
|
106
|
+
]
|
|
107
|
+
};
|
|
108
|
+
if (!query)
|
|
109
|
+
return hideTechnicalQuery;
|
|
110
|
+
return { $and: [query, hideTechnicalQuery] };
|
|
111
|
+
}
|
|
112
|
+
async getValidLocalAttributes(query, hideTechnical = false) {
|
|
113
|
+
return await this.getLocalAttributes(query, hideTechnical, true);
|
|
88
114
|
}
|
|
89
115
|
async executeRelationshipAttributeQuery(query) {
|
|
90
116
|
const parsedQuery = content_1.RelationshipAttributeQuery.from(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributesController.js","sourceRoot":"","sources":["../../../src/modules/attributes/AttributesController.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"AttributesController.js","sourceRoot":"","sources":["../../../src/modules/attributes/AttributesController.ts"],"names":[],"mappings":"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"}
|
package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js
CHANGED
|
@@ -28,7 +28,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
|
|
|
28
28
|
return ValidationResult_1.ValidationResult.error(transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
|
|
29
29
|
}
|
|
30
30
|
const ownerIsCurrentIdentity = this.accountController.identity.isMe(foundAttribute.content.owner);
|
|
31
|
-
if (!ownerIsCurrentIdentity) {
|
|
31
|
+
if (!ownerIsCurrentIdentity && foundAttribute.content instanceof content_1.IdentityAttribute) {
|
|
32
32
|
return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
|
|
33
33
|
}
|
|
34
34
|
}
|
package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.ts"],"names":[],"mappings":";;;;;;AAAA,4CAQuB;AACvB,gDAAyF;AACzF,yDAAoD;AACpD,6EAAyE;AACzE,gFAA4E;AAE5E,6EAAoD;AACpD,0DAAsD;AACtD,yGAGmD;AAEnD,MAAa,iCAAkC,SAAQ,yDAGtD;IACmB,4BAA4B,CACxC,WAAqC,EACrC,QAAiB,EACjB,SAAuB;QAEvB,MAAM,qBAAqB,GAAG,IAAA,uBAAa,EAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QACtG,IAAI,qBAAqB,CAAC,OAAO,EAAE,EAAE;YACjC,OAAO,qBAAqB,CAAA;SAC/B;QAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;IACrC,CAAC;IAEe,KAAK,CAAC,SAAS,CAC3B,YAAsC,EACtC,MAAoD,EACpD,WAA6B;QAE7B,MAAM,YAAY,GAAG,mFAAwC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE1E,IAAI,YAAY,CAAC,uBAAuB,EAAE,EAAE;YACxC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAChF,YAAY,CAAC,mBAAmB,CACnC,CAAA;YAED,IAAI,CAAC,cAAc,EAAE;gBACjB,OAAO,mCAAgB,CAAC,KAAK,CACzB,sBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,+BAAc,EAAE,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CACxF,CAAA;aACJ;YAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YACjG,IAAI,CAAC,sBAAsB,EAAE;
|
|
1
|
+
{"version":3,"file":"ReadAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -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.
|
|
21
|
-
build: "
|
|
22
|
-
date: "2022-
|
|
23
|
-
commit: "
|
|
20
|
+
version: "2.3.0",
|
|
21
|
+
build: "91",
|
|
22
|
+
date: "2022-12-02T15:28:29+00:00",
|
|
23
|
+
commit: "164dc528ce954031df4bac7662310b24a7ce56d0",
|
|
24
24
|
dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
|
|
25
25
|
libraries: {
|
|
26
26
|
transport: transport_1.buildInformation,
|
|
@@ -641,14 +641,40 @@ class AttributesController extends consumption_1.ConsumptionBaseController {
|
|
|
641
641
|
return;
|
|
642
642
|
return LocalAttribute_1.LocalAttribute.from(result);
|
|
643
643
|
}
|
|
644
|
-
async getLocalAttributes(query) {
|
|
645
|
-
const
|
|
646
|
-
|
|
644
|
+
async getLocalAttributes(query, hideTechnical = false, onlyValid = false) {
|
|
645
|
+
const enrichedQuery = this.enrichQuery(query, hideTechnical);
|
|
646
|
+
const attributes = await this.attributes.find(enrichedQuery);
|
|
647
|
+
const parsed = this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
|
|
648
|
+
if (!onlyValid)
|
|
649
|
+
return parsed;
|
|
650
|
+
return this.filterCurrent(parsed);
|
|
651
|
+
}
|
|
652
|
+
enrichQuery(query, hideTechnical) {
|
|
653
|
+
if (!hideTechnical)
|
|
654
|
+
return query;
|
|
655
|
+
const hideTechnicalQuery = {
|
|
656
|
+
$or: [
|
|
657
|
+
{
|
|
658
|
+
[`${(0, ts_simple_nameof_1.nameof)((c) => c.content)}.@type`]: "IdentityAttribute"
|
|
659
|
+
},
|
|
660
|
+
{
|
|
661
|
+
$and: [
|
|
662
|
+
{
|
|
663
|
+
[`${(0, ts_simple_nameof_1.nameof)((c) => c.content)}.@type`]: "RelationshipAttribute"
|
|
664
|
+
},
|
|
665
|
+
{
|
|
666
|
+
[`${(0, ts_simple_nameof_1.nameof)((c) => c.content)}.${(0, ts_simple_nameof_1.nameof)((c) => c.isTechnical)}`]: false
|
|
667
|
+
}
|
|
668
|
+
]
|
|
669
|
+
}
|
|
670
|
+
]
|
|
671
|
+
};
|
|
672
|
+
if (!query)
|
|
673
|
+
return hideTechnicalQuery;
|
|
674
|
+
return { $and: [query, hideTechnicalQuery] };
|
|
647
675
|
}
|
|
648
|
-
async getValidLocalAttributes(query) {
|
|
649
|
-
|
|
650
|
-
const items = this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
|
|
651
|
-
return this.filterCurrent(items);
|
|
676
|
+
async getValidLocalAttributes(query, hideTechnical = false) {
|
|
677
|
+
return await this.getLocalAttributes(query, hideTechnical, true);
|
|
652
678
|
}
|
|
653
679
|
async executeRelationshipAttributeQuery(query) {
|
|
654
680
|
const parsedQuery = content_1.RelationshipAttributeQuery.from(query);
|
|
@@ -3186,7 +3212,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
|
|
|
3186
3212
|
return ValidationResult_1.ValidationResult.error(transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
|
|
3187
3213
|
}
|
|
3188
3214
|
const ownerIsCurrentIdentity = this.accountController.identity.isMe(foundAttribute.content.owner);
|
|
3189
|
-
if (!ownerIsCurrentIdentity) {
|
|
3215
|
+
if (!ownerIsCurrentIdentity && foundAttribute.content instanceof content_1.IdentityAttribute) {
|
|
3190
3216
|
return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
|
|
3191
3217
|
}
|
|
3192
3218
|
}
|