@solidxai/core 0.1.12-beta.0 → 0.1.12-beta.10

package/dist/seeders/permission-metadata-seeder.service.d.ts

@@ -6,6 +6,7 @@ export declare class PermissionMetadataSeederService {
     private readonly solidRegistry;
     private readonly roleService;
     private readonly logger;
+    private readonly adminPermissionExclusionPrefixes;
     constructor(permissionRepo: PermissionMetadataRepository, solidRegistry: SolidRegistry, roleService: RoleMetadataService);
     seed(): Promise<void>;
 }

package/dist/seeders/permission-metadata-seeder.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permission-metadata-seeder.service.d.ts","sourceRoot":"","sources":["../../src/seeders/permission-metadata-seeder.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,qBACa,+BAA+B;IAMxC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAR9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoD;gBAKxD,cAAc,EAAE,4BAA4B,EAC5C,aAAa,EAAE,aAAa,EAE5B,WAAW,EAAE,mBAAmB;IAG7C,IAAI;CA4CX"}
+{"version":3,"file":"permission-metadata-seeder.service.d.ts","sourceRoot":"","sources":["../../src/seeders/permission-metadata-seeder.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,qBACa,+BAA+B;IAWxC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAb9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoD;IAC3E,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAI/C;gBAKiB,cAAc,EAAE,4BAA4B,EAC5C,aAAa,EAAE,aAAa,EAE5B,WAAW,EAAE,mBAAmB;IAG7C,IAAI;CA4CX"}

package/dist/seeders/permission-metadata-seeder.service.js

@@ -24,6 +24,11 @@ let PermissionMetadataSeederService = PermissionMetadataSeederService_1 = class
         this.solidRegistry = solidRegistry;
         this.roleService = roleService;
         this.logger = new common_1.Logger(PermissionMetadataSeederService_1.name);
+        this.adminPermissionExclusionPrefixes = [
+            'ImportTransactionController.',
+            'ExportTemplateController.',
+            'ExportTransactionController.',
+        ];
     }
     async seed() {
         const controllers = this.solidRegistry.getControllers();
@@ -55,7 +60,7 @@ let PermissionMetadataSeederService = PermissionMetadataSeederService_1 = class
                 this.logger.error(error);
             }
         }
-        await this.roleService.addAllPermissionsToRole("Admin");
+        await this.roleService.addAllPermissionsToRoleExceptPrefixes("Admin", this.adminPermissionExclusionPrefixes);
     }
 };
 exports.PermissionMetadataSeederService = PermissionMetadataSeederService;

package/dist/seeders/permission-metadata-seeder.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission-metadata-seeder.service.js","sourceRoot":"","sources":["../../src/seeders/permission-metadata-seeder.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwE;AACxE,8DAA2D;AAC3D,iGAA6F;AAC7F,6EAAwE;AAGjE,IAAM,+BAA+B,uCAArC,MAAM,+BAA+B;IAG1C,YAGmB,cAA4C,EAC5C,aAA4B,EAE7C,WAAiD;QAHhC,mBAAc,GAAd,cAAc,CAA8B;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAE5B,gBAAW,GAAX,WAAW,CAAqB;QARlC,WAAM,GAAG,IAAI,eAAM,CAAC,iCAA+B,CAAC,IAAI,CAAC,CAAC;IASvE,CAAC;IAEL,KAAK,CAAC,IAAI;QAER,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;QAGxD,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;gBAGnC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;gBACnC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC;oBAE9C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;oBAChC,MAAM,cAAc,GAAG,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC;oBAE1D,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;wBAC3D,KAAK,EAAE;4BACL,IAAI,EAAE,cAAc;yBACrB;qBACF,CAAC,CAAC;oBAEH,IAAI,kBAAkB,EAAE,CAAC;wBACvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,cAAc,kBAAkB,CAAC,CAAC;oBAClE,CAAC;yBACI,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,cAAc,gCAAgC,CAAC,CAAC;wBAE9E,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;4BAC/C,IAAI,EAAE,cAAc;yBACrB,CAAC,CAAC;wBACH,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBAEhD,CAAC;gBACH,CAAC;YAEH,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAGD,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;CACF,CAAA;AAxDY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,mBAAU,GAAE;IASR,WAAA,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,2CAAmB,CAAC,CAAC,CAAA;qCAFb,6DAA4B;QAC7B,8BAAa;QAEf,2CAAmB;GATxC,+BAA+B,CAwD3C","sourcesContent":["import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';\nimport { RoleMetadataService } from '../services/role-metadata.service';\n\n@Injectable()\nexport class PermissionMetadataSeederService {\n  private readonly logger = new Logger(PermissionMetadataSeederService.name);\n\n  constructor(\n    // @InjectRepository(PermissionMetadata)\n    // private readonly permissionRepo: Repository<PermissionMetadata>,\n    private readonly permissionRepo: PermissionMetadataRepository,\n    private readonly solidRegistry: SolidRegistry,\n    @Inject(forwardRef(() => RoleMetadataService))\n    private readonly roleService: RoleMetadataService,\n  ) { }\n\n  async seed() {\n\n    const controllers = this.solidRegistry.getControllers();\n\n    // Loop over the countries and create them.\n    for (let id = 0; id < controllers.length; id++) {\n      try {\n        const controller = controllers[id];\n        // this.logger.log(`Resolving controller: ${controller.name}`);\n\n        const methods = controller.methods;\n        for (let mId = 0; mId < methods.length; mId++) {\n\n          const methodName = methods[mId];\n          const permissionName = `${controller.name}.${methodName}`;\n\n          const existingPermission = await this.permissionRepo.findOne({\n            where: {\n              name: permissionName\n            }\n          });\n\n          if (existingPermission) {\n            this.logger.log(`Permission ${permissionName} already exists.`);\n          }\n          else {\n            this.logger.log(`Permission ${permissionName} does not exist, creating new.`);\n\n            const newPermission = this.permissionRepo.create({\n              name: permissionName\n            });\n            await this.permissionRepo.save(newPermission);\n\n          }\n        }\n\n      } catch (error: any) {\n        this.logger.error(error);\n      }\n    }\n\n    // Associate the Admin role with all existing permissions. \n    await this.roleService.addAllPermissionsToRole(\"Admin\");\n  }\n}"]}
+{"version":3,"file":"permission-metadata-seeder.service.js","sourceRoot":"","sources":["../../src/seeders/permission-metadata-seeder.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwE;AACxE,8DAA2D;AAC3D,iGAA6F;AAC7F,6EAAwE;AAGjE,IAAM,+BAA+B,uCAArC,MAAM,+BAA+B;IAQ1C,YAGmB,cAA4C,EAC5C,aAA4B,EAE7C,WAAiD;QAHhC,mBAAc,GAAd,cAAc,CAA8B;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAE5B,gBAAW,GAAX,WAAW,CAAqB;QAblC,WAAM,GAAG,IAAI,eAAM,CAAC,iCAA+B,CAAC,IAAI,CAAC,CAAC;QAC1D,qCAAgC,GAAG;YAClD,8BAA8B;YAC9B,2BAA2B;YAC3B,8BAA8B;SAC/B,CAAC;IASE,CAAC;IAEL,KAAK,CAAC,IAAI;QAER,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;QAGxD,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;gBAGnC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;gBACnC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC;oBAE9C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;oBAChC,MAAM,cAAc,GAAG,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC;oBAE1D,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;wBAC3D,KAAK,EAAE;4BACL,IAAI,EAAE,cAAc;yBACrB;qBACF,CAAC,CAAC;oBAEH,IAAI,kBAAkB,EAAE,CAAC;wBACvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,cAAc,kBAAkB,CAAC,CAAC;oBAClE,CAAC;yBACI,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,cAAc,gCAAgC,CAAC,CAAC;wBAE9E,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;4BAC/C,IAAI,EAAE,cAAc;yBACrB,CAAC,CAAC;wBACH,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBAEhD,CAAC;gBACH,CAAC;YAEH,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAGD,MAAM,IAAI,CAAC,WAAW,CAAC,qCAAqC,CAAC,OAAO,EAAE,IAAI,CAAC,gCAAgC,CAAC,CAAC;IAC/G,CAAC;CACF,CAAA;AA7DY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,mBAAU,GAAE;IAcR,WAAA,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,2CAAmB,CAAC,CAAC,CAAA;qCAFb,6DAA4B;QAC7B,8BAAa;QAEf,2CAAmB;GAdxC,+BAA+B,CA6D3C","sourcesContent":["import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';\nimport { RoleMetadataService } from '../services/role-metadata.service';\n\n@Injectable()\nexport class PermissionMetadataSeederService {\n  private readonly logger = new Logger(PermissionMetadataSeederService.name);\n  private readonly adminPermissionExclusionPrefixes = [\n    'ImportTransactionController.',\n    'ExportTemplateController.',\n    'ExportTransactionController.',\n  ];\n\n  constructor(\n    // @InjectRepository(PermissionMetadata)\n    // private readonly permissionRepo: Repository<PermissionMetadata>,\n    private readonly permissionRepo: PermissionMetadataRepository,\n    private readonly solidRegistry: SolidRegistry,\n    @Inject(forwardRef(() => RoleMetadataService))\n    private readonly roleService: RoleMetadataService,\n  ) { }\n\n  async seed() {\n\n    const controllers = this.solidRegistry.getControllers();\n\n    // Loop over the countries and create them.\n    for (let id = 0; id < controllers.length; id++) {\n      try {\n        const controller = controllers[id];\n        // this.logger.log(`Resolving controller: ${controller.name}`);\n\n        const methods = controller.methods;\n        for (let mId = 0; mId < methods.length; mId++) {\n\n          const methodName = methods[mId];\n          const permissionName = `${controller.name}.${methodName}`;\n\n          const existingPermission = await this.permissionRepo.findOne({\n            where: {\n              name: permissionName\n            }\n          });\n\n          if (existingPermission) {\n            this.logger.log(`Permission ${permissionName} already exists.`);\n          }\n          else {\n            this.logger.log(`Permission ${permissionName} does not exist, creating new.`);\n\n            const newPermission = this.permissionRepo.create({\n              name: permissionName\n            });\n            await this.permissionRepo.save(newPermission);\n\n          }\n        }\n\n      } catch (error: any) {\n        this.logger.error(error);\n      }\n    }\n\n    // Associate the Admin role with all existing permissions. \n    await this.roleService.addAllPermissionsToRoleExceptPrefixes(\"Admin\", this.adminPermissionExclusionPrefixes);\n  }\n}"]}

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

@@ -3911,6 +3911,18 @@
                         "encrypt": false,
                         "isSystem": false
                     },
+                    {
+                        "name": "messageBodyMentions",
+                        "displayName": "Message Body Mentions",
+                        "type": "longText",
+                        "ormType": "text",
+                        "required": false,
+                        "unique": false,
+                        "index": false,
+                        "private": false,
+                        "encrypt": false,
+                        "isSystem": false
+                    },
                     {
                         "name": "coModelEntityId",
                         "displayName": "CoModel Entity Id",
@@ -5294,6 +5306,9 @@
                 "FieldMetadataController.getSelectionDynamicValues",
                 "FieldMetadataController.getSelectionDynamicValue",
                 "FieldMetadataController.findFieldDefaultMetaData",
+                "MediaController.findMany",
+                "MediaController.findOne",
+                "MediaController.download",
                 "SavedFiltersController.delete",
                 "SavedFiltersController.deleteMany",
                 "SavedFiltersController.findOne",
@@ -5309,14 +5324,6 @@
                 "ChatterMessageController.findMany",
                 "ChatterMessageController.markCompleted",
                 "ChatterMessageController.updateCustomNoteMessage",
-                "ImportTransactionController.getImportTemplate",
-                "ImportTransactionController.getImportInstructions",
-                "ImportTransactionController.getImportMappingInfo",
-                "ImportTransactionController.startImportSync",
-                "ImportTransactionController.startImportAsync",
-                "ImportTransactionController.exportFailedImportedImports",
-                "ExportTemplateController.startExportSync",
-                "ExportTemplateController.startExportAsync",
                 "ListOfValuesController.findMany",
                 "ListOfValuesController.findOne",
                 "SettingController.getAllSettings",
@@ -5336,6 +5343,31 @@
                 "agent:invoke"
             ]
         },
+        {
+            "name": "Allowed To Import",
+            "permissions": [
+                "ImportTransactionController.create",
+                "ImportTransactionController.delete",
+                "ImportTransactionController.deleteMany",
+                "ImportTransactionController.getImportTemplate",
+                "ImportTransactionController.getImportInstructions",
+                "ImportTransactionController.getImportMappingInfo",
+                "ImportTransactionController.partialUpdate",
+                "ImportTransactionController.startImportSync",
+                "ImportTransactionController.startImportAsync",
+                "ImportTransactionController.exportFailedImportedImports"
+            ]
+        },
+        {
+            "name": "Allowed To Export",
+            "permissions": [
+                "ExportTemplateController.create",
+                "ExportTemplateController.delete",
+                "ExportTemplateController.findMany",
+                "ExportTemplateController.startExportSync",
+                "ExportTemplateController.startExportAsync"
+            ]
+        },
         {
             "name": "Public",
             "permissions": [
@@ -8595,16 +8627,15 @@
                                                         "attrs": {
                                                             "name": "roles",
                                                             "widget": "checkbox",
-                                                            "inlineCreateAutoSave": "true",
+                                                            "inlineCreateAutoSave": "false",
                                                             "renderModeCheckboxPreprocessor": "MenuItemMetadataRolesFormFieldPreprocessor",
-                                                            "inlineCreate": "true",
+                                                            "inlineCreate": "false",
                                                             "inlineCreateLayout": {
                                                                 "type": "form",
                                                                 "attrs": {
                                                                     "name": "form-1",
                                                                     "label": "User",
-                                                                    "className": "grid",
-                                                                    "width": "20vw"
+                                                                    "className": "grid"
                                                                 },
                                                                 "children": [
                                                                     {
@@ -14461,6 +14492,15 @@
             "description": "Welcome email sent to users after signup.",
             "active": true,
             "type": "text"
+        },
+        {
+            "name": "chatter-mention-notification",
+            "displayName": "Default: Chatter Mention Notification",
+            "body": "chatter-mention-notification.handlebars.html",
+            "subject": "{{mentionedByDisplayName}} mentioned you in {{entityDisplayName}}",
+            "description": "This template notifies users when they are mentioned in a custom chatter note.",
+            "active": true,
+            "type": "text"
         }
     ],
     "smsTemplates": [
@@ -14504,7 +14544,8 @@
     "mediaStorageProviders": [
         {
             "name": "default-filesystem",
-            "type": "filesystem"
+            "type": "filesystem",
+            "isPublic": true
         },
         {
             "name": "default-aws-s3",
@@ -14540,6 +14581,47 @@
                     }
                 }
             }
+        },
+        {
+            "name": "model:Media-role:Internal User-own",
+            "description": "Show Media records owned by the current user",
+            "roleUserKey": "Internal User",
+            "modelMetadataUserKey": "media",
+            "securityRuleConfig": {
+                "filters": {
+                    "createdBy": {
+                        "$eq": "$activeUserId"
+                    }
+                }
+            }
+        },
+        {
+            "name": "model:Media-role:Internal User-public",
+            "description": "Show public Media records",
+            "roleUserKey": "Internal User",
+            "modelMetadataUserKey": "media",
+            "securityRuleConfig": {
+                "filters": {
+                    "mediaStorageProviderMetadata": {
+                        "isPublic": {
+                            "$eq": true
+                        }
+                    }
+                }
+            }
+        },
+        {
+            "name": "model:Media-role:Admin",
+            "description": "Show All Media records",
+            "roleUserKey": "Admin",
+            "modelMetadataUserKey": "media",
+            "securityRuleConfig": {
+                "filters": {
+                    "id": {
+                        "$ne": "0"
+                    }
+                }
+            }
         }
     ],
     "modelSequences": [],

package/dist/services/authentication.service.d.ts

@@ -48,6 +48,7 @@ export declare class AuthenticationService {
     constructor(userService: UserService, userRepository: UserRepository, hashingService: HashingService, jwtService: JwtService, activeSessionStorage: ActiveSessionStorageService, refreshTokenIdsStorage: RefreshTokenIdsStorageService, httpService: HttpService, mailServiceFactory: MailFactory, smsFactory: SmsFactory, whatsAppFactory: WhatsAppFactory, eventEmitter: EventEmitter2, settingService: SettingService, roleMetadataService: RoleMetadataService, userActivityHistoryService: UserActivityHistoryService, ssoCodeStorage: SsoCodeStorageService, dataSource: DataSource, solidRegistry: SolidRegistry);
     private getCompanyLogo;
     resolveUser(username: string, email: string): Promise<User>;
+    private resolveUserForPasswordSignIn;
     updatePasswordDetails(user: User, newPassword: string): Promise<User>;
     resolveUserByVerificationToken(token: string): Promise<User>;
     private validateUserForPasswordLogin;
@@ -113,11 +114,10 @@ export declare class AuthenticationService {
         };
     }>;
     private resolveLoginType;
+    private resolveUserForOtpEmailSignIn;
     private findUserForLogin;
-    private findUserForLoginOrNull;
     private assignLoginOtp;
     private buildLoginOtpResponse;
-    private buildMaskedLoginIdentifier;
     private notifyUserOnOtpInititateLogin;
     otpConfirmLogin(confirmSignInDto: OTPConfirmOTPDto): Promise<{
         accessToken: string;

package/dist/services/authentication.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authentication.service.d.ts","sourceRoot":"","sources":["../../src/services/authentication.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authentication.service.d.ts","sourceRoot":"","sources":["../../src/services/authentication.service.ts"],"names":[],"mappings":"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"}

package/dist/services/authentication.service.js

@@ -79,6 +79,24 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             },
         });
     }
+    async resolveUserForPasswordSignIn(username, email) {
+        const normalizedEmail = email?.trim().toLowerCase();
+        const query = (await this.userRepository
+            .createSecurityRuleAwareQueryBuilder("u"))
+            .leftJoinAndSelect("u.roles", "roles");
+        if (username) {
+            query.where("u.username = :username", { username });
+        }
+        if (normalizedEmail) {
+            if (username) {
+                query.orWhere("LOWER(u.email) = :email", { email: normalizedEmail });
+            }
+            else {
+                query.where("LOWER(u.email) = :email", { email: normalizedEmail });
+            }
+        }
+        return await query.getOne();
+    }
     async updatePasswordDetails(user, newPassword) {
         user.password = await this.hashingService.hash(newPassword);
         user.passwordScheme = this.hashingService.name();
@@ -123,18 +141,19 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             }
             const entity = await provider.buildExtensionEntity(signUpDto);
             const effectiveDto = { ...signUpDto, roles: provider.roles(signUpDto) };
-            return this.performSignUp(effectiveDto, entity, provider.repo);
+            return this.performSignUp(effectiveDto, entity, provider.repo, true);
         }
         return this.performSignUp(signUpDto, new user_entity_1.User(), this.userRepository);
     }
-    async performSignUp(signUpDto, entity, repo) {
+    async performSignUp(signUpDto, entity, repo, preferEntityApiKeyFlag = false) {
         try {
             const onForcePasswordChange = this.settingService.getConfigValue("forceChangePasswordOnFirstLogin");
             const activateUserOnRegistration = this.settingService.getConfigValue("activateUserOnRegistration");
             const defaultRole = this.settingService.getConfigValue("defaultRole");
             var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(entity, signUpDto, activateUserOnRegistration, onForcePasswordChange);
             const privateDto = signUpDto;
-            if (privateDto.isAllowedToGenerateApiKeys !== undefined) {
+            if (!preferEntityApiKeyFlag &&
+                privateDto.isAllowedToGenerateApiKeys !== undefined) {
                 user.isAllowedToGenerateApiKeys = privateDto.isAllowedToGenerateApiKeys;
             }
             const savedUser = await repo.save(user);
@@ -590,7 +609,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             .filter(Boolean));
     }
     async signIn(signInDto) {
-        const user = await this.resolveUser(signInDto.username, signInDto.email);
+        const user = await this.resolveUserForPasswordSignIn(signInDto.username, signInDto.email);
         if (!user) {
             throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.INVALID_CREDENTIALS);
         }
@@ -637,15 +656,13 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.PASSWORDLESS_REGISTRATION_DISABLED);
         }
         const type = this.resolveLoginType(signInDto);
-        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);
-            }
+        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);
         }
-        return this.buildLoginOtpResponse(type, signInDto.identifier, user);
+        return this.buildLoginOtpResponse(user, type);
     }
     resolveLoginType(signInDto) {
         const setting = this.settingService.getConfigValue("passwordlessLoginValidateWhat");
@@ -662,14 +679,25 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
         throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.INVALID_VERIFICATION_TYPE);
     }
+    async resolveUserForOtpEmailSignIn(identifier, options = {}) {
+        const normalizedEmail = identifier?.trim().toLowerCase();
+        const query = await this.userRepository.createSecurityRuleAwareQueryBuilder("u");
+        if (options.withRoles) {
+            query.leftJoinAndSelect("u.roles", "roles");
+        }
+        query.where("u.username = :username", { username: identifier });
+        if (normalizedEmail) {
+            query.orWhere("LOWER(u.email) = :email", { email: normalizedEmail });
+        }
+        return await query.getOne();
+    }
     async findUserForLogin(type, identifier, options = {}) {
-        const typeWhere = type === constants_1.PasswordlessLoginValidateWhatSources.EMAIL
-            ? { email: identifier }
-            : { mobile: identifier };
-        const user = await this.userRepository.findOne({
-            where: [{ username: identifier }, typeWhere],
-            ...(options.withRoles ? { relations: { roles: true } } : {}),
-        });
+        const user = type === constants_1.PasswordlessLoginValidateWhatSources.EMAIL
+            ? await this.resolveUserForOtpEmailSignIn(identifier, options)
+            : await this.userRepository.findOne({
+                where: [{ username: identifier }, { mobile: identifier }],
+                ...(options.withRoles ? { relations: { roles: true } } : {}),
+            });
         if (!user) {
             throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.USER_NOT_FOUND);
         }
@@ -678,19 +706,6 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
         return user;
     }
-    async findUserForLoginOrNull(type, identifier, options = {}) {
-        try {
-            return await this.findUserForLogin(type, identifier, options);
-        }
-        catch (error) {
-            if (error instanceof common_1.UnauthorizedException &&
-                (error.message === error_messages_1.ERROR_MESSAGES.USER_NOT_FOUND ||
-                    error.message === error_messages_1.ERROR_MESSAGES.USER_INACTIVE)) {
-                return null;
-            }
-            throw error;
-        }
-    }
     async assignLoginOtp(user, type) {
         const { token, expiresAt } = await this.otp();
         if (type === constants_1.PasswordlessLoginValidateWhatSources.EMAIL) {
@@ -710,18 +725,15 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             });
         }
     }
-    buildLoginOtpResponse(type, identifier, user) {
-        const maskedIdentifier = this.buildMaskedLoginIdentifier(type, user?.email ?? user?.mobile ?? identifier);
+    buildLoginOtpResponse(user, type) {
+        const maskedIdentifier = type === constants_1.PasswordlessLoginValidateWhatSources.EMAIL
+            ? { email: this.maskEmail(user.email) }
+            : { mobile: this.maskMobile(user.mobile) };
         return {
             message: success_messages_1.SUCCESS_MESSAGES.OTP_SENT_SUCCESS_LOGIN,
             user: maskedIdentifier,
         };
     }
-    buildMaskedLoginIdentifier(type, identifier) {
-        return type === constants_1.PasswordlessLoginValidateWhatSources.EMAIL
-            ? { email: this.maskEmail(identifier) }
-            : { mobile: this.maskMobile(identifier) };
-    }
     async notifyUserOnOtpInititateLogin(user, loginType) {
         const companyLogo = await this.getCompanyLogo();
         const dummyOtp = this.getDummyOtpForUser(user);
@@ -798,12 +810,9 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             type !== constants_1.PasswordlessLoginValidateWhatSources.MOBILE) {
             throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.INVALID_VERIFICATION_TYPE);
         }
-        const user = await this.findUserForLoginOrNull(type, identifier, {
+        const user = await this.findUserForLogin(type, identifier, {
             withRoles: true,
         });
-        if (!user) {
-            throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.INVALID_OTP);
-        }
         this.checkAccountBlocked(user);
         const dummyOtp = this.getDummyOtpForUser(user);
         if (dummyOtp) {