@tstdl/base 0.93.179 → 0.93.181

package/mail/mail.service.js

@@ -12,8 +12,9 @@ import { buildJsonb } from '../orm/index.js';
 import { DatabaseConfig, injectRepository } from '../orm/server/index.js';
 import { TaskProcessResult, TaskQueue } from '../task-queue/task-queue.js';
 import { TemplateService } from '../templates/template.service.js';
+import { toArray } from '../utils/array/array.js';
 import { currentTimestamp } from '../utils/date-time.js';
-import { assertDefined } from '../utils/type-guards.js';
+import { assertDefined, isDefined } from '../utils/type-guards.js';
 import { MailClient, MailClientConfig } from './mail.client.js';
 import { MailLog } from './models/index.js';
 import { mailLog as mailLogTable } from './models/schemas.js';
@@ -24,6 +25,7 @@ let MailService = class MailService {
     #templateService = inject(TemplateService);
     #mailLogRepository = injectRepository(MailLog);
     #taskQueue = inject((TaskQueue), 'mail');
+    #moduleConfig = inject(MailModuleConfig, undefined, { optional: true });
     #defaultClientConfig = inject(MailClientConfig, undefined, { optional: true });
     #defaultData = inject(MAIL_DEFAULT_DATA, undefined, { optional: true });
     #logger = inject(Logger, 'MailService');
@@ -42,6 +44,7 @@ let MailService = class MailService {
         const config = options?.clientConfig ?? this.#defaultClientConfig;
         assertDefined(config, 'No mail client config provided.');
         const data = { ...this.#defaultData, ...mailData };
+        const rewriteTo = this.#moduleConfig?.rewriteTo;
         let mailLog;
         mailLog = await this.#mailLogRepository.insert({
             timestamp: currentTimestamp(),
@@ -50,8 +53,24 @@ let MailService = class MailService {
             sendResult: null,
             errors: [],
         });
+        const finalMailData = isDefined(rewriteTo)
+            ? {
+                ...data,
+                to: rewriteTo,
+                cc: undefined,
+                bcc: undefined,
+                headers: {
+                    ...data.headers,
+                    'X-Original-To': [
+                        ...toArray(data.to ?? []),
+                        ...toArray(data.cc ?? []),
+                        ...toArray(data.bcc ?? []),
+                    ].map((address) => (typeof address == 'string' ? address : `${address.name} <${address.address}>`)).join(', '),
+                },
+            }
+            : data;
         try {
-            const result = await this.#mailClient.send(data, config);
+            const result = await this.#mailClient.send(finalMailData, config);
             await this.#mailLogRepository.update(mailLog.id, { sendResult: result });
             return result;
         }

package/mail/module.d.ts

@@ -9,6 +9,7 @@ export declare class MailModuleConfig {
     client?: Type<MailClient>;
     defaultData?: DefaultMailData;
     autoMigrate?: boolean;
+    rewriteTo?: string;
 }
 /**
  * configure mail module

package/mail/module.js

@@ -10,6 +10,7 @@ export class MailModuleConfig {
     client;
     defaultData;
     autoMigrate;
+    rewriteTo;
 }
 /**
  * configure mail module

package/notification/api/notification.api.d.ts

@@ -93,10 +93,10 @@ export declare const notificationApiDefinition: {
             }>;
             credentials: true;
         };
-        updatePreference: {
+        updatePreferences: {
             resource: string;
             method: "POST";
-            parameters: import("../../schema/index.js").ObjectSchema<{
+            parameters: import("../../schema/index.js").ArraySchema<{
                 type: string;
                 enabled: boolean;
                 channel: "email" | "in-app" | "web-push";
@@ -210,10 +210,10 @@ declare const _NotificationApiClient: import("../../api/client/index.js").ApiCli
             }>;
             credentials: true;
         };
-        updatePreference: {
+        updatePreferences: {
             resource: string;
             method: "POST";
-            parameters: import("../../schema/index.js").ObjectSchema<{
+            parameters: import("../../schema/index.js").ArraySchema<{
                 type: string;
                 enabled: boolean;
                 channel: "email" | "in-app" | "web-push";

package/notification/api/notification.api.js

@@ -96,14 +96,14 @@ export const notificationApiDefinition = defineApi({
             })),
             credentials: true,
         },
-        updatePreference: {
+        updatePreferences: {
             resource: 'preferences',
             method: 'POST',
-            parameters: object({
+            parameters: array(object({
                 type: string(),
                 channel: enumeration(NotificationChannel),
                 enabled: boolean(),
-            }),
+            })),
             result: literal('ok'),
             credentials: true,
         },

package/notification/server/api/notification.api-controller.d.ts

@@ -17,6 +17,6 @@ export declare class NotificationApiController implements ApiController<Notifica
     archiveAll({ getToken }: ApiRequestContext<NotificationApiDefinition, 'archiveAll'>): Promise<'ok'>;
     unreadCount({ getToken }: ApiRequestContext<NotificationApiDefinition, 'unreadCount'>): Promise<number>;
     getPreferences({ getToken }: ApiRequestContext<NotificationApiDefinition, 'getPreferences'>): Promise<any>;
-    updatePreference({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'updatePreference'>): Promise<'ok'>;
+    updatePreferences({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'updatePreferences'>): Promise<'ok'>;
     registerWebPush({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'registerWebPush'>): Promise<'ok'>;
 }

package/notification/server/api/notification.api-controller.js

@@ -85,9 +85,9 @@ let NotificationApiController = class NotificationApiController {
         const token = await getToken();
         return await this.notificationService.getPreferences(token.payload.tenant, token.payload.subject);
     }
-    async updatePreference({ parameters, getToken }) {
+    async updatePreferences({ parameters, getToken }) {
         const token = await getToken();
-        await this.notificationService.updatePreference(token.payload.tenant, token.payload.subject, parameters.type, parameters.channel, parameters.enabled);
+        await this.notificationService.updatePreferences(token.payload.tenant, token.payload.subject, parameters);
         return 'ok';
     }
     async registerWebPush({ parameters, getToken }) {

package/notification/server/services/notification.service.d.ts

@@ -34,5 +34,10 @@ export declare class NotificationService<Definitions extends NotificationDefinit
     }>;
     getPreferences(tenantId: string, userId: string): Promise<NotificationPreference[]>;
     updatePreference(tenantId: string, userId: string, type: string, channel: NotificationChannel, enabled: boolean): Promise<void>;
+    updatePreferences(tenantId: string, userId: string, preferences: {
+        type: string;
+        channel: NotificationChannel;
+        enabled: boolean;
+    }[]): Promise<void>;
     registerWebPush(tenantId: string, userId: string, endpoint: string, p256dh: Uint8Array<ArrayBuffer>, auth: Uint8Array<ArrayBuffer>): Promise<void>;
 }

package/notification/server/services/notification.service.js

@@ -235,13 +235,11 @@ let NotificationService = NotificationService_1 = class NotificationService exte
         return await this.#preferenceRepository.loadManyByQuery({ tenantId, userId });
     }
     async updatePreference(tenantId, userId, type, channel, enabled) {
-        await this.#preferenceRepository.upsert(['tenantId', 'userId', 'type', 'channel'], {
-            tenantId,
-            userId,
-            type,
-            channel,
-            enabled,
-        });
+        await this.#preferenceRepository.upsert(['tenantId', 'userId', 'type', 'channel'], { tenantId, userId, type, channel, enabled });
+    }
+    async updatePreferences(tenantId, userId, preferences) {
+        const entities = preferences.map((preference) => ({ tenantId, userId, ...preference }));
+        await this.#preferenceRepository.upsertMany(['tenantId', 'userId', 'type', 'channel'], entities);
     }
     async registerWebPush(tenantId, userId, endpoint, p256dh, auth) {
         try {

package/notification/tests/notification-api.test.js

@@ -27,11 +27,14 @@ describe('Notification API (Integration)', () => {
                 rateLimiter: true,
             },
         }));
-        await clearTenantData(database, 'authentication', ['user', 'subject'], tenantId);
         controller = injector.resolve(NotificationApiController);
         notificationService = injector.resolve(NotificationService);
         sseService = injector.resolve(NotificationSseService);
         subjectService = injector.resolve(SubjectService);
+    });
+    beforeEach(async () => {
+        vi.clearAllMocks();
+        await clearTenantData(database, 'authentication', ['user', 'subject'], tenantId);
         // Create a dummy user
         const user = await subjectService.createUser({
             tenantId,
@@ -41,9 +44,6 @@ describe('Notification API (Integration)', () => {
         });
         userId = user.id;
     });
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
     afterEach(async () => {
         await clearTenantData(database, schema, ['in_app', 'in_app_archive', 'log', 'preference', 'web_push_subscription'], tenantId);
         await clearTenantData(database, 'authentication', ['user', 'subject'], tenantId);
@@ -109,11 +109,11 @@ describe('Notification API (Integration)', () => {
         await controller.getPreferences(createMockContext());
         expect(getPreferencesSpy).toHaveBeenCalledWith(tenantId, userId);
     });
-    test('updatePreference should call service', async () => {
-        const updatePreferenceSpy = vi.spyOn(notificationService, 'updatePreference').mockResolvedValue();
-        const params = { type: 'test', channel: NotificationChannel.Email, enabled: true };
-        await controller.updatePreference(createMockContext(params));
-        expect(updatePreferenceSpy).toHaveBeenCalledWith(tenantId, userId, 'test', NotificationChannel.Email, true);
+    test('updatePreferences should call service', async () => {
+        const updatePreferencesSpy = vi.spyOn(notificationService, 'updatePreferences').mockResolvedValue();
+        const params = [{ type: 'test', channel: NotificationChannel.Email, enabled: true }];
+        await controller.updatePreferences(createMockContext(params));
+        expect(updatePreferencesSpy).toHaveBeenCalledWith(tenantId, userId, params);
     });
     test('registerWebPush should call service', async () => {
         const registerWebPushSpy = vi.spyOn(notificationService, 'registerWebPush').mockResolvedValue();

package/orm/server/module.d.ts

@@ -25,6 +25,5 @@ export type OrmModuleOptions = {
  * @param options - Configuration options including connection details, repository settings, and the encryption secret.
  */
 export declare function configureOrm({ injector, ...options }?: OrmModuleOptions & {
-    encryptionSecret?: Uint8Array;
     injector?: Injector;
 }): void;

package/orm/server/module.js

@@ -1,7 +1,6 @@
 import { Injector } from '../../injector/injector.js';
 import { isDefined } from '../../utils/type-guards.js';
 import { EntityRepositoryConfig } from './repository-config.js';
-import { ENCRYPTION_SECRET } from './tokens.js';
 /**
  * Configuration class for the database connection.
  */
@@ -20,7 +19,4 @@ export function configureOrm({ injector, ...options } = {}) {
     if (isDefined(options.repositoryConfig)) {
         targetInjector.register(EntityRepositoryConfig, { useValue: options.repositoryConfig });
     }
-    if (isDefined(options.encryptionSecret)) {
-        targetInjector.register(ENCRYPTION_SECRET, { useValue: options.encryptionSecret });
-    }
 }

package/orm/server/repository.d.ts

@@ -1,6 +1,7 @@
 /** biome-ignore-all lint/nursery/noExcessiveClassesPerFile: <explanation> */
 import { SQL, type SQLWrapper } from 'drizzle-orm';
 import type { AnyPgTable, PgColumn, PgInsertValue, PgSelectBuilder, PgUpdateSetSource, SelectedFields } from 'drizzle-orm/pg-core';
+import { type DerivedKey } from '../../cryptography/index.js';
 import { afterResolve, resolveArgumentType, type Resolvable } from '../../injector/interfaces.js';
 import type { DeepPartial, Function, OneOrMany, Record, SimplifyObject, Type, TypedOmit } from '../../types/index.js';
 import { Entity, type BaseEntity, type EntityMetadataAttributes, type EntityType } from '../entity.js';
@@ -16,7 +17,7 @@ type EntityRepositoryContext = {
     table: PgTableFromType;
     columnDefinitions: ColumnDefinition[];
     columnDefinitionsMap: Map<string, ColumnDefinition>;
-    encryptionSecret: Uint8Array<ArrayBuffer> | undefined;
+    encryptionKey: DerivedKey | undefined;
     transformContext: TransformContext | Promise<TransformContext> | undefined;
 };
 export type InferSelect<T extends BaseEntity = BaseEntity> = PgTableFromType<EntityType<T>>['$inferSelect'];

package/orm/server/repository.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { and, asc, count, desc, eq, getTableName, inArray, isNotNull as isSqlNotNull, isNull as isSqlNull, isSQLWrapper, lte, or, SQL, sql } from 'drizzle-orm';
 import { match, P } from 'ts-pattern';
 import { CancellationSignal } from '../../cancellation/token.js';
-import { importSymmetricKey } from '../../cryptography/index.js';
+import { injectDerivedCryptoKey } from '../../cryptography/index.js';
 import { NotFoundError } from '../../errors/not-found.error.js';
 import { Singleton } from '../../injector/decorators.js';
 import { inject, injectArgument } from '../../injector/inject.js';
@@ -30,7 +30,6 @@ import { getInheritanceMetadata, isChildEntity } from '../utils.js';
 import { getColumnDefinitions, getColumnDefinitionsMap, getDrizzleTableFromType, getPrimaryKeyColumnDefinitions, getPrimaryKeyColumns, getTableColumnDefinitions, isTableOwning } from './drizzle/schema-converter.js';
 import { convertQuery, getTsQuery, getTsVector, resolveTargetColumn } from './query-converter.js';
 import { EntityRepositoryConfig } from './repository-config.js';
-import { ENCRYPTION_SECRET } from './tokens.js';
 import { injectTransactional, injectTransactionalAsync, isInTransactionalContext, Transactional, tryGetTransactionalContextData } from './transactional.js';
 const searchScoreColumn = '__tsl_score';
 const searchDistanceColumn = '__tsl_distance';
@@ -40,7 +39,7 @@ export const repositoryType = Symbol('repositoryType');
 const entityTypeToken = Symbol('EntityType');
 let EntityRepository = class EntityRepository extends Transactional {
     #context = (isInTransactionalContext() ? tryGetTransactionalContextData(this) : undefined) ?? {};
-    #encryptionSecret = isInTransactionalContext() ? this.#context.encryptionSecret : inject(ENCRYPTION_SECRET, undefined, { optional: true });
+    #encryptionKey = isInTransactionalContext() ? this.#context.encryptionKey : injectDerivedCryptoKey('orm:repository-encryption', { name: 'AES-GCM', length: 256 }, ['encrypt', 'decrypt']);
     #cancellationSignal = isInTransactionalContext() ? undefined : inject(CancellationSignal);
     #transformContext = this.#context.transformContext;
     type = assertDefinedPass(this.#context.type ?? this.constructor[entityTypeToken] ?? injectArgument(this, { optional: true }), 'Missing entity type.');
@@ -137,7 +136,7 @@ let EntityRepository = class EntityRepository extends Transactional {
             table: this.#table,
             columnDefinitions: this.#columnDefinitions,
             columnDefinitionsMap: this.#columnDefinitionsMap,
-            encryptionSecret: this.#encryptionSecret,
+            encryptionKey: this.#encryptionKey,
             transformContext: this.#transformContext,
         };
         return context;
@@ -1745,11 +1744,11 @@ let EntityRepository = class EntityRepository extends Transactional {
     }
     async getTransformContext() {
         if (isUndefined(this.#transformContext)) {
-            if (isUndefined(this.#encryptionSecret)) {
+            if (isUndefined(this.#encryptionKey)) {
                 this.#transformContext = {};
                 return this.#transformContext;
             }
-            this.#transformContext = importSymmetricKey('raw', { name: 'AES-GCM', length: 256 }, this.#encryptionSecret, false).then((encryptionKey) => ({ encryptionKey }));
+            this.#transformContext = this.#encryptionKey.getKey().then((encryptionKey) => ({ encryptionKey }));
             this.#transformContext = await this.#transformContext;
         }
         return this.#transformContext; // eslint-disable-line @typescript-eslint/return-await

package/orm/tests/repository-extra-coverage.test.js

@@ -17,7 +17,6 @@ import { toArrayAsync } from '../../utils/async-iterable-helpers/to-array.js';
 import { ChildEntity, Column, Inheritance, Table } from '../decorators.js';
 import { BaseEntity, Entity } from '../entity.js';
 import { getRepository } from '../server/repository.js';
-import { ENCRYPTION_SECRET } from '../server/tokens.js';
 describe('ORM Repository Extra Coverage', () => {
     let injector;
     let database;
@@ -80,7 +79,6 @@ describe('ORM Repository Extra Coverage', () => {
     ], PlainItem);
     beforeAll(async () => {
         ({ injector, database } = await setupIntegrationTest({ orm: { schema } }));
-        injector.register(ENCRYPTION_SECRET, { useValue: new Uint8Array(32).fill(1) });
         baseItemRepo = injector.resolve(getRepository(BaseItem));
         premiumItemRepo = injector.resolve(getRepository(PremiumItem));
         simpleItemRepo = injector.resolve(getRepository(SimpleItem));

package/orm/tests/repository-regression.test.js

@@ -17,7 +17,6 @@ import { Column, EmbeddedProperty, EncryptedProperty, Reference, Table } from '.
 import { Entity } from '../entity.js';
 import { JsonProperty, NumericDateProperty } from '../schemas/index.js';
 import { getRepository } from '../server/index.js';
-import { ENCRYPTION_SECRET } from '../server/tokens.js';
 describe('ORM Repository Regression (Integration)', () => {
     let injector;
     let db;
@@ -101,11 +100,9 @@ describe('ORM Repository Regression (Integration)', () => {
         Table('posts', { schema })
     ], Post);
     beforeAll(async () => {
-        const encryptionSecret = new Uint8Array(32).fill(1);
         ({ injector, database: db } = await setupIntegrationTest({
             orm: { schema },
         }));
-        injector.register(ENCRYPTION_SECRET, { useValue: encryptionSecret });
         standardRepository = injector.resolve(getRepository(StandardEntity));
         postRepository = injector.resolve(getRepository(Post));
         await db.execute(sql `CREATE SCHEMA IF NOT EXISTS ${sql.identifier(schema)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.179",
+  "version": "0.93.181",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

package/testing/integration-setup.js

@@ -130,13 +130,13 @@ export async function setupIsolatedIntegrationTest(options = {}) {
         ...options.dbConfig,
     };
     const schema = options.orm?.schema ?? 'test';
+    configureSecrets({ key: 'tstdl-unit-tests' });
     // 4. Configure ORM
     // We disable autoMigrate here because APPLICATION_INITIALIZER is not used in integration tests
     // We manually run migrations via bootstrapOrm below
     configureOrm({
         repositoryConfig: { schema },
         connection: dbConfig,
-        encryptionSecret: options.orm?.encryptionSecret ?? new Uint8Array(32),
         injector,
     });
     // 5. Database Resolution

package/orm/server/tokens.d.ts

@@ -1 +0,0 @@
-export declare const ENCRYPTION_SECRET: import("../../injector/token.js").InjectionToken<Uint8Array<ArrayBuffer>, never>;

package/orm/server/tokens.js

@@ -1,2 +0,0 @@
-import { injectionToken } from '../../injector/token.js';
-export const ENCRYPTION_SECRET = injectionToken('EncryptionSecret');