@solidxai/core 0.1.11-beta.9 → 0.1.12-beta.0

package/src/seeders/seed-data/solid-core-metadata.json

@@ -5304,7 +5304,6 @@
         "SavedFiltersController.update",
         "SavedFiltersController.insertMany",
         "SavedFiltersController.create",
-        "ChatterMessageController.create",
         "ChatterMessageController.getChatterMessages",
         "ChatterMessageController.postMessage",
         "ChatterMessageController.findMany",
@@ -6116,7 +6115,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "moduleMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "appBuilder-menu-item"
+      "parentMenuItemUserKey": "appBuilder-menu-item",
+      "iconName": "view_module"
     },
     {
       "displayName": "Model",
@@ -6124,7 +6124,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "modelMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "appBuilder-menu-item"
+      "parentMenuItemUserKey": "appBuilder-menu-item",
+      "iconName": "table_rows"
     },
     {
       "displayName": "Field",
@@ -6132,7 +6133,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "fieldMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "appBuilder-menu-item"
+      "parentMenuItemUserKey": "appBuilder-menu-item",
+      "iconName": "label"
     },
     {
       "displayName": "Datasources",
@@ -6140,7 +6142,8 @@
       "sequenceNumber": 4,
       "actionUserKey": "datasource-management-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "appBuilder-menu-item"
+      "parentMenuItemUserKey": "appBuilder-menu-item",
+      "iconName": "storage"
     },
     {
       "displayName": "Menu Item",
@@ -6148,7 +6151,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "menuItemMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "layoutBuilder-menu-item"
+      "parentMenuItemUserKey": "layoutBuilder-menu-item",
+      "iconName": "menu"
     },
     {
       "displayName": "View",
@@ -6156,7 +6160,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "viewMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "layoutBuilder-menu-item"
+      "parentMenuItemUserKey": "layoutBuilder-menu-item",
+      "iconName": "pageview"
     },
     {
       "displayName": "Action",
@@ -6164,7 +6169,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "actionMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "layoutBuilder-menu-item"
+      "parentMenuItemUserKey": "layoutBuilder-menu-item",
+      "iconName": "bolt"
     },
     {
       "displayName": "User View",
@@ -6172,7 +6178,8 @@
       "sequenceNumber": 5,
       "actionUserKey": "userViewMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "layoutBuilder-menu-item"
+      "parentMenuItemUserKey": "layoutBuilder-menu-item",
+      "iconName": "person"
     },
     {
       "displayName": "Media Management",
@@ -6189,7 +6196,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "media-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "mediaManagement-menu-item"
+      "parentMenuItemUserKey": "mediaManagement-menu-item",
+      "iconName": "perm_media"
     },
     {
       "displayName": "Media Storage Provider",
@@ -6197,7 +6205,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "mediaStorageProviderMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "mediaManagement-menu-item"
+      "parentMenuItemUserKey": "mediaManagement-menu-item",
+      "iconName": "cloud"
     },
     {
       "displayName": "IAM",
@@ -6206,7 +6215,7 @@
       "actionUserKey": "",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
-      "iconName": "person_shield"
+      "iconName": "manage_accounts"
     },
     {
       "displayName": "User",
@@ -6214,7 +6223,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "user-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "person"
     },
     {
       "displayName": "Role",
@@ -6222,7 +6232,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "roleMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "admin_panel_settings"
     },
     {
       "displayName": "Permission",
@@ -6230,7 +6241,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "permissionMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "key"
     },
     {
       "displayName": "Security rules",
@@ -6238,7 +6250,8 @@
       "sequenceNumber": 4,
       "actionUserKey": "securityRule-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "gavel"
     },
     {
       "displayName": "User Activity History",
@@ -6246,7 +6259,8 @@
       "sequenceNumber": 5,
       "actionUserKey": "userActivityHistory-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "history"
     },
     {
       "displayName": "Queues",
@@ -6263,7 +6277,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "solid-core-queue-health-dashboard-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "queues-menu-item"
+      "parentMenuItemUserKey": "queues-menu-item",
+      "iconName": "analytics"
     },
     {
       "displayName": "Queues",
@@ -6271,7 +6286,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "mqMessageQueue-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "queues-menu-item"
+      "parentMenuItemUserKey": "queues-menu-item",
+      "iconName": "dns"
     },
     {
       "displayName": "Messages",
@@ -6279,7 +6295,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "mqMessage-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "queues-menu-item"
+      "parentMenuItemUserKey": "queues-menu-item",
+      "iconName": "message"
     },
     {
       "displayName": "Notification",
@@ -6288,7 +6305,7 @@
       "actionUserKey": "",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
-      "iconName": "notification_settings"
+      "iconName": "notification_add"
     },
     {
       "displayName": "Email",
@@ -6296,7 +6313,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "emailTemplate-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "notification-menu-item"
+      "parentMenuItemUserKey": "notification-menu-item",
+      "iconName": "email"
     },
     {
       "displayName": "SMS",
@@ -6304,7 +6322,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "smsTemplate-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "notification-menu-item"
+      "parentMenuItemUserKey": "notification-menu-item",
+      "iconName": "sms"
     },
     {
       "displayName": "Other",
@@ -6313,7 +6332,7 @@
       "actionUserKey": "",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
-      "iconName": "other_admission"
+      "iconName": "more_horiz"
     },
     {
       "displayName": "List of Values",
@@ -6321,7 +6340,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "listOfValues-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "list"
     },
     {
       "displayName": "Scheduled Jobs",
@@ -6329,7 +6349,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "scheduledJob-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "event_repeat"
     },
     {
       "displayName": "Saved Filters",
@@ -6337,7 +6358,8 @@
       "sequenceNumber": 4,
       "actionUserKey": "savedFilters-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "filter_list_alt"
     },
     {
       "displayName": "Chatter Message",
@@ -6345,7 +6367,8 @@
       "sequenceNumber": 5,
       "actionUserKey": "chatterMessage-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "forum"
     },
     {
       "displayName": "Locale",
@@ -6353,7 +6376,8 @@
       "sequenceNumber": 7,
       "actionUserKey": "locale-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "language"
     },
     {
       "displayName": "Import Transactions",
@@ -6361,7 +6385,8 @@
       "sequenceNumber": 8,
       "actionUserKey": "importTransaction-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "upload_file"
     },
     {
       "displayName": "Settings",
@@ -6378,7 +6403,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "modelSequence-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "format_list_numbered"
     },
     {
       "displayName": "Dashboard User Layout",
@@ -6387,7 +6413,7 @@
       "actionUserKey": "dashboardUserLayout-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
-      "iconName": ""
+      "iconName": "dashboard_customize"
     },
     {
       "displayName": "Agent",
@@ -6404,7 +6430,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "agentSession-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "agent-menu-item"
+      "parentMenuItemUserKey": "agent-menu-item",
+      "iconName": "chat"
     },
     {
       "displayName": "MCP Audit Log",
@@ -6412,7 +6439,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "mcpAuditLog-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "agent-menu-item"
+      "parentMenuItemUserKey": "agent-menu-item",
+      "iconName": "fact_check"
     }
   ],
   "views": [

package/src/services/active-session-storage.service.ts

@@ -0,0 +1,24 @@
+import { CACHE_MANAGER } from "@nestjs/cache-manager";
+import { Inject, Injectable } from "@nestjs/common";
+import { Cache } from "cache-manager";
+
+@Injectable()
+export class ActiveSessionStorageService {
+  constructor(@Inject(CACHE_MANAGER) private readonly cacheManager: Cache) {}
+
+  async setActiveSession(userId: number, sessionId: string): Promise<void> {
+    await this.cacheManager.set(this.getKey(userId), sessionId);
+  }
+
+  async getActiveSession(userId: number): Promise<string | undefined> {
+    return this.cacheManager.get(this.getKey(userId));
+  }
+
+  async clearActiveSession(userId: number): Promise<void> {
+    await this.cacheManager.del(this.getKey(userId));
+  }
+
+  private getKey(userId: number): string {
+    return `active-session-${userId}`;
+  }
+}

package/src/services/authentication.service.ts

@@ -39,6 +39,7 @@ import { SignUpDto } from "../dtos/sign-up.dto";
 import { User } from "../entities/user.entity";
 import { EventDetails, EventType } from "../interfaces";
 import { ActiveUserData } from "../interfaces/active-user-data.interface";
+import { ActiveSessionStorageService } from "./active-session-storage.service";
 import { HashingService } from "./hashing.service";
 import {
   InvalidatedRefreshTokenError,
@@ -74,6 +75,7 @@ export class AuthenticationService {
     private readonly userRepository: UserRepository,
     private readonly hashingService: HashingService,
     private readonly jwtService: JwtService,
+    private readonly activeSessionStorage: ActiveSessionStorageService,
     private readonly refreshTokenIdsStorage: RefreshTokenIdsStorageService,
     private readonly httpService: HttpService,
     // private readonly mailService: SMTPEMailService,
@@ -1042,13 +1044,15 @@ export class AuthenticationService {
     }
 
     const type = this.resolveLoginType(signInDto);
-    const user = await this.findUserForLogin(type, signInDto.identifier);
-    const dummyOtp = this.getDummyOtpForUser(user);
-    if (!dummyOtp) {
-      await this.assignLoginOtp(user, type);
-      await this.notifyUserOnOtpInititateLogin(user, type);
+    const user = await this.findUserForLoginOrNull(type, signInDto.identifier);
+    if (user) {
+      const dummyOtp = this.getDummyOtpForUser(user);
+      if (!dummyOtp) {
+        await this.assignLoginOtp(user, type);
+        await this.notifyUserOnOtpInititateLogin(user, type);
+      }
     }
-    return this.buildLoginOtpResponse(user, type);
+    return this.buildLoginOtpResponse(type, signInDto.identifier, user);
   }
 
   private resolveLoginType(
@@ -1100,6 +1104,25 @@ export class AuthenticationService {
     return user;
   }
 
+  private async findUserForLoginOrNull(
+    type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+    options: { withRoles?: boolean } = {},
+  ): Promise<User | null> {
+    try {
+      return await this.findUserForLogin(type, identifier, options);
+    } catch (error) {
+      if (
+        error instanceof UnauthorizedException &&
+        (error.message === ERROR_MESSAGES.USER_NOT_FOUND ||
+          error.message === ERROR_MESSAGES.USER_INACTIVE)
+      ) {
+        return null;
+      }
+      throw error;
+    }
+  }
+
   private async assignLoginOtp(
     user: User,
     type: PasswordlessLoginValidateWhatSources,
@@ -1123,19 +1146,29 @@ export class AuthenticationService {
   }
 
   private buildLoginOtpResponse(
-    user: User,
     type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+    user?: User | null,
   ) {
-    const maskedIdentifier =
-      type === PasswordlessLoginValidateWhatSources.EMAIL
-        ? { email: this.maskEmail(user.email) }
-        : { mobile: this.maskMobile(user.mobile) };
+    const maskedIdentifier = this.buildMaskedLoginIdentifier(
+      type,
+      user?.email ?? user?.mobile ?? identifier,
+    );
     return {
       message: SUCCESS_MESSAGES.OTP_SENT_SUCCESS_LOGIN,
       user: maskedIdentifier,
     };
   }
 
+  private buildMaskedLoginIdentifier(
+    type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+  ) {
+    return type === PasswordlessLoginValidateWhatSources.EMAIL
+      ? { email: this.maskEmail(identifier) }
+      : { mobile: this.maskMobile(identifier) };
+  }
+
   private async notifyUserOnOtpInititateLogin(
     user: User,
     loginType: PasswordlessLoginValidateWhatSources,
@@ -1273,9 +1306,12 @@ export class AuthenticationService {
       throw new BadRequestException(ERROR_MESSAGES.INVALID_VERIFICATION_TYPE);
     }
 
-    const user = await this.findUserForLogin(type, identifier, {
+    const user = await this.findUserForLoginOrNull(type, identifier, {
       withRoles: true,
     });
+    if (!user) {
+      throw new UnauthorizedException(ERROR_MESSAGES.INVALID_OTP);
+    }
     this.checkAccountBlocked(user);
     const dummyOtp = this.getDummyOtpForUser(user);
 
@@ -1677,8 +1713,16 @@ export class AuthenticationService {
   }
 
   async generateTokens(user: User) {
+    const sessionId = this.shouldPreventConcurrentLogins()
+      ? randomUUID()
+      : undefined;
+    if (sessionId) {
+      await this.activeSessionStorage.setActiveSession(user.id, sessionId);
+    } else {
+      await this.activeSessionStorage.clearActiveSession(user.id);
+    }
     const [accessToken, refreshToken] = await Promise.all([
-      await this.generateAccessToken(user),
+      await this.generateAccessToken(user, sessionId),
       await this.generateRefreshToken(user),
     ]);
 
@@ -1688,16 +1732,24 @@ export class AuthenticationService {
     };
   }
 
-  async generateAccessToken(user: User) {
+  async generateAccessToken(user: User, sessionId?: string) {
     // const userRoleNames = user.roles.map((role) => role.name).join(';')
     const userRoleNames = user.roles.map((role) => role.name);
+    const resolvedSessionId = this.shouldPreventConcurrentLogins()
+      ? sessionId ?? (await this.activeSessionStorage.getActiveSession(user.id))
+      : undefined;
 
     const accessTokenTtl =
       this.settingService.getConfigValue<SolidCoreSetting>("accessTokenTtl");
     const accessToken = await this.signToken<Partial<ActiveUserData>>(
       user.id,
       accessTokenTtl,
-      { username: user.username, email: user.email, roles: userRoleNames },
+      {
+        username: user.username,
+        email: user.email,
+        roles: userRoleNames,
+        ...(resolvedSessionId ? { sessionId: resolvedSessionId } : {}),
+      },
     );
 
     return accessToken;
@@ -2116,6 +2168,14 @@ export class AuthenticationService {
     );
   }
 
+  private shouldPreventConcurrentLogins(): boolean {
+    return (
+      this.settingService.getConfigValue<SolidCoreSetting>(
+        "preventConcurrentLogins",
+      ) === true
+    );
+  }
+
   private checkAccountBlocked(user: User): void {
     const maxFailedAttempts =
       this.settingService.getConfigValue<SolidCoreSetting>(
@@ -2172,6 +2232,7 @@ export class AuthenticationService {
 
       const userId = payload.sub;
       await this.refreshTokenIdsStorage.invalidate(userId);
+      await this.activeSessionStorage.clearActiveSession(userId);
       const user = await this.userRepository.findOne({
         where: {
           id: userId,

package/src/services/chatter-message.service.ts

@@ -23,6 +23,7 @@ import { ChatterMessage } from '../entities/chatter-message.entity';
 import { getMediaStorageProvider } from './mediaStorageProviders';
 import { RequestContextService } from './request-context.service';
 import { Logger } from '@nestjs/common';
+import { SolidIntrospectService } from './solid-introspect.service';
 
 @Injectable()
 export class ChatterMessageService extends CRUDService<ChatterMessage> {
@@ -50,6 +51,26 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         super(entityManager, repo, 'chatterMessage', 'solid-core', moduleRef);
     }
 
+    private getCoModelService(coModelName: string): CRUDService<any> {
+        const introspectService = this.moduleRef.get(SolidIntrospectService, { strict: false });
+        const modelSingularName = lowerFirst(coModelName);
+        const coModelService = introspectService?.getCRUDService(modelSingularName);
+        if (!coModelService) {
+            throw new BadRequestException(ERROR_MESSAGES.MODEL_SERVICE_NOT_FOUND(modelSingularName));
+        }
+        return coModelService;
+    }
+
+    private async assertRecordAccess(coModelName: string, coModelEntityId: number) {
+        const activeUser = this.requestContextService.getActiveUser();
+        if (!activeUser) {
+            throw new ForbiddenException(ERROR_MESSAGES.FORBIDDEN);
+        }
+
+        const coModelService = this.getCoModelService(coModelName);
+        await coModelService.findOne(coModelEntityId, {}, { activeUser });
+    }
+
     private resolveMessageUserId(userId?: number | null): number | null {
         if (userId) {
             return userId;
@@ -96,6 +117,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             throw new NotFoundException(`Entity [solid-core.chatterMessage] with id ${id} not found`);
         }
 
+        await this.assertRecordAccess(message.coModelName, message.coModelEntityId);
+
         message.status = CHATTER_MESSAGE_STATUS.COMPLETED;
         return this.repo.save(message);
     }
@@ -111,6 +134,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             throw new NotFoundException(`Entity [solid-core.chatterMessage] with id ${id} not found`);
         }
 
+        await this.assertRecordAccess(message.coModelName, message.coModelEntityId);
+
         if (!this.isEditableCustomNoteMessage(message)) {
             throw new BadRequestException('Only custom note messages can be edited.');
         }
@@ -193,17 +218,20 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
     }
 
     async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = []) {
+        const coModelName = lowerFirst(postDto.coModelName);
+        await this.assertRecordAccess(coModelName, postDto.coModelEntityId);
+
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.CUSTOM;
         chatterMessage.messageSubType = postDto.messageSubType || CHATTER_MESSAGE_SUBTYPE.CUSTOM;
         chatterMessage.status = postDto.status ?? CHATTER_MESSAGE_STATUS.PENDING;
         chatterMessage.messageBody = postDto.messageBody;
         chatterMessage.coModelEntityId = postDto.coModelEntityId;
-        chatterMessage.coModelName = postDto.coModelName;
+        chatterMessage.coModelName = coModelName;
         chatterMessage.modelUserKey = postDto.modelUserKey ?? null;
 
         const model = await this.modelMetadataRepo.findOne({
-            where: { singularName: lowerFirst(postDto.coModelName) },
+            where: { singularName: coModelName },
             relations: { userKeyField: true }
         });
         chatterMessage.modelDisplayName = model?.displayName ?? null;
@@ -683,6 +711,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         const { limit = 25, offset = 0, populate = [], populateMedia = [], filters } = query;
         this.logHeapUsed('getChatterMessages-start');
 
+        await this.assertRecordAccess(lowerFirst(entityName), entityId);
+
         const model = await this.modelMetadataRepo.findOne({
             where: {
                 singularName: entityName

package/src/services/computed-fields/entity/alpha-num-external-id-computed-field-provider.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { ComputedFieldProvider } from 'src/decorators/computed-field-provider.decorator';
 import { CommonEntity } from 'src/entities/common.entity';
-import { isEmbeddedDb } from 'src/helpers/environment.helper';
 import { ComputedFieldMetadata } from 'src/helpers/solid-registry';
 import { IEntityPreComputeFieldProvider } from 'src/interfaces';
 import { EntityManager } from 'typeorm';
@@ -46,12 +45,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
       }
     }
 
-    // On embedded PGlite (pool size 1), use the originating transaction's EntityManager
-    // so the uniqueness check runs on the active connection. On regular Postgres, use the
-    // injected EntityManager (original behaviour).
-    const manager = isEmbeddedDb() ? (eventContext?.manager ?? this.entityManager) : this.entityManager;
-
-    const uniqueCode = await this.generateUniqueExternalId(manager, resolvedPrefix, codeLength, computedFieldMetadata.fieldName, entityName);
+    const uniqueCode = await this.generateUniqueExternalId(resolvedPrefix, codeLength, computedFieldMetadata.fieldName, entityName);
     const finalExternalId = resolvedPrefix ? `${resolvedPrefix}-${uniqueCode}` : uniqueCode;
 
     triggerEntity[computedFieldMetadata.fieldName] = finalExternalId;
@@ -66,8 +60,8 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return result;
   }
 
-  private async isExternalIdUnique(manager: EntityManager, externalId: string, fieldName: string, entityName: string): Promise<boolean> {
-    const count = await manager.count(entityName as any,
+  private async isExternalIdUnique(externalId: string, fieldName: string, entityName: string): Promise<boolean> {
+    const count = await this.entityManager.count(entityName as any,
       {
         where: { [fieldName]: externalId },
       }
@@ -75,7 +69,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return count === 0;
   }
 
-  private async generateUniqueExternalId(manager: EntityManager, resolvedPrefix: string, codeLength: number, fieldName: string, entityName: string): Promise<string> {
+  private async generateUniqueExternalId(resolvedPrefix: string, codeLength: number, fieldName: string, entityName: string): Promise<string> {
     const maxAttempts = 10;
 
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
@@ -84,7 +78,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
 
       const fullId = resolvedPrefix ? `${resolvedPrefix}-${newId}` : newId;
 
-      const isUnique = await this.isExternalIdUnique(manager, fullId, fieldName, entityName);
+      const isUnique = await this.isExternalIdUnique(fullId, fieldName, entityName);
 
       if (isUnique) {
         return newId;