Block sending Messages to Identities which are in deletion or for which the Relationship is terminated

packages/consumption/src/modules/requests/incoming/IncomingRequestsController.ts

@@ -174,10 +174,10 @@ export class IncomingRequestsController extends ConsumptionBaseController {
         const relationship = await this.relationshipResolver.getRelationshipToIdentity(request.peer);
         // It is safe to decide an incoming Request when no Relationship is found as this is the case when the Request origins from onNewRelationship of the RelationshipTemplateContent
         if (relationship) {
-            if (typeof relationship.peerDeletionInfo?.deletionStatus !== "undefined") {
+            if (relationship.peerDeletionInfo?.deletionStatus) {
                 return ValidationResult.error(
                     ConsumptionCoreErrors.requests.peerInDeletion(
-                        `You cannot decide a request from '${request.peer.toString()}' since the peer is in status '${relationship.peerDeletionInfo.deletionStatus}'.`
+                        `You cannot decide a Request from '${request.peer.toString()}' since the peer is in status '${relationship.peerDeletionInfo.deletionStatus}'.`
                     )
                 );
             }

packages/consumption/src/modules/requests/outgoing/OutgoingRequestsController.ts

@@ -63,10 +63,10 @@ export class OutgoingRequestsController extends ConsumptionBaseController {
                 );
             }
 
-            if (typeof relationship.peerDeletionInfo?.deletionStatus !== "undefined") {
+            if (relationship.peerDeletionInfo?.deletionStatus) {
                 return ValidationResult.error(
                     ConsumptionCoreErrors.requests.peerInDeletion(
-                        `You cannot create a request to '${parsedParams.peer.toString()}' since the peer is in status '${relationship.peerDeletionInfo.deletionStatus}'.`
+                        `You cannot create a Request to '${parsedParams.peer.toString()}' since the peer is in status '${relationship.peerDeletionInfo.deletionStatus}'.`
                     )
                 );
             }

packages/runtime/src/useCases/transport/messages/SendMessage.ts

@@ -92,29 +92,27 @@ export class SendMessageUseCase extends UseCase<SendMessageRequest, MessageDTO>
             if (!recipient.equals(localRequest.peer)) return RuntimeErrors.general.invalidPropertyValue("The recipient does not match the Request's peer.");
             return;
         }
-        if (transformedContent instanceof Mail || transformedContent instanceof ResponseWrapper || transformedContent instanceof ArbitraryMessageContent) {
-            const peerInDeletionAddressArray: string[] = [];
-            const recipientsCoreAddress = recipients.map((r) => CoreAddress.from(r));
-            for (const recipient of recipientsCoreAddress) {
-                const relationship = await this.relationshipsController.getActiveRelationshipToIdentity(recipient);
-                if (!relationship) {
-                    return TransportCoreErrors.messages.missingOrInactiveRelationship(recipient.toString());
-                }
-                if (typeof relationship.peerDeletionInfo?.deletionStatus !== "undefined") {
-                    peerInDeletionAddressArray.push(recipient.address);
-                }
+
+        const peerInDeletionAddressArray: string[] = [];
+        const recipientsCoreAddress = recipients.map((r) => CoreAddress.from(r));
+        for (const recipient of recipientsCoreAddress) {
+            const relationship = await this.relationshipsController.getActiveRelationshipToIdentity(recipient);
+            if (!relationship) {
+                return TransportCoreErrors.messages.missingOrInactiveRelationship(recipient.toString());
+            }
+            if (typeof relationship.peerDeletionInfo?.deletionStatus !== "undefined") {
+                peerInDeletionAddressArray.push(recipient.address);
             }
-            if (peerInDeletionAddressArray.toString() !== "") {
-                if (typeof peerInDeletionAddressArray[1] === "undefined") {
-                    return TransportCoreErrors.messages.peerInDeletion(
-                        `The recipient with the address '${peerInDeletionAddressArray}' has an active IdentityDeletionProcess so you cannot send a message to him.`
-                    );
-                }
+        }
+        if (peerInDeletionAddressArray.length > 0) {
+            if (!peerInDeletionAddressArray[1]) {
                 return TransportCoreErrors.messages.peerInDeletion(
-                    `The recipients with the following addresses '${peerInDeletionAddressArray}' have an active IdentityDeletionProcess so you cannot send a message to them.`
+                    `The recipient with the address '${peerInDeletionAddressArray[0]}' has an active IdentityDeletionProcess, so you cannot send them a Message.`
                 );
             }
-            return;
+            return TransportCoreErrors.messages.peerInDeletion(
+                `The recipients with the following addresses '${peerInDeletionAddressArray}' have an active IdentityDeletionProcess, so you cannot send them a Message.`
+            );
         }
         return;
     }

packages/runtime/test/transport/relationships.test.ts

@@ -992,7 +992,7 @@ describe("Peer IdentityDeletionProcess", () => {
         };
         const result = await createRequest(services2, services1, requestContent);
         expect(result).toBeAnError(
-            `You cannot create a request to '${services1.address.toString()}' since the peer is in status '${updatedRelationship.peerDeletionInfo?.deletionStatus}'.`,
+            `You cannot create a Request to '${services1.address.toString()}' since the peer is in status '${updatedRelationship.peerDeletionInfo?.deletionStatus}'.`,
             "error.consumption.requests.peerInDeletion"
         );
     });
@@ -1028,20 +1028,23 @@ describe("Peer IdentityDeletionProcess", () => {
         const canAcceptResultAfterPeerDeletion = (await services2.consumption.incomingRequests.canAccept({ requestId: requestIds, items: [{ accept: true }] })).value;
         expect(canAcceptResultAfterPeerDeletion.isSuccess).toBe(false);
         expect(canAcceptResultAfterPeerDeletion.code).toBe("error.consumption.requests.peerInDeletion");
+        expect(canAcceptResultAfterPeerDeletion.message).toContain(
+            `You cannot decide a Request from '${services3.address.toString()}' since the peer is in status '${updatedRelationship2.peerDeletionInfo?.deletionStatus}'`
+        );
     });
 
     test("messages with multiple recipients should fail if one of the recipients has an active IdentityDeletionProcess", async () => {
         const result = await failToSendMessageToMultipleRecipients(services2.transport, [services4.address, services1.address]);
         expect(result).toBeAnError(
-            `The recipient with the address '${services1.address.toString()}' has an active IdentityDeletionProcess so you cannot send a message to him.`,
+            `The recipient with the address '${services1.address.toString()}' has an active IdentityDeletionProcess, so you cannot send them a Message.`,
             "error.transport.messages.peerInDeletion"
         );
     });
 
     test("messages with multiple recipients should fail with another ErrorMessage if more than one of the recipients has an active IdentityDeletionProcess", async () => {
         const result = await failToSendMessageToMultipleRecipients(services2.transport, [services3.address, services1.address]);
         expect(result).toBeAnError(
-            `The recipients with the following addresses '${services3.address.toString()},${services1.address.toString()}' have an active IdentityDeletionProcess so you cannot send a message to them.`,
+            `The recipients with the following addresses '${services3.address.toString()},${services1.address.toString()}' have an active IdentityDeletionProcess, so you cannot send them a Message.`,
             "error.transport.messages.peerInDeletion"
         );
     });