Add thirdPartyAddress to the Attribute's shareInfo

packages/consumption/src/modules/attributes/AttributesController.ts

@@ -340,7 +340,8 @@ export class AttributesController extends ConsumptionBaseController {
         const shareInfo = LocalAttributeShareInfo.from({
             peer: parsedParams.peer,
             requestReference: parsedParams.requestReference,
-            sourceAttribute: parsedParams.sourceAttributeId
+            sourceAttribute: parsedParams.sourceAttributeId,
+            thirdPartyAddress: parsedParams.thirdPartyAddress
         });
 
         const sharedLocalAttributeCopy = await LocalAttribute.fromAttribute(sourceAttribute.content, undefined, shareInfo, parsedParams.attributeId);
@@ -353,7 +354,8 @@ export class AttributesController extends ConsumptionBaseController {
     public async createSharedLocalAttribute(params: ICreateSharedLocalAttributeParams): Promise<LocalAttribute> {
         const shareInfo = LocalAttributeShareInfo.from({
             peer: params.peer,
-            requestReference: params.requestReference
+            requestReference: params.requestReference,
+            thirdPartyAddress: params.thirdPartyAddress
         });
         const peerLocalAttribute = LocalAttribute.from({
             id: params.id ?? (await ConsumptionIds.attribute.generate()),

packages/consumption/src/modules/attributes/local/CreateSharedLocalAttributeCopyParams.ts

@@ -6,13 +6,15 @@ export interface CreateSharedLocalAttributeCopyParamsJSON {
     sourceAttributeId: string;
     peer: string;
     requestReference: string;
+    thirdPartyAddress?: string;
 }
 
 export interface ICreateSharedLocalAttributeCopyParams extends ISerializable {
     attributeId?: ICoreId;
     sourceAttributeId: ICoreId;
     peer: ICoreAddress;
     requestReference: ICoreId;
+    thirdPartyAddress?: ICoreAddress;
 }
 
 export class CreateSharedLocalAttributeCopyParams extends Serializable implements ICreateSharedLocalAttributeCopyParams {
@@ -32,6 +34,10 @@ export class CreateSharedLocalAttributeCopyParams extends Serializable implement
     @validate()
     public requestReference: CoreId;
 
+    @serialize()
+    @validate({ nullable: true })
+    public thirdPartyAddress: CoreAddress;
+
     public static from(value: ICreateSharedLocalAttributeCopyParams | CreateSharedLocalAttributeCopyParamsJSON): CreateSharedLocalAttributeCopyParams {
         return this.fromAny(value);
     }

packages/consumption/src/modules/attributes/local/CreateSharedLocalAttributeParams.ts

@@ -7,13 +7,15 @@ export interface CreateSharedLocalAttributeParamsJSON {
     content: IdentityAttributeJSON | RelationshipAttributeJSON;
     requestReferece: string;
     peer: string;
+    thirdPartyAddress?: string;
 }
 
 export interface ICreateSharedLocalAttributeParams extends ISerializable {
     id?: ICoreId; // needs to be optional because sometimes (e.g. when accepting a CreateAttributeRequestItem) the id is not known yet
     content: IIdentityAttribute | IRelationshipAttribute;
     requestReference: ICoreId;
     peer: ICoreAddress;
+    thirdPartyAddress?: ICoreAddress;
 }
 
 export class CreateSharedLocalAttributeParams extends Serializable implements ICreateSharedLocalAttributeParams {
@@ -33,6 +35,10 @@ export class CreateSharedLocalAttributeParams extends Serializable implements IC
     @validate()
     public peer: CoreAddress;
 
+    @serialize()
+    @validate({ nullable: true })
+    public thirdPartyAddress: CoreAddress;
+
     public static from(value: ICreateSharedLocalAttributeParams | CreateSharedLocalAttributeParamsJSON): CreateSharedLocalAttributeParams {
         return this.fromAny(value);
     }

packages/consumption/src/modules/attributes/local/LocalAttributeShareInfo.ts

@@ -3,22 +3,22 @@ import { CoreAddress, CoreId, ICoreAddress, ICoreId } from "@nmshd/core-types";
 import { nameof } from "ts-simple-nameof";
 import { ConsumptionError } from "../../../consumption/ConsumptionError";
 
-/* Either of requestReference or noticicationReference must be set, but not both. */
+/* Either of requestReference or notificationReference must be set, but not both. */
 export interface LocalAttributeShareInfoJSON {
     requestReference?: string;
     notificationReference?: string;
-
     peer: string;
     sourceAttribute?: string;
+    thirdPartyAddress?: string;
 }
 
-/* Either of requestReference or noticicationReference must be set, but not both. */
+/* Either of requestReference or notificationReference must be set, but not both. */
 export interface ILocalAttributeShareInfo extends ISerializable {
     requestReference?: ICoreId;
     notificationReference?: ICoreId;
-
     peer: ICoreAddress;
     sourceAttribute?: ICoreId;
+    thirdPartyAddress?: ICoreAddress;
 }
 
 export class LocalAttributeShareInfo extends Serializable implements ILocalAttributeShareInfo {
@@ -38,6 +38,10 @@ export class LocalAttributeShareInfo extends Serializable implements ILocalAttri
     @validate({ nullable: true })
     public sourceAttribute?: CoreId;
 
+    @serialize()
+    @validate({ nullable: true })
+    public thirdPartyAddress: CoreAddress;
+
     public static from(value: ILocalAttributeShareInfo | LocalAttributeShareInfoJSON): LocalAttributeShareInfo {
         return super.fromAny(value) as LocalAttributeShareInfo;
     }

packages/consumption/src/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.ts

@@ -225,12 +225,14 @@ export class ReadAttributeRequestItemProcessor extends GenericRequestItemProcess
                 sharedLocalAttribute = await this.consumptionController.attributes.createSharedLocalAttributeCopy({
                     sourceAttributeId: CoreId.from(existingSourceAttribute.id),
                     peer: CoreAddress.from(requestInfo.peer),
-                    requestReference: CoreId.from(requestInfo.id)
+                    requestReference: CoreId.from(requestInfo.id),
+                    thirdPartyAddress: existingSourceAttribute.shareInfo?.peer ? CoreAddress.from(existingSourceAttribute.shareInfo.peer) : undefined
                 });
                 return ReadAttributeAcceptResponseItem.from({
                     result: ResponseItemResult.Accepted,
                     attributeId: sharedLocalAttribute.id,
-                    attribute: sharedLocalAttribute.content
+                    attribute: sharedLocalAttribute.content,
+                    thirdPartyAddress: sharedLocalAttribute.shareInfo?.thirdPartyAddress
                 });
             }
 
@@ -361,7 +363,8 @@ export class ReadAttributeRequestItemProcessor extends GenericRequestItemProcess
                 id: responseItem.attributeId,
                 content: responseItem.attribute,
                 peer: requestInfo.peer,
-                requestReference: requestInfo.id
+                requestReference: requestInfo.id,
+                thirdPartyAddress: responseItem.thirdPartyAddress
             });
         }
 

packages/consumption/src/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.ts

@@ -8,7 +8,7 @@ import {
     ShareAttributeAcceptResponseItem,
     ShareAttributeRequestItem
 } from "@nmshd/content";
-import { CoreAddress } from "@nmshd/core-types";
+import { CoreAddress, CoreError } from "@nmshd/core-types";
 import { RelationshipStatus } from "@nmshd/transport";
 import _ from "lodash";
 import { ConsumptionCoreErrors } from "../../../../consumption/ConsumptionCoreErrors";
@@ -130,6 +130,18 @@ export class ShareAttributeRequestItemProcessor extends GenericRequestItemProces
             if (nonPendingRelationshipsToPeer.length === 0) {
                 return ValidationResult.error(ConsumptionCoreErrors.requests.cannotShareRelationshipAttributeOfPendingRelationship());
             }
+
+            if (recipient && !foundAttribute.shareInfo.peer.equals(recipient) && !requestItem.thirdPartyAddress) {
+                return ValidationResult.error(
+                    ConsumptionCoreErrors.requests.invalidRequestItem(
+                        "The source attribute provided is a relationship attribute. You must provide a third party address that is the original peer when sharing with a third party."
+                    )
+                );
+            }
+
+            if (requestItem.thirdPartyAddress && !requestItem.thirdPartyAddress.equals(foundAttribute.shareInfo.peer)) {
+                return ValidationResult.error(new CoreError("The third party address must be the peer of the relationship attribute."));
+            }
         }
 
         if (requestItem.attribute instanceof IdentityAttribute) {
@@ -172,7 +184,8 @@ export class ShareAttributeRequestItemProcessor extends GenericRequestItemProces
         const localAttribute = await this.consumptionController.attributes.createSharedLocalAttribute({
             content: requestItem.attribute,
             peer: requestInfo.peer,
-            requestReference: requestInfo.id
+            requestReference: requestInfo.id,
+            thirdPartyAddress: requestItem.thirdPartyAddress
         });
 
         return ShareAttributeAcceptResponseItem.from({
@@ -194,7 +207,8 @@ export class ShareAttributeRequestItemProcessor extends GenericRequestItemProces
             attributeId: responseItem.attributeId,
             sourceAttributeId: requestItem.sourceAttributeId,
             peer: requestInfo.peer,
-            requestReference: requestInfo.id
+            requestReference: requestInfo.id,
+            thirdPartyAddress: requestItem.thirdPartyAddress
         });
     }
 }

packages/consumption/test/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.test.ts

@@ -138,27 +138,32 @@ describe("ShareAttributeRequestItemProcessor", function () {
             const sender = testAccount.identity.address;
             const recipient = CoreAddress.from("Recipient");
 
+            // eslint-disable-next-line jest/no-conditional-in-test
             if (testParams.attribute.owner.address === "Sender") {
                 testParams.attribute.owner = sender;
             }
 
+            // eslint-disable-next-line jest/no-conditional-in-test
             if (testParams.attribute.owner.address === "Recipient") {
                 testParams.attribute.owner = recipient;
             }
 
             let sourceAttribute;
 
+            // eslint-disable-next-line jest/no-conditional-in-test
             if (testParams.attribute instanceof IdentityAttribute) {
                 sourceAttribute = await consumptionController.attributes.createAttributeUnsafe({
                     content: {
                         ...testParams.attribute.toJSON(),
+                        // eslint-disable-next-line jest/no-conditional-in-test
                         owner: testParams.attribute.owner.equals("") ? sender : testParams.attribute.owner
                     } as IIdentityAttribute
                 });
             } else {
                 sourceAttribute = await consumptionController.attributes.createSharedLocalAttribute({
                     content: {
                         ...testParams.attribute.toJSON(),
+                        // eslint-disable-next-line jest/no-conditional-in-test
                         owner: testParams.attribute.owner.equals("") ? sender : testParams.attribute.owner
                     } as IRelationshipAttribute,
                     peer: aThirdParty,
@@ -169,12 +174,14 @@ describe("ShareAttributeRequestItemProcessor", function () {
             const requestItem = ShareAttributeRequestItem.from({
                 mustBeAccepted: false,
                 attribute: sourceAttribute.content,
-                sourceAttributeId: sourceAttribute.id
+                sourceAttributeId: sourceAttribute.id,
+                thirdPartyAddress: aThirdParty
             });
             const request = Request.from({ items: [requestItem] });
 
             const result = await processor.canCreateOutgoingRequestItem(requestItem, request, recipient);
 
+            // eslint-disable-next-line jest/no-conditional-in-test
             if (testParams.result === "success") {
                 // eslint-disable-next-line jest/no-conditional-expect
                 expect(result).successfulValidationResult();
@@ -861,7 +868,8 @@ describe("ShareAttributeRequestItemProcessor", function () {
             const requestItem = ShareAttributeRequestItem.from({
                 mustBeAccepted: false,
                 attribute: initialRelationshipAttribute.content,
-                sourceAttributeId: initialRelationshipAttribute.id
+                sourceAttributeId: initialRelationshipAttribute.id,
+                thirdPartyAddress: aThirdParty
             });
             const request = Request.from({ items: [requestItem] });
 
@@ -908,7 +916,8 @@ describe("ShareAttributeRequestItemProcessor", function () {
             const requestItem = ShareAttributeRequestItem.from({
                 mustBeAccepted: false,
                 attribute: initialRelationshipAttribute.content,
-                sourceAttributeId: initialRelationshipAttribute.id
+                sourceAttributeId: initialRelationshipAttribute.id,
+                thirdPartyAddress: aThirdParty
             });
             const request = Request.from({ items: [requestItem] });
 

packages/content/src/requests/items/readAttribute/ReadAttributeAcceptResponseItem.ts

@@ -1,17 +1,19 @@
 import { serialize, type, validate } from "@js-soft/ts-serval";
-import { CoreId, ICoreId } from "@nmshd/core-types";
+import { CoreAddress, CoreId, ICoreId } from "@nmshd/core-types";
 import { IdentityAttribute, IdentityAttributeJSON, IIdentityAttribute, IRelationshipAttribute, RelationshipAttribute, RelationshipAttributeJSON } from "../../../attributes";
 import { AcceptResponseItem, AcceptResponseItemJSON, IAcceptResponseItem } from "../../response";
 
 export interface ReadAttributeAcceptResponseItemJSON extends AcceptResponseItemJSON {
     "@type": "ReadAttributeAcceptResponseItem";
     attributeId: string;
     attribute: IdentityAttributeJSON | RelationshipAttributeJSON;
+    thirdPartyAddress?: string;
 }
 
 export interface IReadAttributeAcceptResponseItem extends IAcceptResponseItem {
     attributeId: ICoreId;
     attribute: IIdentityAttribute | IRelationshipAttribute;
+    thirdPartyAddress?: CoreAddress;
 }
 
 @type("ReadAttributeAcceptResponseItem")
@@ -24,6 +26,10 @@ export class ReadAttributeAcceptResponseItem extends AcceptResponseItem implemen
     @validate()
     public attribute: IdentityAttribute | RelationshipAttribute;
 
+    @serialize()
+    @validate({ nullable: true })
+    public thirdPartyAddress?: CoreAddress;
+
     public static override from(
         value: IReadAttributeAcceptResponseItem | Omit<ReadAttributeAcceptResponseItemJSON, "@type"> | ReadAttributeAcceptResponseItemJSON
     ): ReadAttributeAcceptResponseItem {

packages/content/src/requests/items/shareAttribute/ShareAttributeRequestItem.ts

@@ -1,5 +1,5 @@
 import { serialize, type, validate } from "@js-soft/ts-serval";
-import { CoreId, ICoreId } from "@nmshd/core-types";
+import { CoreAddress, CoreId, ICoreId } from "@nmshd/core-types";
 import { RequestItemJSON } from "../..";
 import { IdentityAttribute, IdentityAttributeJSON, IIdentityAttribute, IRelationshipAttribute, RelationshipAttribute, RelationshipAttributeJSON } from "../../../attributes";
 import { IRequestItem, RequestItem } from "../../RequestItem";
@@ -8,11 +8,13 @@ export interface ShareAttributeRequestItemJSON extends RequestItemJSON {
     "@type": "ShareAttributeRequestItem";
     attribute: IdentityAttributeJSON | RelationshipAttributeJSON;
     sourceAttributeId: string;
+    thirdPartyAddress?: string;
 }
 
 export interface IShareAttributeRequestItem extends IRequestItem {
     attribute: IIdentityAttribute | IRelationshipAttribute;
     sourceAttributeId: ICoreId;
+    thirdPartyAddress?: CoreAddress;
 }
 
 @type("ShareAttributeRequestItem")
@@ -25,6 +27,10 @@ export class ShareAttributeRequestItem extends RequestItem implements IShareAttr
     @validate()
     public sourceAttributeId: CoreId;
 
+    @serialize()
+    @validate({ nullable: true })
+    public thirdPartyAddress?: CoreAddress;
+
     public static from(value: IShareAttributeRequestItem | Omit<ShareAttributeRequestItemJSON, "@type"> | ShareAttributeRequestItemJSON): ShareAttributeRequestItem {
         return this.fromAny(value);
     }

packages/runtime/src/modules/AttributeListenerModule.ts

@@ -100,6 +100,10 @@ export class AttributeListenerModule extends RuntimeModule {
             metadata: { attributeListenerId: attributeListener.id }
         };
 
+        if (attribute.content["@type"] === "RelationshipAttribute" && attributeListener.peer !== attribute.shareInfo?.peer) {
+            requestItem.thirdPartyAddress = attribute.shareInfo?.peer;
+        }
+
         const validationResult = await services.consumptionServices.outgoingRequests.canCreate({
             content: { items: [requestItem] },
             peer: attributeListener.peer

packages/runtime/src/types/consumption/LocalAttributeDTO.ts

@@ -5,6 +5,7 @@ export interface LocalAttributeShareInfoDTO {
     notificationReference?: string;
     peer: string;
     sourceAttribute?: string;
+    thirdPartyAddress?: string;
 }
 
 export enum LocalAttributeDeletionStatus {