@nmshd/consumption 2.0.0-alpha.26 → 2.0.0-alpha.29

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.26",
-    build: "46",
-    date: "2022-07-06T13:53:17+00:00",
-    commit: "b07ccf5a6db88a9deae7622e1b57a00d3dc5f21b",
+    version: "2.0.0-alpha.29",
+    build: "49",
+    date: "2022-07-11T08:42:45+00:00",
+    commit: "ef1ee4d2fd7cd13d85238e6ed6ac8ba98c744230",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.0.1","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -426,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;
     }
@@ -596,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)(),
@@ -651,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
@@ -2067,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);
         }
@@ -2102,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;
@@ -2232,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)
         });
@@ -2243,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)
             });
@@ -2297,10 +2325,10 @@ const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transpor
 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 {
     isWithExistingAttribute() {
-        return this.attributeId !== undefined;
+        return this.existingAttributeId !== undefined;
     }
     isWithNewAttribute() {
-        return this.newAttributeValue !== undefined;
+        return this.newAttribute !== undefined;
     }
     static from(value) {
         return this.fromAny(value);
@@ -2308,11 +2336,11 @@ let AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemPar
     static postFrom(value) {
         if (!(value instanceof AcceptReadAttributeRequestItemParameters_1))
             throw new Error("this should never happen");
-        if (value.attributeId && value.newAttributeValue) {
-            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.newAttributeValue), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.newAttributeValue)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
+        if (value.existingAttributeId && value.newAttribute) {
+            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.newAttribute), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.newAttribute)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.existingAttributeId)}.`);
         }
-        if (!value.attributeId && !value.newAttributeValue) {
-            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.newAttributeValue), `You have to specify either ${(0, ts_simple_nameof_1.nameof)((x) => x.newAttributeValue)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
+        if (!value.existingAttributeId && !value.newAttribute) {
+            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.newAttribute), `You have to specify either ${(0, ts_simple_nameof_1.nameof)((x) => x.newAttribute)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.existingAttributeId)}.`);
         }
         return value;
     }
@@ -2321,12 +2349,12 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)({ nullable: true }),
     __metadata("design:type", transport_1.CoreId)
-], AcceptReadAttributeRequestItemParameters.prototype, "attributeId", void 0);
+], AcceptReadAttributeRequestItemParameters.prototype, "existingAttributeId", void 0);
 __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, "newAttributeValue", void 0);
+], AcceptReadAttributeRequestItemParameters.prototype, "newAttribute", void 0);
 AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemParameters_1 = __decorate([
     (0, ts_serval_1.type)("AcceptReadAttributeRequestItemParameters")
 ], AcceptReadAttributeRequestItemParameters);
@@ -2367,7 +2395,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
     async canAccept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptReadAttributeRequestItemParameters_1.AcceptReadAttributeRequestItemParameters.from(params);
         if (parsedParams.isWithExistingAttribute()) {
-            const foundAttribute = await this.consumptionController.attributes.getLocalAttribute(parsedParams.attributeId);
+            const foundAttribute = await this.consumptionController.attributes.getLocalAttribute(parsedParams.existingAttributeId);
             if (!foundAttribute) {
                 return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
             }
@@ -2381,10 +2409,10 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
         const parsedParams = AcceptReadAttributeRequestItemParameters_1.AcceptReadAttributeRequestItemParameters.from(params);
         let sharedLocalAttribute;
         if (parsedParams.isWithExistingAttribute()) {
-            sharedLocalAttribute = await this.copyExistingAttribute(parsedParams.attributeId, requestInfo);
+            sharedLocalAttribute = await this.copyExistingAttribute(parsedParams.existingAttributeId, requestInfo);
         }
         else {
-            sharedLocalAttribute = await this.createNewAttribute(parsedParams.newAttributeValue, requestInfo);
+            sharedLocalAttribute = await this.createNewAttribute(parsedParams.newAttribute, requestInfo);
         }
         return content_1.ReadAttributeAcceptResponseItem.from({
             result: content_1.ResponseItemResult.Accepted,
@@ -2394,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)
         });
@@ -2405,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)
             });
@@ -2522,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);
         }
@@ -2543,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,