@nmshd/consumption 2.0.0-beta.6 → 2.0.0-beta.7

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.6",
-    build: "56",
-    date: "2022-08-03T08:10:05+00:00",
-    commit: "5b68e1cbedaab1e529c76a8afebca1ffccba5cf4",
+    version: "2.0.0-beta.7",
+    build: "57",
+    date: "2022-08-05T14:52:40+00:00",
+    commit: "c807245adfc9a9d69e8907f9f604770d2b6f7c6b",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -120,10 +120,10 @@ class ConsumptionController {
     }
     getDefaultProcessors() {
         return new Map([
-            [content_1.CreateAttributeRequestItem, modules_1.CreateAttributeRequestItemProcessor],
+            [content_1.ShareAttributeRequestItem, modules_1.ShareAttributeRequestItemProcessor],
+            [content_1.CreateRelationshipAttributeRequestItem, modules_1.CreateRelationshipAttributeRequestItemProcessor],
             [content_1.ReadAttributeRequestItem, modules_1.ReadAttributeRequestItemProcessor],
             [content_1.ProposeAttributeRequestItem, modules_1.ProposeAttributeRequestItemProcessor],
-            [content_1.ShareAttributeRequestItem, modules_1.ShareAttributeRequestItemProcessor],
             [content_1.ConsentRequestItem, modules_1.GenericRequestItemProcessor]
         ]);
     }
@@ -1335,8 +1335,8 @@ __exportStar(__webpack_require__(/*! ./requests/incoming/IncomingRequestsControl
 __exportStar(__webpack_require__(/*! ./requests/incoming/received/ReceivedIncomingRequestParameters */ "./dist/modules/requests/incoming/received/ReceivedIncomingRequestParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters */ "./dist/modules/requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/AbstractRequestItemProcessor */ "./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/IRequestItemProcessor */ "./dist/modules/requests/itemProcessors/IRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/ProcessorConstructor */ "./dist/modules/requests/itemProcessors/ProcessorConstructor.js"), exports);
@@ -2379,10 +2379,10 @@ exports.ErrorValidationResult = ErrorValidationResult;
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js":
-/*!************************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js ***!
-  \************************************************************************************************************/
+/***/ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js":
+/*!************************************************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js ***!
+  \************************************************************************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -2394,88 +2394,72 @@ 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.AcceptCreateAttributeRequestItemParameters = void 0;
+exports.AcceptCreateRelationshipAttributeRequestItemParameters = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-let AcceptCreateAttributeRequestItemParameters = class AcceptCreateAttributeRequestItemParameters extends ts_serval_1.Serializable {
+let AcceptCreateRelationshipAttributeRequestItemParameters = class AcceptCreateRelationshipAttributeRequestItemParameters extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
     }
 };
-AcceptCreateAttributeRequestItemParameters = __decorate([
-    (0, ts_serval_1.type)("AcceptCreateAttributeRequestItemParameters")
-], AcceptCreateAttributeRequestItemParameters);
-exports.AcceptCreateAttributeRequestItemParameters = AcceptCreateAttributeRequestItemParameters;
-//# sourceMappingURL=AcceptCreateAttributeRequestItemParameters.js.map
+AcceptCreateRelationshipAttributeRequestItemParameters = __decorate([
+    (0, ts_serval_1.type)("AcceptCreateRelationshipAttributeRequestItemParameters")
+], AcceptCreateRelationshipAttributeRequestItemParameters);
+exports.AcceptCreateRelationshipAttributeRequestItemParameters = AcceptCreateRelationshipAttributeRequestItemParameters;
+//# sourceMappingURL=AcceptCreateRelationshipAttributeRequestItemParameters.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js":
-/*!*****************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js ***!
-  \*****************************************************************************************************/
+/***/ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js":
+/*!*****************************************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js ***!
+  \*****************************************************************************************************************************/
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.CreateAttributeRequestItemProcessor = void 0;
+exports.CreateRelationshipAttributeRequestItemProcessor = 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 CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
+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."));
         }
-        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
-            return this.canCreateRequestItemWithIdentityAttribute(requestItem);
-        }
-        return ValidationResult_1.ValidationResult.success();
-    }
-    canCreateRequestItemWithIdentityAttribute(requestItem) {
-        if (!requestItem.sourceAttributeId) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("'sourceAttributeId' cannot be undefined when sending an Identity Attribute."));
-        }
         return ValidationResult_1.ValidationResult.success();
     }
     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.CreateAttributeAcceptResponseItem.from({
-            attributeId: peerLocalAttribute.id,
-            result: content_1.ResponseItemResult.Accepted
+        return content_1.CreateRelationshipAttributeAcceptResponseItem.from({
+            result: content_1.ResponseItemResult.Accepted,
+            attributeId: peerLocalAttribute.id
         });
     }
     async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
-        if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
+        if (!(responseItem instanceof content_1.CreateRelationshipAttributeAcceptResponseItem)) {
             return;
         }
-        if (requestItem.sourceAttributeId) {
-            const sourceAttribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.sourceAttributeId);
-            await this.consumptionController.attributes.createSharedLocalAttributeCopy({
-                attributeId: responseItem.attributeId,
-                sourceAttributeId: sourceAttribute.id,
-                peer: requestInfo.peer,
-                requestReference: requestInfo.id
-            });
-        }
-        else {
-            await this.consumptionController.attributes.createPeerLocalAttribute({
-                id: responseItem.attributeId,
-                content: requestItem.attribute,
-                peer: requestInfo.peer,
-                requestReference: requestInfo.id
-            });
+        if (requestItem.attribute.owner.toString() === "") {
+            requestItem.attribute.owner = this.currentIdentityAddress;
         }
+        await this.consumptionController.attributes.createPeerLocalAttribute({
+            id: responseItem.attributeId,
+            content: requestItem.attribute,
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
+        });
     }
 }
-exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcessor;
-//# sourceMappingURL=CreateAttributeRequestItemProcessor.js.map
+exports.CreateRelationshipAttributeRequestItemProcessor = CreateRelationshipAttributeRequestItemProcessor;
+//# sourceMappingURL=CreateRelationshipAttributeRequestItemProcessor.js.map
 
 /***/ }),
 
@@ -2756,7 +2740,8 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
             if (!foundAttribute) {
                 return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
             }
-            if (!this.accountController.identity.isMe(foundAttribute.content.owner)) {
+            const ownerIsCurrentIdentity = this.accountController.identity.isMe(foundAttribute.content.owner);
+            if (!ownerIsCurrentIdentity) {
                 return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
             }
         }
@@ -2859,91 +2844,53 @@ exports.AcceptShareAttributeRequestItemParameters = AcceptShareAttributeRequestI
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ShareAttributeRequestItemProcessor = void 0;
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
-const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 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 ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
-    async canCreateOutgoingRequestItem(requestItem, _request, recipient) {
-        const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
-        if (!attribute) {
-            return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(content_1.Attribute, requestItem.attributeId.toString()));
-        }
-        const attributeOwnerValidationResult = this.validateAttributeOwner(attribute.content, this.currentIdentityAddress, recipient);
-        if (attributeOwnerValidationResult.isError()) {
-            return attributeOwnerValidationResult;
-        }
-        return ValidationResult_1.ValidationResult.success();
-    }
-    async checkPrerequisitesOfIncomingRequestItem(requestItem, requestInfo) {
-        const relationshipToShareWith = await this.accountController.relationships.getRelationshipToIdentity(requestItem.shareWith);
-        if (!relationshipToShareWith) {
-            return false; // Should the containing Request move to Error state?
-        }
-        const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
-        if (!attribute) {
-            return false; // Should the containing Request move to Error state?
-        }
-        if (this.validateAttributeOwner(attribute.content, requestInfo.peer, this.currentIdentityAddress).isError()) {
-            return false;
+    canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            return this.canCreateWithIdentityAttribute(requestItem);
         }
-        return true;
+        return this.canCreateWithRelationshipAttribute(requestItem.attribute);
     }
-    validateAttributeOwner(attribute, sender, recipient) {
-        const attributeOwner = attribute.owner;
-        if (attribute instanceof content_1.IdentityAttribute) {
-            if (!attributeOwner.equals(recipient)) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Can only request sharing of identity attributes owned by the recipient."));
-            }
-        }
-        if (attribute instanceof content_1.RelationshipAttribute) {
-            if (!attributeOwner.equals(recipient) && !attributeOwner.equals(sender)) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot request sharing of relationship attributes not owned by recipient or sender."));
-            }
+    canCreateWithIdentityAttribute(requestItem) {
+        const ownerIsEmpty = requestItem.attribute.owner.toString() === "";
+        const ownerIsCurrentIdentity = requestItem.attribute.owner.equals(this.currentIdentityAddress);
+        if (!ownerIsEmpty && !ownerIsCurrentIdentity) {
+            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."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
-    canAccept(_requestItem, _params, _requestInfo) {
+    canCreateWithRelationshipAttribute(attribute) {
+        if (attribute.confidentiality === content_1.RelationshipAttributeConfidentiality.Private) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The confidentiality of the given `attribute` is private. Therefore you are not allowed to share it."));
+        }
         return ValidationResult_1.ValidationResult.success();
     }
-    async accept(requestItem, _params, _requestInfo) {
-        const attribute = (await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId));
-        if (!(await this.isAttributeAlreadyShared(attribute, requestItem.shareWith))) {
-            await this.shareAttribute(attribute, requestItem.shareWith);
+    async accept(requestItem, _params, requestInfo) {
+        if (requestItem.attribute.owner.toString() === "") {
+            requestItem.attribute.owner = requestInfo.peer;
         }
-        return content_1.AcceptResponseItem.from({ result: content_1.ResponseItemResult.Accepted });
-    }
-    async isAttributeAlreadyShared(attribute, shareWith) {
-        if (attribute.content instanceof content_1.IdentityAttribute) {
-            return ((await this.consumptionController.attributes.getLocalAttributes({
-                "shareInfo.sourceAttribute": attribute.shareInfo.sourceAttribute.toString(),
-                "shareInfo.peer": shareWith.toString()
-            })).length > 0);
-        }
-        return ((await this.consumptionController.attributes.getLocalAttributes({
-            "shareInfo.sourceAttribute": attribute.id.toString(),
-            "shareInfo.peer": shareWith.toString()
-        })).length > 0);
-    }
-    async shareAttribute(attribute, shareWith) {
-        const createAttributeRequestItem = content_1.CreateAttributeRequestItem.from({
-            attribute: attribute.content,
-            mustBeAccepted: true,
-            sourceAttributeId: attribute.id
-        });
-        const createAttributeRequest = await this.consumptionController.outgoingRequests.create({
-            peer: shareWith,
-            content: content_1.Request.from({
-                items: [createAttributeRequestItem]
-            })
+        const localAttribute = await this.consumptionController.attributes.createPeerLocalAttribute({
+            content: requestItem.attribute,
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
         });
-        const message = await this.accountController.messages.sendMessage({
-            recipients: [shareWith],
-            content: createAttributeRequest.content
+        return content_1.ShareAttributeAcceptResponseItem.from({
+            attributeId: localAttribute.id,
+            result: content_1.ResponseItemResult.Accepted
         });
-        await this.consumptionController.outgoingRequests.sent({
-            requestId: createAttributeRequest.id,
-            requestSourceObject: message
+    }
+    async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
+        if (!(responseItem instanceof content_1.ShareAttributeAcceptResponseItem)) {
+            return;
+        }
+        await this.consumptionController.attributes.createSharedLocalAttributeCopy({
+            attributeId: responseItem.attributeId,
+            sourceAttributeId: requestItem.sourceAttributeId,
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
         });
     }
 }