@nmshd/consumption 2.0.0-alpha.25 → 2.0.0-alpha.28

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-alpha.25",
-    build: "45",
-    date: "2022-07-06T13:37:59+00:00",
-    commit: "692a3c01337c3753a910d142c8af1923f9f12e20",
+    version: "2.0.0-alpha.28",
+    build: "48",
+    date: "2022-07-07T13:12:39+00:00",
+    commit: "81c8304697f68fe9ed157cebc415dd1fb2f7b941",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.0.1","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -306,6 +306,7 @@ __exportStar(__webpack_require__(/*! ./modules */ "./dist/modules/index.js"), ex
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.LocalAttributesController = void 0;
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 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");
@@ -387,17 +388,15 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
         const items = await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
         return this.filterCurrent(items);
     }
-    async executeRelationshipAttributeQuery(params) {
-        const queryWithType = params.query;
-        queryWithType["attributeType"] = "RelationshipAttribute";
-        const dbQuery = QueryTranslator_1.relationshipQueryTranslator.parse(queryWithType);
+    async executeRelationshipAttributeQuery(query) {
+        const parsedQuery = content_1.RelationshipAttributeQuery.from(query);
+        const dbQuery = QueryTranslator_1.RelationshipAttributeQueryTranslator.translate(parsedQuery);
         const attributes = await this.attributes.find(dbQuery);
         return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
-    async executeIdentityAttributeQuery(params) {
-        const queryWithType = params.query;
-        queryWithType["attributeType"] = "IdentityAttribute";
-        const dbQuery = QueryTranslator_1.identityQueryTranslator.parse(queryWithType);
+    async executeIdentityAttributeQuery(query) {
+        const parsedQuery = content_1.IdentityAttributeQuery.from(query);
+        const dbQuery = QueryTranslator_1.IdentityAttributeQueryTranslator.translate(parsedQuery);
         const attributes = await this.attributes.find(dbQuery);
         return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
@@ -427,16 +426,16 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
     }
     async createSharedLocalAttributeCopy(params) {
         const parsedParams = CreateSharedLocalAttributeCopyParams_1.CreateSharedLocalAttributeCopyParams.from(params);
-        const sourceAttribute = await this.getLocalAttribute(parsedParams.attributeId);
+        const sourceAttribute = await this.getLocalAttribute(parsedParams.sourceAttributeId);
         if (!sourceAttribute) {
-            throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.attributeId.toString());
+            throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.sourceAttributeId.toString());
         }
         const shareInfo = LocalAttributeShareInfo_1.LocalAttributeShareInfo.from({
             peer: parsedParams.peer,
             requestReference: parsedParams.requestReference,
-            sourceAttribute: parsedParams.attributeId
+            sourceAttribute: parsedParams.sourceAttributeId
         });
-        const sharedLocalAttributeCopy = await LocalAttribute_1.LocalAttribute.fromAttribute(sourceAttribute.content, undefined, shareInfo);
+        const sharedLocalAttributeCopy = await LocalAttribute_1.LocalAttribute.fromAttribute(sourceAttribute.content, undefined, shareInfo, parsedParams.attributeId);
         await this.attributes.create(sharedLocalAttributeCopy);
         return sharedLocalAttributeCopy;
     }
@@ -597,9 +596,14 @@ class CreateSharedLocalAttributeCopyParams extends ts_serval_1.Serializable {
 }
 __decorate([
     (0, ts_serval_1.serialize)(),
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     __metadata("design:type", transport_1.CoreId)
 ], CreateSharedLocalAttributeCopyParams.prototype, "attributeId", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreId)
+], CreateSharedLocalAttributeCopyParams.prototype, "sourceAttributeId", void 0);
 __decorate([
     (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
@@ -615,78 +619,6 @@ exports.CreateSharedLocalAttributeCopyParams = CreateSharedLocalAttributeCopyPar
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/local/GetIdentityAttributesParams.js":
-/*!**********************************************************************!*\
-  !*** ./dist/modules/attributes/local/GetIdentityAttributesParams.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.GetIdentityAttributesParams = 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");
-class GetIdentityAttributesParams 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.IdentityAttributeQuery)
-], GetIdentityAttributesParams.prototype, "query", void 0);
-exports.GetIdentityAttributesParams = GetIdentityAttributesParams;
-//# sourceMappingURL=GetIdentityAttributesParams.js.map
-
-/***/ }),
-
-/***/ "./dist/modules/attributes/local/GetRelationshipAttributesParams.js":
-/*!**************************************************************************!*\
-  !*** ./dist/modules/attributes/local/GetRelationshipAttributesParams.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.GetRelationshipAttributesParams = 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");
-class GetRelationshipAttributesParams 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.RelationshipAttributeQuery)
-], GetRelationshipAttributesParams.prototype, "query", void 0);
-exports.GetRelationshipAttributesParams = GetRelationshipAttributesParams;
-//# sourceMappingURL=GetRelationshipAttributesParams.js.map
-
-/***/ }),
-
 /***/ "./dist/modules/attributes/local/LocalAttribute.js":
 /*!*********************************************************!*\
   !*** ./dist/modules/attributes/local/LocalAttribute.js ***!
@@ -724,13 +656,19 @@ let LocalAttribute = class LocalAttribute extends transport_1.CoreSynchronizable
         ];
         this.userdataProperties = [(0, ts_simple_nameof_1.nameof)((r) => r.content)];
     }
+    isIdentityAttribute() {
+        return this.content instanceof content_1.IdentityAttribute;
+    }
+    isOwnedBy(identity) {
+        return this.content.owner.equals(identity);
+    }
     static from(value) {
         return this.fromAny(value);
     }
-    static async fromAttribute(attribute, succeeds, shareInfo) {
+    static async fromAttribute(attribute, succeeds, shareInfo, id) {
         return this.from({
+            id: id ?? (await consumption_1.ConsumptionIds.attribute.generate()),
             content: attribute,
-            id: await consumption_1.ConsumptionIds.attribute.generate(),
             createdAt: transport_1.CoreDate.utc(),
             succeeds: succeeds,
             shareInfo: shareInfo
@@ -825,11 +763,17 @@ exports.LocalAttributeShareInfo = LocalAttributeShareInfo;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.relationshipQueryTranslator = exports.identityQueryTranslator = void 0;
+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/cjs-browser/luxon.js");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
-exports.identityQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
+class IdentityAttributeQueryTranslator {
+    static translate(query) {
+        return this.translator.parse({ ...query.toJSON(), attributeType: "IdentityAttribute" });
+    }
+}
+exports.IdentityAttributeQueryTranslator = IdentityAttributeQueryTranslator;
+IdentityAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
     whitelist: {
         [(0, ts_simple_nameof_1.nameof)((x) => x.tags)]: true,
         [(0, ts_simple_nameof_1.nameof)((x) => x.valueType)]: true,
@@ -848,16 +792,17 @@ exports.identityQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
     custom: {
         // tags
         [(0, ts_simple_nameof_1.nameof)((x) => x.tags)]: (query, input) => {
-            const allowedTags = [];
-            for (const tag of input) {
-                const tagQuery = {
-                    [`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.tags)}`]: {
-                        $contains: tag
-                    }
-                };
-                allowedTags.push(tagQuery);
+            if (!input)
+                return;
+            if (!Array.isArray(input)) {
+                throw new Error("Invalid input: 'tags' must be an array");
             }
-            query["$or"] = allowedTags;
+            const inputAsArray = input;
+            query["$or"] = inputAsArray.map((t) => ({
+                [`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.tags)}`]: {
+                    $contains: t
+                }
+            }));
         },
         // validFrom
         [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: (query, input) => {
@@ -865,10 +810,9 @@ exports.identityQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
                 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
-                };
+            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) => {
@@ -882,7 +826,13 @@ exports.identityQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
         }
     }
 });
-exports.relationshipQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
+class RelationshipAttributeQueryTranslator {
+    static translate(query) {
+        return this.translator.parse({ ...query.toJSON(), attributeType: "RelationshipAttribute" });
+    }
+}
+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.valueType)]: true,
@@ -919,10 +869,9 @@ exports.relationshipQueryTranslator = new docdb_querytranslator_1.QueryTranslato
                 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
-                };
+            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) => {
@@ -1187,8 +1136,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./attributes/local/CreateLocalAttributeParams */ "./dist/modules/attributes/local/CreateLocalAttributeParams.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/CreatePeerLocalAttributeParams */ "./dist/modules/attributes/local/CreatePeerLocalAttributeParams.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/CreateSharedLocalAttributeCopyParams */ "./dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/GetIdentityAttributesParams */ "./dist/modules/attributes/local/GetIdentityAttributesParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/GetRelationshipAttributesParams */ "./dist/modules/attributes/local/GetRelationshipAttributesParams.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/LocalAttribute */ "./dist/modules/attributes/local/LocalAttribute.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/LocalAttributeShareInfo */ "./dist/modules/attributes/local/LocalAttributeShareInfo.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/SucceedLocalAttributeParams */ "./dist/modules/attributes/local/SucceedLocalAttributeParams.js"), exports);
@@ -2131,7 +2078,14 @@ const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist
 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, _request, _recipient) {
+    canCreateOutgoingRequestItem(requestItem, _request, recipient) {
+        const recipientIsOwnerOfTheAttribute = requestItem.attribute.owner.equals(recipient);
+        // When the owner of the Attribute is not the recipient of the Request, this means that
+        // we need to set the sourceAttributeId, because we have to set shareInfo as soon as the
+        // RequestItem was accepted.
+        if (!recipientIsOwnerOfTheAttribute && !requestItem.sourceAttributeId) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("'sourceAttributeId' cannot be undefined when sending an attribute that is not owned by the recipient."));
+        }
         if (requestItem.attribute instanceof content_1.IdentityAttribute) {
             return this.canCreateRequestItemWithIdentityAttribute(requestItem);
         }
@@ -2166,13 +2120,23 @@ class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
         if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
             return;
         }
-        /* TODO: in case of an own IdentityAttribute that was sent to the peer, we need to specify a source attribute; but currently we can't find the source attribute, because we don't know the id the user picked when sending the request */
-        await this.consumptionController.attributes.createPeerLocalAttribute({
-            id: responseItem.attributeId,
-            content: requestItem.attribute,
-            peer: requestInfo.peer,
-            requestReference: requestInfo.id
-        });
+        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
+            });
+        }
     }
 }
 exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcessor;
@@ -2296,7 +2260,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
     }
     async copyExistingAttribute(attributeId, requestInfo) {
         return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
-            attributeId: transport_1.CoreId.from(attributeId),
+            sourceAttributeId: transport_1.CoreId.from(attributeId),
             peer: transport_1.CoreAddress.from(requestInfo.peer),
             requestReference: transport_1.CoreId.from(requestInfo.id)
         });
@@ -2307,7 +2271,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
                 content: attribute
             });
             return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
-                attributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
+                sourceAttributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
                 peer: transport_1.CoreAddress.from(requestInfo.peer),
                 requestReference: transport_1.CoreId.from(requestInfo.id)
             });
@@ -2458,7 +2422,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
     }
     async copyExistingAttribute(attributeId, requestInfo) {
         return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
-            attributeId: transport_1.CoreId.from(attributeId),
+            sourceAttributeId: transport_1.CoreId.from(attributeId),
             peer: transport_1.CoreAddress.from(requestInfo.peer),
             requestReference: transport_1.CoreId.from(requestInfo.id)
         });
@@ -2469,7 +2433,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
                 content: attribute
             });
             return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
-                attributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
+                sourceAttributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
                 peer: transport_1.CoreAddress.from(requestInfo.peer),
                 requestReference: transport_1.CoreId.from(requestInfo.id)
             });
@@ -2586,7 +2550,7 @@ class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.G
         return ValidationResult_1.ValidationResult.success();
     }
     async accept(requestItem, _params, _requestInfo) {
-        const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
+        const attribute = (await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId));
         if (!(await this.isAttributeAlreadyShared(attribute, requestItem.shareWith))) {
             await this.shareAttribute(attribute, requestItem.shareWith);
         }
@@ -2607,7 +2571,8 @@ class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.G
     async shareAttribute(attribute, shareWith) {
         const createAttributeRequestItem = content_1.CreateAttributeRequestItem.from({
             attribute: attribute.content,
-            mustBeAccepted: true
+            mustBeAccepted: true,
+            sourceAttributeId: attribute.id
         });
         const createAttributeRequest = await this.consumptionController.outgoingRequests.create({
             peer: shareWith,