Merge branch 'main' into release/v7

Author: jkoenig134

packages/runtime/src/useCases/common/Schemas.ts

@@ -21380,6 +21380,7 @@ export const SendMessageRequest: any = {
     "definitions": {
         "SendMessageRequest": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
                 "recipients": {
                     "type": "array",
@@ -21399,10 +21400,9 @@ export const SendMessageRequest: any = {
                 }
             },
             "required": [
-                "recipients",
-                "content"
-            ],
-            "additionalProperties": false
+                "content",
+                "recipients"
+            ]
         },
         "AddressString": {
             "type": "string",

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

@@ -1,7 +1,18 @@
 import { Serializable } from "@js-soft/ts-serval";
 import { ApplicationError, Result } from "@js-soft/ts-utils";
 import { LocalRequestStatus, OutgoingRequestsController } from "@nmshd/consumption";
-import { ArbitraryMessageContent, Mail, Notification, Request, ResponseWrapper } from "@nmshd/content";
+import {
+    ArbitraryMessageContent,
+    ArbitraryMessageContentJSON,
+    Mail,
+    MailJSON,
+    Notification,
+    NotificationJSON,
+    Request,
+    RequestJSON,
+    ResponseWrapper,
+    ResponseWrapperJSON
+} from "@nmshd/content";
 import { CoreAddress, CoreDate, CoreError, CoreId } from "@nmshd/core-types";
 import { MessageDTO } from "@nmshd/runtime-types";
 import { AccountController, File, FileController, MessageController, PeerDeletionStatus, RelationshipsController, RelationshipStatus, TransportCoreErrors } from "@nmshd/transport";
@@ -10,19 +21,23 @@ import _ from "lodash";
 import { AddressString, FileIdString, RuntimeErrors, SchemaRepository, SchemaValidator, UseCase } from "../../common";
 import { MessageMapper } from "./MessageMapper";
 
-export interface SendMessageRequest {
+interface AbstractSendMessageRequest<T> {
     /**
      * @minItems 1
      * @uniqueItems true
      */
     recipients: AddressString[];
-    content: any;
+    content: T;
     /**
      * @uniqueItems true
      */
     attachments?: FileIdString[];
 }
 
+export interface SendMessageRequest extends AbstractSendMessageRequest<MailJSON | ResponseWrapperJSON | NotificationJSON | ArbitraryMessageContentJSON | RequestJSON> {}
+
+export interface SchemaValidatableSendMessageRequest extends AbstractSendMessageRequest<unknown> {}
+
 class Validator extends SchemaValidator<SendMessageRequest> {
     public constructor(@Inject schemaRepository: SchemaRepository) {
         super(schemaRepository.getSchema("SendMessageRequest"));

packages/runtime/test/transport/messages.test.ts

@@ -228,7 +228,7 @@ describe("Message errors", () => {
                 "@type": "Mail",
                 subject: "aSubject",
                 body: "aBody"
-            }
+            } as any
         });
         expect(result).toBeAnError("Mail.to :: Value is not defined", "error.runtime.requestDeserialization");
     });
@@ -326,7 +326,7 @@ describe("Message errors", () => {
     test("should throw correct error for false content type", async () => {
         const result = await client1.transport.messages.sendMessage({
             recipients: [client2.address],
-            content: {}
+            content: {} as any
         });
         expect(result).toBeAnError("The content of a Message", "error.runtime.validation.invalidPropertyValue");
     });