@nmshd/consumption 2.0.0-alpha.18 → 2.0.0-alpha.20

package/lib-web/nmshd.consumption.js

@@ -17,11 +17,11 @@ 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-alpha.18",
-    build: "36",
-    date: "2022-05-31T09:24:56+00:00",
-    commit: "cc8c401d2579fc97a3540924841473b1525fdd32",
-    dependencies: {"@js-soft/docdb-querytranslator":"^1.0.1"},
+    version: "2.0.0-alpha.20",
+    build: "38",
+    date: "2022-06-03T14:09:16+00:00",
+    commit: "217c674042d281ad67bd13607f6307b9ecebfee9",
+    dependencies: {"@js-soft/docdb-querytranslator":"^1.0.1","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
         crypto: crypto_1.buildInformation,
@@ -171,6 +171,9 @@ class Requests {
     unexpectedErrorDuringRequestItemProcessing(error) {
         return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'");
     }
+    cannotSendCreateAttributeRequestItemsWithIdentityAttributes() {
+        return new transport_1.CoreError("error.consumption.requests.cannotSendCreateAttributeRequestItemsWithIdentityAttributes", "You cannot send a CreateAttributeRequestItem with an Identity Attribute. Consider using a ProposeAttributeRequestItem instead.");
+    }
     canOnlyShareOwnAttributes() {
         return new transport_1.CoreError("error.consumption.requests.canOnlyShareOwnAttributes", "The given Attribute belongs to someone else. You can only share own Attributes.");
     }
@@ -296,6 +299,7 @@ exports.ConsumptionAttributesController = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
 const consumption_1 = __webpack_require__(/*! ../../consumption */ "./dist/consumption/index.js");
+const CreateRelationshipAttributeParams_1 = __webpack_require__(/*! ./CreateRelationshipAttributeParams */ "./dist/modules/attributes/CreateRelationshipAttributeParams.js");
 const CreateSharedConsumptionAttributeCopyParams_1 = __webpack_require__(/*! ./CreateSharedConsumptionAttributeCopyParams */ "./dist/modules/attributes/CreateSharedConsumptionAttributeCopyParams.js");
 const ConsumptionAttribute_1 = __webpack_require__(/*! ./local/ConsumptionAttribute */ "./dist/modules/attributes/local/ConsumptionAttribute.js");
 const ConsumptionAttributeShareInfo_1 = __webpack_require__(/*! ./local/ConsumptionAttributeShareInfo */ "./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js");
@@ -379,14 +383,14 @@ class ConsumptionAttributesController extends consumption_1.ConsumptionBaseContr
         queryWithType["attributeType"] = "RelationshipAttribute";
         const dbQuery = QueryTranslator_1.relationshipQueryTranslator.parse(queryWithType);
         const attributes = await this.attributes.find(dbQuery);
-        return attributes;
+        return await this.parseArray(attributes, ConsumptionAttribute_1.ConsumptionAttribute);
     }
     async executeIdentityAttributeQuery(params) {
         const queryWithType = params.query;
         queryWithType["attributeType"] = "IdentityAttribute";
         const dbQuery = QueryTranslator_1.identityQueryTranslator.parse(queryWithType);
         const attributes = await this.attributes.find(dbQuery);
-        return attributes;
+        return await this.parseArray(attributes, ConsumptionAttribute_1.ConsumptionAttribute);
     }
     async createConsumptionAttribute(params) {
         const consumptionAttribute = await ConsumptionAttribute_1.ConsumptionAttribute.fromAttribute(params.content);
@@ -412,6 +416,16 @@ class ConsumptionAttributesController extends consumption_1.ConsumptionBaseContr
         await this.attributes.create(successor);
         return successor;
     }
+    async createRelationshipAttribute(params) {
+        const parsedParams = CreateRelationshipAttributeParams_1.CreateRelationshipAttributeParams.from(params);
+        const shareInfo = ConsumptionAttributeShareInfo_1.ConsumptionAttributeShareInfo.from({
+            peer: parsedParams.peer,
+            requestReference: parsedParams.requestReference
+        });
+        const sharedConsumptionAttribute = await ConsumptionAttribute_1.ConsumptionAttribute.fromAttribute(params.content, undefined, shareInfo);
+        await this.attributes.create(sharedConsumptionAttribute);
+        return sharedConsumptionAttribute;
+    }
     async createSharedConsumptionAttributeCopy(params) {
         const parsedParams = CreateSharedConsumptionAttributeCopyParams_1.CreateSharedConsumptionAttributeCopyParams.from(params);
         const sourceAttribute = await this.getConsumptionAttribute(parsedParams.attributeId);
@@ -556,6 +570,56 @@ exports.CreatePeerConsumptionAttributeParams = CreatePeerConsumptionAttributePar
 
 /***/ }),
 
+/***/ "./dist/modules/attributes/CreateRelationshipAttributeParams.js":
+/*!**********************************************************************!*\
+  !*** ./dist/modules/attributes/CreateRelationshipAttributeParams.js ***!
+  \**********************************************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CreateRelationshipAttributeParams = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+let CreateRelationshipAttributeParams = class CreateRelationshipAttributeParams extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+};
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", content_1.RelationshipAttribute)
+], CreateRelationshipAttributeParams.prototype, "content", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreAddress)
+], CreateRelationshipAttributeParams.prototype, "peer", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreId)
+], CreateRelationshipAttributeParams.prototype, "requestReference", void 0);
+CreateRelationshipAttributeParams = __decorate([
+    (0, ts_serval_1.type)("CreateRelationshipAttributeParams")
+], CreateRelationshipAttributeParams);
+exports.CreateRelationshipAttributeParams = CreateRelationshipAttributeParams;
+//# sourceMappingURL=CreateRelationshipAttributeParams.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/attributes/CreateSharedConsumptionAttributeCopyParams.js":
 /*!*******************************************************************************!*\
   !*** ./dist/modules/attributes/CreateSharedConsumptionAttributeCopyParams.js ***!
@@ -1191,6 +1255,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/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);
@@ -2074,6 +2140,94 @@ exports.ErrorValidationResult = ErrorValidationResult;
 
 /***/ }),
 
+/***/ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js":
+/*!************************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js ***!
+  \************************************************************************************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AcceptCreateAttributeRequestItemParameters = 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 {
+    static from(value) {
+        return this.fromAny(value);
+    }
+};
+AcceptCreateAttributeRequestItemParameters = __decorate([
+    (0, ts_serval_1.type)("AcceptCreateAttributeRequestItemParameters")
+], AcceptCreateAttributeRequestItemParameters);
+exports.AcceptCreateAttributeRequestItemParameters = AcceptCreateAttributeRequestItemParameters;
+//# sourceMappingURL=AcceptCreateAttributeRequestItemParameters.js.map
+
+/***/ }),
+
+/***/ "./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.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 CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
+    canCreateOutgoingRequestItem(requestItem) {
+        // TODO: remove the following if we for sure only allow RelationshipAttributes in a RequestItem
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            // It doesn't make sense to send a CreateAttributeRequestItem with an IdentityAttribute. E.g. the following cases would have to be handled:
+            // - The RequestItem contains an Attribute (e.g. GivenName) with the same value as an already existing Attribute
+            //  => Should the user reject the request? If not, do we save a new Attribute with the same value?
+            // - The RequestItem contains an Attribute (e.g. GivenName) with the a different value than an already existing Attribute
+            // - ...
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.cannotSendCreateAttributeRequestItemsWithIdentityAttributes());
+        }
+        return ValidationResult_1.ValidationResult.success();
+    }
+    async accept(requestItem, _params, request) {
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            throw new Error("IdentityAttribute not supported"); // TODO: allow only Relationship Attributes in RequestItem?
+        }
+        const result = await this.consumptionController.attributes.createRelationshipAttribute({
+            content: requestItem.attribute,
+            peer: request.peer,
+            requestReference: request.id
+        });
+        return content_1.CreateAttributeAcceptResponseItem.from({
+            result: content_1.ResponseItemResult.Accepted,
+            attributeId: result.id
+        });
+    }
+    async applyIncomingResponseItem(responseItem, requestItem, request) {
+        if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
+            return;
+        }
+        await this.consumptionController.attributes.createPeerConsumptionAttribute({
+            id: responseItem.attributeId,
+            content: requestItem.attribute,
+            peer: request.peer,
+            requestReference: request.id
+        });
+    }
+}
+exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcessor;
+//# sourceMappingURL=CreateAttributeRequestItemProcessor.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters.js":
 /*!********************************************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters.js ***!
@@ -2091,21 +2245,39 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var AcceptReadAttributeRequestItemParameters_1;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AcceptReadAttributeRequestItemParameters = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
-let AcceptReadAttributeRequestItemParameters = class AcceptReadAttributeRequestItemParameters extends ts_serval_1.Serializable {
+const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+let AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemParameters_1 = class AcceptReadAttributeRequestItemParameters extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
     }
+    static postFrom(value) {
+        const typedValue = value;
+        if (typedValue.attributeId && typedValue.attribute) {
+            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.attribute), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.attribute)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
+        }
+        if (!typedValue.attributeId && !typedValue.attribute) {
+            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.attribute), `You have to specify either ${(0, ts_simple_nameof_1.nameof)((x) => x.attribute)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
+        }
+        return value;
+    }
 };
 __decorate([
     (0, ts_serval_1.serialize)(),
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     __metadata("design:type", transport_1.CoreId)
 ], AcceptReadAttributeRequestItemParameters.prototype, "attributeId", void 0);
-AcceptReadAttributeRequestItemParameters = __decorate([
+__decorate([
+    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
+    (0, ts_serval_1.validate)({ nullable: true }),
+    __metadata("design:type", Object)
+], AcceptReadAttributeRequestItemParameters.prototype, "attribute", void 0);
+AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemParameters_1 = __decorate([
     (0, ts_serval_1.type)("AcceptReadAttributeRequestItemParameters")
 ], AcceptReadAttributeRequestItemParameters);
 exports.AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemParameters;
@@ -2133,25 +2305,54 @@ const AcceptReadAttributeRequestItemParameters_1 = __webpack_require__(/*! ./Acc
 class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
     async canAccept(_requestItem, params, request) {
         const parsedParams = AcceptReadAttributeRequestItemParameters_1.AcceptReadAttributeRequestItemParameters.from(params);
-        const attribute = await this.consumptionController.attributes.getConsumptionAttribute(parsedParams.attributeId);
-        if (!attribute) {
-            return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(ConsumptionAttribute_1.ConsumptionAttribute, request.id.toString()));
-        }
-        if (!this.consumptionController.accountController.identity.isMe(attribute.content.owner)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.canOnlyShareOwnAttributes());
+        if (parsedParams.attributeId) {
+            const foundAttribute = await this.consumptionController.attributes.getConsumptionAttribute(parsedParams.attributeId);
+            if (!foundAttribute) {
+                return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(ConsumptionAttribute_1.ConsumptionAttribute, request.id.toString()));
+            }
+            if (!this.consumptionController.accountController.identity.isMe(foundAttribute.content.owner)) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.canOnlyShareOwnAttributes());
+            }
         }
         return ValidationResult_1.ValidationResult.success();
     }
     async accept(_requestItem, params, request) {
-        const consumptionAttribute = await this.consumptionController.attributes.createSharedConsumptionAttributeCopy({
-            attributeId: transport_1.CoreId.from(params.attributeId),
+        const parsedParams = AcceptReadAttributeRequestItemParameters_1.AcceptReadAttributeRequestItemParameters.from(params);
+        let sharedConsumptionAttribute;
+        if (parsedParams.attributeId) {
+            sharedConsumptionAttribute = await this.copyExistingAttribute(parsedParams.attributeId, request);
+        }
+        else {
+            sharedConsumptionAttribute = await this.createNewAttribute(parsedParams.attribute, request);
+        }
+        return content_1.ReadAttributeAcceptResponseItem.from({
+            result: content_1.ResponseItemResult.Accepted,
+            attributeId: sharedConsumptionAttribute.id,
+            attribute: sharedConsumptionAttribute.content
+        });
+    }
+    async copyExistingAttribute(attributeId, request) {
+        return await this.consumptionController.attributes.createSharedConsumptionAttributeCopy({
+            attributeId: transport_1.CoreId.from(attributeId),
             peer: transport_1.CoreAddress.from(request.peer),
             requestReference: transport_1.CoreId.from(request.id)
         });
-        return content_1.ReadAttributeAcceptResponseItem.from({
-            result: content_1.ResponseItemResult.Accepted,
-            attributeId: consumptionAttribute.id,
-            attribute: consumptionAttribute.content
+    }
+    async createNewAttribute(attribute, request) {
+        if (attribute instanceof content_1.IdentityAttribute) {
+            const repositoryConsumptionAttribute = await this.consumptionController.attributes.createConsumptionAttribute({
+                content: attribute
+            });
+            return await this.consumptionController.attributes.createSharedConsumptionAttributeCopy({
+                attributeId: transport_1.CoreId.from(repositoryConsumptionAttribute.id),
+                peer: transport_1.CoreAddress.from(request.peer),
+                requestReference: transport_1.CoreId.from(request.id)
+            });
+        }
+        return await this.consumptionController.attributes.createRelationshipAttribute({
+            content: attribute,
+            peer: request.peer,
+            requestReference: transport_1.CoreId.from(request.id)
         });
     }
     async applyIncomingResponseItem(responseItem, _requestItem, request) {