Rename thirdPartyAddress to initialAttributePeer in more Request- and ResponseItems (#828)

jkoenig134 · web-flow · commit b4ff797fdd22 · 2025-11-06T11:52:21.000+01:00
* chore: consumption

* chore: content

* chore: runtime
diff --git a/packages/consumption/src/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.ts b/packages/consumption/src/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.ts
@@ -322,14 +322,14 @@ export class ReadAttributeRequestItemProcessor extends GenericRequestItemProcess
 
             const wasNotSharedBefore = latestSharedVersion.length === 0;
             if (wasNotSharedBefore) {
-                const thirdPartyAddress =
+                const initialAttributePeer =
                     existingAttribute instanceof OwnRelationshipAttribute || existingAttribute instanceof PeerRelationshipAttribute ? existingAttribute.peer : undefined;
 
                 return ReadAttributeAcceptResponseItem.from({
                     result: ResponseItemResult.Accepted,
                     attributeId: updatedAttribute.id,
                     attribute: updatedAttribute.content,
-                    thirdPartyAddress
+                    initialAttributePeer
                 });
             }
 
@@ -443,13 +443,13 @@ export class ReadAttributeRequestItemProcessor extends GenericRequestItemProcess
             return;
         }
 
-        if (responseItem.thirdPartyAddress) {
+        if (responseItem.initialAttributePeer) {
             await this.consumptionController.attributes.createThirdPartyRelationshipAttribute({
                 id: responseItem.attributeId,
                 content: responseItem.attribute,
                 peer: requestInfo.peer,
                 sourceReference: requestInfo.id,
-                initialAttributePeer: responseItem.thirdPartyAddress
+                initialAttributePeer: responseItem.initialAttributePeer
             });
             return;
         }
diff --git a/packages/consumption/src/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.ts b/packages/consumption/src/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.ts
@@ -81,8 +81,8 @@ export class ShareAttributeRequestItemProcessor extends GenericRequestItemProces
                 );
             }
 
-            if (requestItem.thirdPartyAddress) {
-                return ValidationResult.error(ConsumptionCoreErrors.requests.invalidRequestItem("When sharing an OwnIdentityAttribute, no thirdPartyAddress may be specified."));
+            if (requestItem.initialAttributePeer) {
+                return ValidationResult.error(ConsumptionCoreErrors.requests.invalidRequestItem("When sharing an OwnIdentityAttribute, no initialAttributePeer may be specified."));
             }
 
             const tagValidationResult = await this.consumptionController.attributes.validateTagsOfAttribute(requestItem.attribute);
@@ -114,10 +114,10 @@ export class ShareAttributeRequestItemProcessor extends GenericRequestItemProces
             return ValidationResult.error(ConsumptionCoreErrors.requests.cannotShareRelationshipAttributeOfPendingRelationship());
         }
 
-        if (!requestItem.thirdPartyAddress?.equals(initialPeer)) {
+        if (!requestItem.initialAttributePeer?.equals(initialPeer)) {
             return ValidationResult.error(
                 ConsumptionCoreErrors.requests.invalidRequestItem(
-                    "When sharing a RelationshipAttribute with another Identity, the address of the peer of the Relationship in which the RelationshipAttribute exists must be specified as thirdPartyAddress."
+                    "When sharing a RelationshipAttribute with another Identity, the address of the peer of the Relationship in which the RelationshipAttribute exists must be specified as initialAttributePeer."
                 )
             );
         }
@@ -141,15 +141,15 @@ export class ShareAttributeRequestItemProcessor extends GenericRequestItemProces
             return ValidationResult.error(ConsumptionCoreErrors.requests.invalidRequestItem(tagValidationResult.error.message));
         }
 
-        if (requestItem.thirdPartyAddress && requestItem.attribute instanceof IdentityAttribute) {
+        if (requestItem.initialAttributePeer && requestItem.attribute instanceof IdentityAttribute) {
             return ValidationResult.error(
-                ConsumptionCoreErrors.requests.invalidRequestItem("The RequestItem is invalid, since it must contain a RelationshipAttribute if thirdPartyAddress is defined.")
+                ConsumptionCoreErrors.requests.invalidRequestItem("The RequestItem is invalid, since it must contain a RelationshipAttribute if initialAttributePeer is defined.")
             );
         }
 
-        if (!requestItem.thirdPartyAddress && requestItem.attribute instanceof RelationshipAttribute) {
+        if (!requestItem.initialAttributePeer && requestItem.attribute instanceof RelationshipAttribute) {
             return ValidationResult.error(
-                ConsumptionCoreErrors.requests.invalidRequestItem("The RequestItem is invalid, since it must contain an IdentityAttribute if thirdPartyAddress is undefined.")
+                ConsumptionCoreErrors.requests.invalidRequestItem("The RequestItem is invalid, since it must contain an IdentityAttribute if initialAttributePeer is undefined.")
             );
         }
 
@@ -161,7 +161,7 @@ export class ShareAttributeRequestItemProcessor extends GenericRequestItemProces
         _params: AcceptRequestItemParametersJSON,
         requestInfo: LocalRequestInfo
     ): Promise<AcceptResponseItem | AttributeAlreadySharedAcceptResponseItem> {
-        const isThirdPartyRelationshipAttribute = !!requestItem.thirdPartyAddress;
+        const isThirdPartyRelationshipAttribute = !!requestItem.initialAttributePeer;
         if (isThirdPartyRelationshipAttribute) {
             const attribute = requestItem.attribute as RelationshipAttribute;
             const existingThirdPartyRelationshipAttribute = await this.consumptionController.attributes.getThirdPartyRelationshipAttributeWithSameValue(
@@ -187,7 +187,7 @@ export class ShareAttributeRequestItemProcessor extends GenericRequestItemProces
                 content: requestItem.attribute as RelationshipAttribute,
                 peer: requestInfo.peer,
                 sourceReference: requestInfo.id,
-                initialAttributePeer: requestItem.thirdPartyAddress!
+                initialAttributePeer: requestItem.initialAttributePeer!
             });
 
             return AcceptResponseItem.from({ result: ResponseItemResult.Accepted });
diff --git a/packages/consumption/test/modules/attributes/AttributesController.test.ts b/packages/consumption/test/modules/attributes/AttributesController.test.ts
@@ -298,7 +298,7 @@ describe("AttributesController", function () {
         });
 
         test("should allow to create a ThirdPartyRelationshipAttribute", async function () {
-            const thirdPartyAddress = CoreAddress.from("thirdPartyAdress");
+            const thirdPartyAddress = CoreAddress.from("thirdPartyAddress");
             const peerAddress = CoreAddress.from("peerAddress");
 
             const thirdPartyRelationshipAttribute = await consumptionController.attributes.createThirdPartyRelationshipAttribute({
@@ -351,7 +351,7 @@ describe("AttributesController", function () {
         });
 
         test("should allow to add AttributeForwardingDetails to an OwnRelationshipAttribute", async function () {
-            const thirdPartyAddress = CoreAddress.from("thirdPartyAdress");
+            const thirdPartyAddress = CoreAddress.from("thirdPartyAddress");
             const peerAddress = CoreAddress.from("peerAddress");
 
             const ownRelationshipAttribute = await consumptionController.attributes.createOwnRelationshipAttribute({
diff --git a/packages/consumption/test/modules/notifications/itemProcessors/attributeDeleted/OwnAttributeDeletedByOwnerNotificationItemProcessor.test.ts b/packages/consumption/test/modules/notifications/itemProcessors/attributeDeleted/OwnAttributeDeletedByOwnerNotificationItemProcessor.test.ts
@@ -172,7 +172,7 @@ describe("OwnAttributeDeletedByOwnerNotificationItemProcessor", function () {
             }),
             peer: CoreAddress.from("peer"),
             sourceReference: CoreId.from("reqRef"),
-            initialAttributePeer: CoreAddress.from("initialAttributePeer"),
+            initialAttributePeer: CoreAddress.from("thirdPartyAddress"),
             id: CoreId.from("attributeId")
         });
 
diff --git a/packages/consumption/test/modules/notifications/itemProcessors/attributeDeleted/PeerRelationshipAttributeDeletedByPeerNotificationItemProcessor.test.ts b/packages/consumption/test/modules/notifications/itemProcessors/attributeDeleted/PeerRelationshipAttributeDeletedByPeerNotificationItemProcessor.test.ts
@@ -112,12 +112,12 @@ describe("PeerRelationshipAttributeDeletedByPeerNotificationItemProcessor", func
                     value: "aValue",
                     title: "aTitle"
                 },
-                owner: CoreAddress.from("initialAttributePeer"),
+                owner: CoreAddress.from("thirdPartyAddress"),
                 confidentiality: RelationshipAttributeConfidentiality.Public
             }),
             peer: CoreAddress.from("peer"),
             sourceReference: CoreId.from("reqRef"),
-            initialAttributePeer: CoreAddress.from("initialAttributePeer"),
+            initialAttributePeer: CoreAddress.from("thirdPartyAddress"),
             id: CoreId.from("attributeId")
         });
 
diff --git a/packages/consumption/test/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.test.ts b/packages/consumption/test/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.test.ts
@@ -2069,7 +2069,7 @@ describe("ReadAttributeRequestItemProcessor", function () {
                 const result = await processor.accept(requestItem, acceptParams, incomingRequest);
 
                 expect(result).toBeInstanceOf(ReadAttributeAcceptResponseItem);
-                expect((result as ReadAttributeAcceptResponseItem).thirdPartyAddress).toStrictEqual(peerAddress);
+                expect((result as ReadAttributeAcceptResponseItem).initialAttributePeer).toStrictEqual(peerAddress);
                 expect((result as ReadAttributeAcceptResponseItem).attributeId).toStrictEqual(ownRelationshipAttribute.id);
 
                 const updatedOwnRelationshipAttribute = (await consumptionController.attributes.getLocalAttribute(ownRelationshipAttribute.id)) as OwnRelationshipAttribute;
@@ -2118,7 +2118,7 @@ describe("ReadAttributeRequestItemProcessor", function () {
                 const result = await processor.accept(requestItem, acceptParams, incomingRequest);
 
                 expect(result).toBeInstanceOf(ReadAttributeAcceptResponseItem);
-                expect((result as ReadAttributeAcceptResponseItem).thirdPartyAddress).toStrictEqual(peerAddress);
+                expect((result as ReadAttributeAcceptResponseItem).initialAttributePeer).toStrictEqual(peerAddress);
                 expect((result as ReadAttributeAcceptResponseItem).attributeId).toStrictEqual(peerRelationshipAttribute.id);
 
                 const updatedPeerRelationshipAttribute = (await consumptionController.attributes.getLocalAttribute(peerRelationshipAttribute.id)) as PeerRelationshipAttribute;
diff --git a/packages/consumption/test/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.test.ts b/packages/consumption/test/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.test.ts
@@ -198,7 +198,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: false,
                 attribute: attribute.content,
                 attributeId: attribute.id,
-                thirdPartyAddress: !(testParams.attribute instanceof IdentityAttribute)
+                initialAttributePeer: !(testParams.attribute instanceof IdentityAttribute)
                     ? testParams.attribute.owner.equals(sender)
                         ? aThirdParty
                         : testParams.attribute.owner
@@ -673,14 +673,14 @@ describe("ShareAttributeRequestItemProcessor", function () {
 
                 peer: aThirdParty,
                 sourceReference: CoreId.from("aSourceReferenceId"),
-                initialAttributePeer: CoreAddress.from("initialAttributePeer"),
+                initialAttributePeer: CoreAddress.from("thirdPartyAddress"),
                 id: CoreId.from("aThirdPartyRelationshipAttributeId")
             });
             const requestItem = ShareAttributeRequestItem.from({
                 mustBeAccepted: false,
                 attribute: relationshipAttribute.content,
                 attributeId: relationshipAttribute.id,
-                thirdPartyAddress: aThirdParty
+                initialAttributePeer: aThirdParty
             });
             const request = Request.from({ items: [requestItem] });
 
@@ -710,7 +710,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: false,
                 attribute: initialRelationshipAttribute.content,
                 attributeId: initialRelationshipAttribute.id,
-                thirdPartyAddress: aThirdParty
+                initialAttributePeer: aThirdParty
             });
             const request = Request.from({ items: [requestItem] });
 
@@ -753,7 +753,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: false,
                 attribute: initialRelationshipAttribute.content,
                 attributeId: initialRelationshipAttribute.id,
-                thirdPartyAddress: aThirdParty
+                initialAttributePeer: aThirdParty
             });
             const request = Request.from({ items: [requestItem] });
 
@@ -793,7 +793,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: false,
                 attribute: initialRelationshipAttribute.content,
                 attributeId: initialRelationshipAttribute.id,
-                thirdPartyAddress: aThirdParty
+                initialAttributePeer: aThirdParty
             });
             const request = Request.from({ items: [requestItem] });
 
@@ -821,7 +821,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: false,
                 attribute: relationshipAttribute.content,
                 attributeId: relationshipAttribute.id,
-                thirdPartyAddress: relationshipAttribute.peer
+                initialAttributePeer: relationshipAttribute.peer
             });
             const request = Request.from({ items: [requestItem] });
 
@@ -865,7 +865,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: true,
                 attribute: ownRelationshipAttribute.content,
                 attributeId: ownRelationshipAttribute.id,
-                thirdPartyAddress: ownRelationshipAttribute.peer
+                initialAttributePeer: ownRelationshipAttribute.peer
             });
             const request = Request.from({ items: [requestItem] });
 
@@ -1051,7 +1051,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: true,
                 attributeId: CoreId.from("anAttributeId"),
                 attribute: TestObjectFactory.createRelationshipAttribute({ owner: sender }),
-                thirdPartyAddress: CoreAddress.from("aThirdParty")
+                initialAttributePeer: CoreAddress.from("aThirdParty")
             });
 
             const incomingRequest = LocalRequest.from({
@@ -1093,7 +1093,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: true,
                 attributeId: CoreId.from("anotherAttributeId"),
                 attribute: TestObjectFactory.createRelationshipAttribute({ owner: sender }),
-                thirdPartyAddress: aThirdParty
+                initialAttributePeer: aThirdParty
             });
 
             const incomingRequest = LocalRequest.from({
@@ -1123,7 +1123,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: true,
                 attributeId: CoreId.from("anotherAttributeId"),
                 attribute: TestObjectFactory.createRelationshipAttribute({ owner: sender }),
-                thirdPartyAddress: aThirdParty
+                initialAttributePeer: aThirdParty
             });
 
             const incomingRequest = LocalRequest.from({
@@ -1162,7 +1162,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
                 mustBeAccepted: true,
                 attributeId: CoreId.from("anotherAttributeId"),
                 attribute: TestObjectFactory.createRelationshipAttribute({ owner: sender }),
-                thirdPartyAddress: aThirdParty
+                initialAttributePeer: aThirdParty
             });
 
             const incomingRequest = LocalRequest.from({
@@ -1344,7 +1344,7 @@ describe("ShareAttributeRequestItemProcessor", function () {
             mustBeAccepted: true,
             attribute: sharedAttribute.content,
             attributeId: sharedAttribute.id,
-            thirdPartyAddress: sharedAttribute.content instanceof RelationshipAttribute ? (sharedAttribute as OwnRelationshipAttribute).peer : undefined
+            initialAttributePeer: sharedAttribute.content instanceof RelationshipAttribute ? (sharedAttribute as OwnRelationshipAttribute).peer : undefined
         });
 
         const requestId = await ConsumptionIds.request.generate();
diff --git a/packages/content/src/requests/items/readAttribute/ReadAttributeAcceptResponseItem.ts b/packages/content/src/requests/items/readAttribute/ReadAttributeAcceptResponseItem.ts
@@ -7,13 +7,13 @@ export interface ReadAttributeAcceptResponseItemJSON extends AcceptResponseItemJ
     "@type": "ReadAttributeAcceptResponseItem";
     attributeId: string;
     attribute: IdentityAttributeJSON | RelationshipAttributeJSON;
-    thirdPartyAddress?: string;
+    initialAttributePeer?: string;
 }
 
 export interface IReadAttributeAcceptResponseItem extends IAcceptResponseItem {
     attributeId: ICoreId;
     attribute: IIdentityAttribute | IRelationshipAttribute;
-    thirdPartyAddress?: CoreAddress;
+    initialAttributePeer?: CoreAddress;
 }
 
 @type("ReadAttributeAcceptResponseItem")
@@ -28,7 +28,7 @@ export class ReadAttributeAcceptResponseItem extends AcceptResponseItem implemen
 
     @serialize()
     @validate({ nullable: true })
-    public thirdPartyAddress?: CoreAddress;
+    public initialAttributePeer?: CoreAddress;
 
     public static override from(
         value: IReadAttributeAcceptResponseItem | Omit<ReadAttributeAcceptResponseItemJSON, "@type"> | ReadAttributeAcceptResponseItemJSON
diff --git a/packages/content/src/requests/items/shareAttribute/ShareAttributeRequestItem.ts b/packages/content/src/requests/items/shareAttribute/ShareAttributeRequestItem.ts
@@ -8,13 +8,13 @@ export interface ShareAttributeRequestItemJSON extends RequestItemJSON {
     "@type": "ShareAttributeRequestItem";
     attribute: IdentityAttributeJSON | RelationshipAttributeJSON;
     attributeId: string;
-    thirdPartyAddress?: string;
+    initialAttributePeer?: string;
 }
 
 export interface IShareAttributeRequestItem extends IRequestItem {
     attribute: IIdentityAttribute | IRelationshipAttribute;
     attributeId: ICoreId;
-    thirdPartyAddress?: CoreAddress;
+    initialAttributePeer?: CoreAddress;
 }
 
 @type("ShareAttributeRequestItem")
@@ -29,7 +29,7 @@ export class ShareAttributeRequestItem extends RequestItem implements IShareAttr
 
     @serialize()
     @validate({ nullable: true })
-    public thirdPartyAddress?: CoreAddress;
+    public initialAttributePeer?: CoreAddress;
 
     public static from(value: IShareAttributeRequestItem | Omit<ShareAttributeRequestItemJSON, "@type"> | ShareAttributeRequestItemJSON): ShareAttributeRequestItem {
         return this.fromAny(value);
diff --git a/packages/runtime/src/dataViews/content/RequestItemDVOs.ts b/packages/runtime/src/dataViews/content/RequestItemDVOs.ts
@@ -46,7 +46,7 @@ export interface DeleteAttributeRequestItemDVO extends RequestItemDVO {
 export interface ShareAttributeRequestItemDVO extends RequestItemDVO {
     type: "ShareAttributeRequestItemDVO";
     attributeId: string;
-    thirdPartyAddress?: string;
+    initialAttributePeer?: string;
     attribute: DraftIdentityAttributeDVO;
 }
 
diff --git a/packages/runtime/src/dataViews/content/ResponseItemDVOs.ts b/packages/runtime/src/dataViews/content/ResponseItemDVOs.ts
@@ -43,7 +43,7 @@ export interface AcceptResponseItemDVO extends ResponseItemDVO {
 export interface ReadAttributeAcceptResponseItemDVO extends AcceptResponseItemDVO {
     type: "ReadAttributeAcceptResponseItemDVO";
     attributeId: string;
-    thirdPartyAddress?: string;
+    initialAttributePeer?: string;
     attribute: LocalAttributeDVO;
 }
 
diff --git a/packages/runtime/src/useCases/common/Schemas.ts b/packages/runtime/src/useCases/common/Schemas.ts
@@ -1919,7 +1919,7 @@ export const CanCreateOutgoingRequestRequest: any = {
                 "attributeId": {
                     "type": "string"
                 },
-                "thirdPartyAddress": {
+                "initialAttributePeer": {
                     "type": "string"
                 }
             },
@@ -4585,7 +4585,7 @@ export const CompleteOutgoingRequestRequest: any = {
                         }
                     ]
                 },
-                "thirdPartyAddress": {
+                "initialAttributePeer": {
                     "type": "string"
                 }
             },
@@ -6551,7 +6551,7 @@ export const CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseReq
                         }
                     ]
                 },
-                "thirdPartyAddress": {
+                "initialAttributePeer": {
                     "type": "string"
                 }
             },
@@ -8446,7 +8446,7 @@ export const CreateOutgoingRequestRequest: any = {
                 "attributeId": {
                     "type": "string"
                 },
-                "thirdPartyAddress": {
+                "initialAttributePeer": {
                     "type": "string"
                 }
             },
@@ -11430,7 +11430,7 @@ export const ReceivedIncomingRequestRequest: any = {
                 "attributeId": {
                     "type": "string"
                 },
-                "thirdPartyAddress": {
+                "initialAttributePeer": {
                     "type": "string"
                 }
             },
diff --git a/packages/runtime/test/consumption/attributes.test.ts b/packages/runtime/test/consumption/attributes.test.ts
diff --git a/packages/runtime/test/dataViews/OwnRelationshipAttributeDVO.test.ts b/packages/runtime/test/dataViews/OwnRelationshipAttributeDVO.test.ts
diff --git a/packages/runtime/test/dataViews/PeerRelationshipAttributeDVO.test.ts b/packages/runtime/test/dataViews/PeerRelationshipAttributeDVO.test.ts
diff --git a/packages/runtime/test/dataViews/ThirdPartyRelationshipAttributeDVO.test.ts b/packages/runtime/test/dataViews/ThirdPartyRelationshipAttributeDVO.test.ts
diff --git a/packages/runtime/test/modules/DeciderModule.test.ts b/packages/runtime/test/modules/DeciderModule.test.ts
diff --git a/packages/runtime/test/modules/RequestModule.test.ts b/packages/runtime/test/modules/RequestModule.test.ts

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export interface DeleteAttributeRequestItemDVO extends RequestItemDVO {`
`46`	`46`	`export interface ShareAttributeRequestItemDVO extends RequestItemDVO {`
`47`	`47`	`type: "ShareAttributeRequestItemDVO";`
`48`	`48`	`attributeId: string;`
`49`		`- thirdPartyAddress?: string;`
	`49`	`+ initialAttributePeer?: string;`
`50`	`50`	`attribute: DraftIdentityAttributeDVO;`
`51`	`51`	`}`
`52`	`52`