Merge branch 'main' into release/openid4vc

Author: jkoenig134

package-lock.json

@@ -43,8 +43,8 @@
         "madge": "^8.0.0",
         "npm-check-updates": "^19.1.2",
         "patch-package": "^8.0.1",
-        "prettier": "^3.6.2",
-        "ts-jest": "^29.4.5",
+        "prettier": "^3.7.3",
+        "ts-jest": "^29.4.6",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.9.3"

package.json

@@ -31,7 +31,8 @@ describe("MessageEventingTest", function () {
             "@type": "Mail",
             to: [recipient],
             subject: "aSubject",
-            body: "aBody"
+            body: "aBody",
+            bodyFormat: "PlainText"
         };
         const message = await TestUtil.sendMessage(sessionA, sessionB, mail);
         const eventListener = new EventListener(runtime, [MailReceivedEvent, MessageReceivedEvent]);

packages/app-runtime/test/modules/MessageEventing.test.ts

@@ -12,8 +12,7 @@ export abstract class AbstractRequestItemProcessor<
     TRequestItem extends RequestItem = RequestItem,
     TAcceptParams extends AcceptRequestItemParametersJSON = AcceptRequestItemParametersJSON,
     TRejectParams extends RejectRequestItemParametersJSON = RejectRequestItemParametersJSON
-> implements IRequestItemProcessor<TRequestItem, TAcceptParams, TRejectParams>
-{
+> implements IRequestItemProcessor<TRequestItem, TAcceptParams, TRejectParams> {
     protected accountController: AccountController;
     protected currentIdentityAddress: CoreAddress;
 

packages/consumption/src/modules/requests/itemProcessors/AbstractRequestItemProcessor.ts

@@ -54,6 +54,7 @@
         "@js-soft/ts-serval": "2.0.14",
         "@nmshd/core-types": "*",
         "@nmshd/iql": "^1.0.4",
+        "ibantools": "^4.5.1",
         "luxon": "^3.7.2",
         "ts-simple-nameof": "^1.3.3"
     },

packages/content/package.json

@@ -1,6 +1,8 @@
 import {
     Affiliation,
     AffiliationJSON,
+    BankAccount,
+    BankAccountJSON,
     BirthDate,
     BirthDateJSON,
     BirthName,
@@ -28,6 +30,7 @@ import {
     HonorificSuffix,
     HonorificSuffixJSON,
     IAffiliation,
+    IBankAccount,
     IBirthDate,
     IBirthName,
     IBirthPlace,
@@ -128,6 +131,7 @@ export namespace AttributeValues {
         export namespace Editable {
             export type Json =
                 | AffiliationJSON
+                | BankAccountJSON
                 | BirthDateJSON
                 | BirthNameJSON
                 | BirthPlaceJSON
@@ -155,6 +159,7 @@ export namespace AttributeValues {
 
             export type Interface =
                 | IAffiliation
+                | IBankAccount
                 | IBirthDate
                 | IBirthName
                 | IBirthPlace
@@ -182,6 +187,7 @@ export namespace AttributeValues {
 
             export type Class =
                 | Affiliation
+                | BankAccount
                 | BirthDate
                 | BirthName
                 | BirthPlace
@@ -209,6 +215,7 @@ export namespace AttributeValues {
 
             export const CLASSES = [
                 Affiliation,
+                BankAccount,
                 BirthDate,
                 BirthName,
                 BirthPlace,
@@ -237,6 +244,7 @@ export namespace AttributeValues {
 
             export const TYPE_NAMES = [
                 "Affiliation",
+                "BankAccount",
                 "BirthDate",
                 "BirthName",
                 "BirthPlace",

packages/content/src/attributes/AttributeValueTypes.ts

@@ -0,0 +1,104 @@
+import { serialize, type, validate } from "@js-soft/ts-serval";
+import { isValidBIC, isValidIBAN } from "ibantools";
+import { nameof } from "ts-simple-nameof";
+import { AbstractComplexValue, AbstractComplexValueJSON, IAbstractComplexValue } from "../../AbstractComplexValue";
+import { RenderHints, RenderHintsEditType, RenderHintsTechnicalType, ValueHints } from "../../hints";
+
+const MAX_ACCOUNT_HOLDER_LENGTH = 100;
+const MIN_IBAN_LENGTH = 14;
+const MAX_IBAN_LENGTH = 34;
+const MIN_BIC_LENGTH = 8;
+const MAX_BIC_LENGTH = 11;
+
+export interface BankAccountJSON extends AbstractComplexValueJSON {
+    "@type": "BankAccount";
+    accountHolder: string;
+    iban: string;
+    bic?: string;
+}
+
+export interface IBankAccount extends IAbstractComplexValue {
+    accountHolder: string;
+    iban: string;
+    bic?: string;
+}
+
+@type("BankAccount")
+export class BankAccount extends AbstractComplexValue implements IBankAccount {
+    @serialize()
+    @validate({ max: MAX_ACCOUNT_HOLDER_LENGTH })
+    public accountHolder: string;
+
+    @serialize()
+    @validate({
+        min: MIN_IBAN_LENGTH,
+        max: MAX_IBAN_LENGTH,
+        customValidator: (iban) => (!isValidIBAN(iban) ? "invalid IBAN" : undefined)
+    })
+    public iban: string;
+
+    @serialize()
+    @validate({
+        nullable: true,
+        min: MIN_BIC_LENGTH,
+        max: MAX_BIC_LENGTH,
+        customValidator: (bic) => (!isValidBIC(bic) ? "invalid BIC" : undefined)
+    })
+    public bic?: string;
+
+    public static from(value: IBankAccount | Omit<BankAccountJSON, "@type">): BankAccount {
+        return this.fromAny(value);
+    }
+
+    public static get valueHints(): ValueHints {
+        return ValueHints.from({
+            propertyHints: {
+                [nameof<BankAccount>((s) => s.accountHolder)]: ValueHints.from({
+                    max: MAX_ACCOUNT_HOLDER_LENGTH
+                }),
+                [nameof<BankAccount>((s) => s.iban)]: ValueHints.from({
+                    min: MIN_IBAN_LENGTH,
+                    max: MAX_IBAN_LENGTH
+                }),
+                [nameof<BankAccount>((s) => s.bic)]: ValueHints.from({
+                    min: MIN_BIC_LENGTH,
+                    max: MAX_BIC_LENGTH
+                })
+            }
+        });
+    }
+
+    public static override get renderHints(): RenderHints {
+        return super.renderHints.copyWith({
+            propertyHints: {
+                [nameof<BankAccount>((s) => s.accountHolder)]: RenderHints.from({
+                    editType: RenderHintsEditType.InputLike,
+                    technicalType: RenderHintsTechnicalType.String
+                }),
+                [nameof<BankAccount>((s) => s.iban)]: RenderHints.from({
+                    editType: RenderHintsEditType.InputLike,
+                    technicalType: RenderHintsTechnicalType.String
+                }),
+                [nameof<BankAccount>((s) => s.bic)]: RenderHints.from({
+                    editType: RenderHintsEditType.InputLike,
+                    technicalType: RenderHintsTechnicalType.String
+                })
+            }
+        });
+    }
+
+    public override toString(): string {
+        const value: string[] = [];
+        value.push(`${this.accountHolder}`);
+        value.push(`${this.iban}`);
+        if (this.bic) {
+            value.push(this.bic.toString());
+        }
+
+        return value.join("\n");
+    }
+
+    public override toJSON(verbose?: boolean | undefined, serializeAsString?: boolean | undefined): BankAccountJSON {
+        return super.toJSON(verbose, serializeAsString) as BankAccountJSON;
+    }
+}

packages/content/src/attributes/types/finance/BankAccount.ts

@@ -0,0 +1 @@
+export * from "./BankAccount";

packages/content/src/attributes/types/finance/index.ts

@@ -7,6 +7,7 @@ export * from "./affiliation";
 export * from "./birth";
 export * from "./communication";
 export * from "./dates";
+export * from "./finance";
 export * from "./identity";
 export * from "./measurements";
 export * from "./name";

packages/content/src/attributes/types/index.ts

@@ -2,19 +2,26 @@ import { ISerializable, Serializable, serialize, type, validate } from "@js-soft
 import { CoreAddress, ICoreAddress } from "@nmshd/core-types";
 import { ContentJSON } from "../ContentJSON";
 
+export enum MailBodyFormat {
+    PlainText = "PlainText",
+    Markdown = "Markdown"
+}
+
 export interface MailJSON extends ContentJSON {
     "@type": "Mail";
     to: string[];
     cc?: string[];
     subject: string;
     body: string;
+    bodyFormat: `${MailBodyFormat}`;
 }
 
 export interface IMail extends ISerializable {
     to: ICoreAddress[];
     cc?: ICoreAddress[];
     subject: string;
     body: string;
+    bodyFormat: MailBodyFormat;
 }
 
 @type("Mail")
@@ -35,13 +42,15 @@ export class Mail extends Serializable implements IMail {
     @validate({ max: 50000 })
     public body: string;
 
+    @serialize()
+    @validate({ customValidator: (v) => (!Object.values(MailBodyFormat).includes(v) ? `must be one of: ${Object.values(MailBodyFormat)}` : undefined) })
+    public bodyFormat: MailBodyFormat;
+
     protected static override preFrom(value: any): any {
         value.cc ??= [];
 
-        if (!value.body && value.content) {
-            value.body = value.content;
-            delete value.content;
-        }
+        // @deprecated bodyFormat default
+        value.bodyFormat ??= MailBodyFormat.PlainText;
 
         return value;
     }