@nmshd/consumption 2.0.0-beta.13 → 2.0.0-beta.14

package/lib-web/nmshd.consumption.js

@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.13",
-    build: "63",
-    date: "2022-09-07T12:50:15+00:00",
-    commit: "10ee9ba1cf7cd57193bd549a7f27df6e481ae543",
+    version: "2.0.0-beta.14",
+    build: "65",
+    date: "2022-09-08T16:46:17+00:00",
+    commit: "5e08a83edb35bff3255290783a568dc0123b7394",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -58,9 +58,8 @@ class ConsumptionBaseController {
     init() {
         return Promise.resolve(this);
     }
-    async parseArray(values, type) {
-        const parsePromises = values.map((v) => type.from(v));
-        return await Promise.all(parsePromises);
+    parseArray(values, type) {
+        return values.map((v) => type.from(v));
     }
 }
 exports.ConsumptionBaseController = ConsumptionBaseController;
@@ -121,7 +120,7 @@ class ConsumptionController {
     getDefaultProcessors() {
         return new Map([
             [content_1.ShareAttributeRequestItem, modules_1.ShareAttributeRequestItemProcessor],
-            [content_1.CreateRelationshipAttributeRequestItem, modules_1.CreateRelationshipAttributeRequestItemProcessor],
+            [content_1.CreateAttributeRequestItem, modules_1.CreateAttributeRequestItemProcessor],
             [content_1.ReadAttributeRequestItem, modules_1.ReadAttributeRequestItemProcessor],
             [content_1.ProposeAttributeRequestItem, modules_1.ProposeAttributeRequestItemProcessor],
             [content_1.ConsentRequestItem, modules_1.GenericRequestItemProcessor],
@@ -413,11 +412,11 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
     }
     async getLocalAttributes(query) {
         const attributes = await this.attributes.find(query);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        return this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
     async getValidLocalAttributes(query) {
         const attributes = await this.attributes.find(query);
-        const items = await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        const items = this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
         return this.filterCurrent(items);
     }
     async executeRelationshipAttributeQuery(query) {
@@ -425,7 +424,16 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
         const dbQuery = QueryTranslator_1.RelationshipAttributeQueryTranslator.translate(parsedQuery);
         dbQuery["content.confidentiality"] = { $ne: "private" };
         const attributes = await this.attributes.find(dbQuery);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        const attribute = attributes.length > 0 ? attributes[0] : undefined;
+        return attribute === undefined ? undefined : LocalAttribute_1.LocalAttribute.from(attribute);
+    }
+    async executeThirdPartyRelationshipAttributeQuery(query) {
+        const parsedQuery = content_1.ThirdPartyRelationshipAttributeQuery.from(query);
+        const dbQuery = QueryTranslator_1.ThirdPartyRelationshipAttributeQueryTranslator.translate(parsedQuery);
+        dbQuery["content.confidentiality"] = { $ne: "private" };
+        const attributes = await this.attributes.find(dbQuery);
+        const attribute = attributes.length > 0 ? attributes[0] : undefined;
+        return attribute ?? LocalAttribute_1.LocalAttribute.from(attribute);
     }
     async executeIdentityAttributeQuery(query) {
         const parsedQuery = content_1.IdentityAttributeQuery.from(query);
@@ -433,7 +441,7 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
         dbQuery["content.owner"] = this.identity.address.toString();
         dbQuery["shareInfo"] = { $exists: false };
         const attributes = await this.attributes.find(dbQuery);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        return this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
     async createLocalAttribute(params) {
         const localAttribute = await LocalAttribute_1.LocalAttribute.fromAttribute(params.content);
@@ -982,7 +990,7 @@ exports.LocalAttributeShareInfo = LocalAttributeShareInfo;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RelationshipAttributeQueryTranslator = exports.IdentityAttributeQueryTranslator = void 0;
+exports.ThirdPartyRelationshipAttributeQueryTranslator = exports.RelationshipAttributeQueryTranslator = exports.IdentityAttributeQueryTranslator = void 0;
 const docdb_querytranslator_1 = __webpack_require__(/*! @js-soft/docdb-querytranslator */ "./node_modules/@js-soft/docdb-querytranslator/dist/index.js");
 const luxon_1 = __webpack_require__(/*! luxon */ "./node_modules/luxon/build/node/luxon.js");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
@@ -1052,6 +1060,55 @@ class RelationshipAttributeQueryTranslator {
 }
 exports.RelationshipAttributeQueryTranslator = RelationshipAttributeQueryTranslator;
 RelationshipAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
+    whitelist: {
+        [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.owner)]: true,
+        attributeType: true
+    },
+    alias: {
+        // key
+        [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: [
+            `${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.key)}`
+        ],
+        // @type of attribute
+        attributeType: [`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.@type`],
+        // owner
+        [(0, ts_simple_nameof_1.nameof)((x) => x.owner)]: [
+            `${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.owner)}`
+        ]
+    },
+    custom: {
+        // validFrom
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: (query, input) => {
+            if (!input) {
+                return;
+            }
+            const validFromUtcString = luxon_1.DateTime.fromISO(input).toUTC().toString();
+            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)}`] = {
+                $gte: validFromUtcString
+            };
+        },
+        // validTo
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: (query, input) => {
+            if (!input) {
+                return;
+            }
+            const validToUtcString = luxon_1.DateTime.fromISO(input).toUTC().toString();
+            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validTo)}`] = {
+                $lte: validToUtcString
+            };
+        }
+    }
+});
+class ThirdPartyRelationshipAttributeQueryTranslator {
+    static translate(query) {
+        return this.translator.parse({ ...query.toJSON(), attributeType: "RelationshipAttribute" });
+    }
+}
+exports.ThirdPartyRelationshipAttributeQueryTranslator = ThirdPartyRelationshipAttributeQueryTranslator;
+ThirdPartyRelationshipAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
     whitelist: {
         [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: true,
         [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: true,
@@ -1215,7 +1272,7 @@ class DraftsController extends consumption_1.ConsumptionBaseController {
     }
     async getDrafts(query) {
         const items = await this.drafts.find(query);
-        return await this.parseArray(items, Draft_1.Draft);
+        return this.parseArray(items, Draft_1.Draft);
     }
     async createDraft(content, type = "") {
         const draft = Draft_1.Draft.from({
@@ -2241,8 +2298,8 @@ __exportStar(__webpack_require__(/*! ./incoming/IncomingRequestsController */ ".
 __exportStar(__webpack_require__(/*! ./incoming/received/ReceivedIncomingRequestParameters */ "./dist/modules/requests/incoming/received/ReceivedIncomingRequestParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters */ "./dist/modules/requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/AbstractRequestItemProcessor */ "./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/createAttribute/CreateAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/IRequestItemProcessor */ "./dist/modules/requests/itemProcessors/IRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/ProcessorConstructor */ "./dist/modules/requests/itemProcessors/ProcessorConstructor.js"), exports);
@@ -2462,10 +2519,10 @@ exports.ErrorValidationResult = ErrorValidationResult;
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js":
-/*!************************************************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js ***!
-  \************************************************************************************************************************************/
+/***/ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js":
+/*!************************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js ***!
+  \************************************************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -2477,61 +2534,87 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.AcceptCreateRelationshipAttributeRequestItemParameters = void 0;
+exports.AcceptCreateAttributeRequestItemParameters = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-let AcceptCreateRelationshipAttributeRequestItemParameters = class AcceptCreateRelationshipAttributeRequestItemParameters extends ts_serval_1.Serializable {
+let AcceptCreateAttributeRequestItemParameters = class AcceptCreateAttributeRequestItemParameters extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
     }
 };
-AcceptCreateRelationshipAttributeRequestItemParameters = __decorate([
-    (0, ts_serval_1.type)("AcceptCreateRelationshipAttributeRequestItemParameters")
-], AcceptCreateRelationshipAttributeRequestItemParameters);
-exports.AcceptCreateRelationshipAttributeRequestItemParameters = AcceptCreateRelationshipAttributeRequestItemParameters;
-//# sourceMappingURL=AcceptCreateRelationshipAttributeRequestItemParameters.js.map
+AcceptCreateAttributeRequestItemParameters = __decorate([
+    (0, ts_serval_1.type)("AcceptCreateAttributeRequestItemParameters")
+], AcceptCreateAttributeRequestItemParameters);
+exports.AcceptCreateAttributeRequestItemParameters = AcceptCreateAttributeRequestItemParameters;
+//# sourceMappingURL=AcceptCreateAttributeRequestItemParameters.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js":
-/*!*****************************************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js ***!
-  \*****************************************************************************************************************************/
+/***/ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js":
+/*!*****************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js ***!
+  \*****************************************************************************************************/
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.CreateRelationshipAttributeRequestItemProcessor = void 0;
+exports.CreateAttributeRequestItemProcessor = void 0;
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
-class CreateRelationshipAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
-    canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
-        if (requestItem.attribute.owner.toString() !== "" &&
-            !requestItem.attribute.owner.equals(this.currentIdentityAddress)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only send Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
+    canCreateOutgoingRequestItem(requestItem, _request, recipient) {
+        const recipientIsAttributeOwner = requestItem.attribute.owner.equals(recipient);
+        const senderIsAttributeOwner = requestItem.attribute.owner.equals(this.currentIdentityAddress);
+        const ownerIsEmptyString = requestItem.attribute.owner.toString() === "";
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            if (senderIsAttributeOwner) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot create own Attributes with a CreateAttributeRequestItem. Use a ShareAttributeRequestItem instead."));
+            }
+            if (recipientIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
+                return ValidationResult_1.ValidationResult.success();
+            }
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be the recipient's address or an empty string. The latter will default to the recipient's address."));
         }
-        return ValidationResult_1.ValidationResult.success();
+        if (recipientIsAttributeOwner || senderIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
+            return ValidationResult_1.ValidationResult.success();
+        }
+        return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given 'attribute' can only be the sender's address, the recipient's address or an empty string. The latter will default to the recipient's address."));
     }
     async accept(requestItem, _params, requestInfo) {
-        requestItem.attribute.owner ??= requestInfo.peer;
-        const peerLocalAttribute = await this.consumptionController.attributes.createPeerLocalAttribute({
-            content: requestItem.attribute,
-            peer: requestInfo.peer,
-            requestReference: requestInfo.id
-        });
-        return content_1.CreateRelationshipAttributeAcceptResponseItem.from({
+        if (requestItem.attribute.owner.toString() === "") {
+            requestItem.attribute.owner = this.currentIdentityAddress;
+        }
+        let sharedAttribute;
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            const repositoryAttribute = await this.consumptionController.attributes.createLocalAttribute({
+                content: requestItem.attribute
+            });
+            sharedAttribute = await this.consumptionController.attributes.createSharedLocalAttributeCopy({
+                peer: requestInfo.peer,
+                requestReference: requestInfo.id,
+                sourceAttributeId: repositoryAttribute.id
+            });
+        }
+        else {
+            sharedAttribute = await this.consumptionController.attributes.createPeerLocalAttribute({
+                content: requestItem.attribute,
+                peer: requestInfo.peer,
+                requestReference: requestInfo.id
+            });
+        }
+        return content_1.CreateAttributeAcceptResponseItem.from({
             result: content_1.ResponseItemResult.Accepted,
-            attributeId: peerLocalAttribute.id
+            attributeId: sharedAttribute.id
         });
     }
     async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
-        if (!(responseItem instanceof content_1.CreateRelationshipAttributeAcceptResponseItem)) {
+        if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
             return;
         }
         if (requestItem.attribute.owner.toString() === "") {
-            requestItem.attribute.owner = this.currentIdentityAddress;
+            requestItem.attribute.owner = requestInfo.peer;
         }
         await this.consumptionController.attributes.createPeerLocalAttribute({
             id: responseItem.attributeId,
@@ -2541,8 +2624,8 @@ class CreateRelationshipAttributeRequestItemProcessor extends GenericRequestItem
         });
     }
 }
-exports.CreateRelationshipAttributeRequestItemProcessor = CreateRelationshipAttributeRequestItemProcessor;
-//# sourceMappingURL=CreateRelationshipAttributeRequestItemProcessor.js.map
+exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcessor;
+//# sourceMappingURL=CreateAttributeRequestItemProcessor.js.map
 
 /***/ }),
 
@@ -2995,14 +3078,14 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 function validateQuery(query, sender, recipient) {
-    if (query instanceof content_1.RelationshipAttributeQuery) {
-        if (query.thirdParty?.equals(sender)) {
+    if (query instanceof content_1.ThirdPartyRelationshipAttributeQuery) {
+        if (query.thirdParty.equals(sender)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
         }
-        if (query.thirdParty?.equals(recipient)) {
+        if (query.thirdParty.equals(recipient)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
         }
-        if (query.owner.equals(sender) && query.thirdParty !== undefined) {
+        if (query.owner.equals(sender)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
         }
     }
@@ -3800,7 +3883,7 @@ class SettingsController extends consumption_1.ConsumptionBaseController {
     }
     async getSettings(query) {
         const items = await this.settings.find(query);
-        return await this.parseArray(items, Setting_1.Setting);
+        return this.parseArray(items, Setting_1.Setting);
     }
     async createSetting(parameters) {
         const setting = Setting_1.Setting.from({