Merge branch 'main' into release/openid4vc

Author: tnotheis

.dev/compose.backbone.yml

@@ -89,7 +89,7 @@ services:
   database:
     container_name: bkb-postgres
     hostname: postgres
-    image: postgres@sha256:1ffc019dae94eca6b09a49ca67d37398951346de3c3d0cfe23d8d4ca33da83fb
+    image: postgres@sha256:41fc5342eefba6cc2ccda736aaf034bbbb7c3df0fdb81516eba1ba33f360162c
     environment:
       - POSTGRES_PASSWORD=Passw0rd
       - POSTGRES_DB=enmeshed

package-lock.json

@@ -34,7 +34,7 @@
         "@types/libsodium-wrappers": "^0.7.14",
         "@types/node": "^24.10.0",
         "enhanced-publish": "^1.1.6",
-        "eslint": "^9.39.0",
+        "eslint": "^9.39.1",
         "jest": "^30.2.0",
         "jest-expect-message": "^1.1.3",
         "madge": "^8.0.0",

package.json

@@ -809,6 +809,8 @@ export class AttributesController extends ConsumptionBaseController {
         if (!attribute) throw TransportCoreErrors.general.recordNotFound(LocalAttribute, attributeId.toString());
 
         await this.deleteAttributeUnsafe(attributeId);
+        await this._deleteForwardingDetails({ attributeId: attribute.id.toString() });
+
         this.eventBus.publish(new AttributeDeletedEvent(this.identity.address.toString(), attribute));
     }
 
@@ -826,25 +828,28 @@ export class AttributesController extends ConsumptionBaseController {
             "@type": { $in: ["OwnIdentityAttribute", "OwnRelationshipAttribute", "PeerRelationshipAttribute"] }
         })) as (OwnIdentityAttribute | OwnRelationshipAttribute | PeerRelationshipAttribute)[];
         for (const attribute of forwardedAttributes) {
-            await this.removeForwardingDetailsFromAttribute(attribute, peer);
+            await this.deleteForwardingDetailsForAttribute(attribute, peer);
         }
     }
 
-    public async removeForwardingDetailsFromAttribute<T extends OwnIdentityAttribute | OwnRelationshipAttribute | PeerRelationshipAttribute>(
-        attribute: T,
-        peer: CoreAddress
-    ): Promise<T> {
-        const existingForwardingDetailsDocs = await this.forwardingDetails.find({ attributeId: attribute.id.toString(), peer: peer.toString() });
-        const existingForwardingDetails = existingForwardingDetailsDocs.map((obj) => AttributeForwardingDetails.from(obj));
+    public async deleteForwardingDetailsForAttribute(attribute: OwnIdentityAttribute | OwnRelationshipAttribute | PeerRelationshipAttribute, peer?: CoreAddress): Promise<void> {
+        const query: any = { attributeId: attribute.id.toString() };
+        if (peer) query["peer"] = peer.toString();
 
-        for (const entry of existingForwardingDetails) {
-            await this.forwardingDetails.delete(entry);
-        }
+        await this._deleteForwardingDetails(query);
 
         await this.updateNumberOfForwards(attribute);
 
         this.eventBus.publish(new AttributeForwardingDetailsChangedEvent(this.identity.address.toString(), attribute));
-        return attribute;
+    }
+
+    private async _deleteForwardingDetails(query: any): Promise<void> {
+        const existingForwardingDetailsDocs = await this.forwardingDetails.find(query);
+        const existingForwardingDetails = existingForwardingDetailsDocs.map((obj) => AttributeForwardingDetails.from(obj));
+
+        for (const entry of existingForwardingDetails) {
+            await this.forwardingDetails.delete(entry);
+        }
     }
 
     public async executeFullAttributeDeletionProcess(attribute: LocalAttribute): Promise<void> {
@@ -1566,7 +1571,6 @@ export class AttributesController extends ConsumptionBaseController {
 
     public async getForwardingDetailsForAttribute(attribute: LocalAttribute, query: any = {}): Promise<AttributeForwardingDetails[]> {
         const docs = await this.forwardingDetails.find({ ...query, attributeId: attribute.id.toString() });
-
         return docs.map((doc) => AttributeForwardingDetails.from(doc));
     }
 

packages/consumption/src/modules/attributes/AttributesController.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;
         }

packages/consumption/src/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.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 });