@tstdl/base 0.92.52 → 0.92.53

package/authentication/server/authentication.service.js

@@ -96,24 +96,26 @@ let AuthenticationService = class AuthenticationService {
         const actualSubject = await this.resolveSubject(subject);
         const now = currentTimestamp();
         const end = now + this.refreshTokenTimeToLive;
-        const session = await this.sessionRepository.insert({
-            subject: actualSubject,
-            begin: now,
-            end,
-            refreshTokenHashVersion: 0,
-            refreshTokenSalt: new Uint8Array(),
-            refreshTokenHash: new Uint8Array()
-        });
-        const tokenPayload = await this.authenticationAncillaryService?.getTokenPayload(actualSubject, authenticationData, { action: GetTokenPayloadContextAction.GetToken });
-        const { token, jsonToken } = await this.createToken({ additionalTokenPayload: tokenPayload, subject: actualSubject, impersonator, sessionId: session.id, refreshTokenExpiration: end, timestamp: now });
-        const refreshToken = await this.createRefreshToken(actualSubject, session.id, end, { impersonator });
-        await this.sessionRepository.update(session.id, {
-            end,
-            refreshTokenHashVersion: 1,
-            refreshTokenSalt: refreshToken.salt,
-            refreshTokenHash: refreshToken.hash
+        return this.sessionRepository.transaction(async (sessionRepository) => {
+            const session = await sessionRepository.insert({
+                subject: actualSubject,
+                begin: now,
+                end,
+                refreshTokenHashVersion: 0,
+                refreshTokenSalt: new Uint8Array(),
+                refreshTokenHash: new Uint8Array()
+            });
+            const tokenPayload = await this.authenticationAncillaryService?.getTokenPayload(actualSubject, authenticationData, { action: GetTokenPayloadContextAction.GetToken });
+            const { token, jsonToken } = await this.createToken({ additionalTokenPayload: tokenPayload, subject: actualSubject, impersonator, sessionId: session.id, refreshTokenExpiration: end, timestamp: now });
+            const refreshToken = await this.createRefreshToken(actualSubject, session.id, end, { impersonator });
+            await sessionRepository.update(session.id, {
+                end,
+                refreshTokenHashVersion: 1,
+                refreshTokenSalt: refreshToken.salt,
+                refreshTokenHash: refreshToken.hash
+            });
+            return { token, jsonToken, refreshToken: refreshToken.token };
         });
-        return { token, jsonToken, refreshToken: refreshToken.token };
     }
     async endSession(sessionId) {
         const now = currentTimestamp();

package/orm/server/repository.d.ts

@@ -30,6 +30,7 @@ export declare class EntityRepositoryConfig {
     schema: string;
 }
 export type TransactionHandler<T extends Entity, R> = (repository: EntityRepository<T>, transaction: Transaction) => Promise<R>;
+export declare const ENTITY_TYPE: import("../../injector/token.js").InjectionToken<EntityType<any>, never>;
 export declare class EntityRepository<T extends Entity = Entity> implements Resolvable<EntityType<T>> {
     #private;
     readonly type: EntityType<T>;
@@ -109,5 +110,5 @@ export declare class EntityRepository<T extends Entity = Entity> implements Reso
     protected getAttributesUpdate(attributes: EntityMetadataAttributes | undefined): SQL<unknown> | undefined;
 }
 export declare function injectRepository<T extends Entity>(type: EntityType<T>): EntityRepository<T>;
-export declare function getRepository<T extends Entity>(type: EntityType<T>, config: EntityRepositoryConfig): Type<EntityRepository<T>>;
+export declare function getRepository<T extends Entity>(type: EntityType<T>, config?: EntityRepositoryConfig): Type<EntityRepository<T>>;
 export {};

package/orm/server/repository.js

@@ -14,6 +14,7 @@ import { NotFoundError } from '../../errors/not-found.error.js';
 import { Singleton } from '../../injector/decorators.js';
 import { inject, injectArgument } from '../../injector/inject.js';
 import { resolveArgumentType } from '../../injector/interfaces.js';
+import { injectionToken } from '../../injector/token.js';
 import { Schema } from '../../schema/schema.js';
 import { toArray } from '../../utils/array/array.js';
 import { fromDeepObjectEntries } from '../../utils/object/object.js';
@@ -26,6 +27,7 @@ export const repositoryType = Symbol('repositoryType');
 export class EntityRepositoryConfig {
     schema;
 }
+export const ENTITY_TYPE = injectionToken('EntityType');
 const TRANSACTION_TIMESTAMP = sql `transaction_timestamp()`;
 let EntityRepository = class EntityRepository {
     #repositoryConstructor;
@@ -41,7 +43,7 @@ let EntityRepository = class EntityRepository {
     }
     constructor(type, table, columnDefinitions, columnDefinitionsMap, session) {
         this.#repositoryConstructor = new.target;
-        this.type = type ?? injectArgument(this);
+        this.type = type ?? injectArgument(this, { optional: true }) ?? inject(ENTITY_TYPE);
         this.table = table ?? getDrizzleTableFromType(this.type, inject(EntityRepositoryConfig).schema);
         this.columnDefinitions = columnDefinitions ?? getColumnDefinitions(this.table);
         this.columnDefinitionsMap = columnDefinitionsMap ?? new Map(this.columnDefinitions.map((column) => [column.objectPath.path, column]));
@@ -425,7 +427,7 @@ export function getRepository(type, config) {
         [className]: class extends EntityRepository {
         }
     }[className];
-    const injectorDecorator = Singleton({ providers: [{ provide: EntityRepositoryConfig, useValue: config }] });
+    const injectorDecorator = Singleton({ providers: [{ provide: ENTITY_TYPE, useValue: type }, { provide: EntityRepositoryConfig, useValue: config }] });
     injectorDecorator(entityRepositoryClass);
     return entityRepositoryClass;
 }

package/package.json

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