@solidstarters/solid-core 1.2.165 → 1.2.168

package/dist/interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AAsJA,IAAY,SAEX;AAFD,WAAY,SAAS;IACnB,gDAAmC,CAAA;AACrC,CAAC,EAFW,SAAS,yBAAT,SAAS,QAEpB;AAED,MAAa,YAAY;IACvB,YACS,IAAS,EACT,OAAU;QADV,SAAI,GAAJ,IAAI,CAAK;QACT,YAAO,GAAP,OAAO,CAAG;IACf,CAAC;CACN;AALD,oCAKC;AAmED,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,mCAAqB,CAAA;IACrB,mCAAqB,CAAA;AACvB,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB","sourcesContent":["import { CreateEmailTemplateDto } from 'src/dtos/create-email-template.dto';\nimport { CreateSmsTemplateDto } from 'src/dtos/create-sms-template.dto';\nimport { SignUpDto } from 'src/dtos/sign-up.dto';\nimport { Readable } from 'stream';\nimport { CreateMediaStorageProviderMetadataDto } from './dtos/create-media-storage-provider-metadata.dto';\nimport { DatasourceType } from './dtos/create-model-metadata.dto';\nimport { CreateModuleMetadataDto } from './dtos/create-module-metadata.dto';\nimport { CreateRoleMetadataDto } from './dtos/create-role-metadata.dto';\nimport { CreateSecurityRuleDto } from './dtos/create-security-rule.dto';\nimport { FieldMetadata } from './entities/field-metadata.entity';\nimport { Media } from './entities/media.entity';\nimport { DashboardQuestion } from './entities/dashboard-question.entity';\nimport { ComputedFieldMetadata } from './helpers/solid-registry';\nimport { SqlExpression } from './services/question-data-providers/chartjs-sql-data-provider.service';\nimport { CreateDashboardDto } from './dtos/create-dashboard.dto';\nimport { AiInteraction } from './entities/ai-interaction.entity';\n\nexport interface FieldCrudManager {\n  // fieldMetadata: FieldMetadata;\n  // entityManager?: EntityManager;\n  // createDto: any;\n  // files : Array<Express.Multer.File>;\n  validate(\n    dto: any,\n    files: Array<Express.Multer.File>,\n  ): ValidationError[] | Promise<ValidationError[]>;\n  transformForCreate(dto: any, ctxt?: any): any | Promise<any>;\n}\n\nexport interface ValidationError {\n  field: string;\n  error: string;\n}\n\n// export interface MediaStorage\nexport interface MediaStorageProvider<T> {\n  store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;\n  delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void>;\n  retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;\n  storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;\n  // delete(file: string): Promise<void>;\n}\n\nexport interface ModuleMetadataConfiguration {\n  moduleMetadata?: CreateModuleMetadataDto,\n  roles?: CreateRoleMetadataDto[],\n  users?: SignUpDto[],\n  actions?: any[],\n  menus?: any[],\n  views?: any[],\n  emailTemplates?: CreateEmailTemplateDto[],\n  smsTemplates?: CreateSmsTemplateDto[],\n  mediaStorageProviders?: CreateMediaStorageProviderMetadataDto[]\n  securityRules?: CreateSecurityRuleDto[],\n  dashboards?: CreateDashboardDto[],\n}\n\nexport interface CodeGenerationOptions {\n  moduleId?: number;\n  moduleUserKey?: string;\n  modelId?: number;\n  modelUserKey?: string;\n  fieldIdsForRemoval?: number[];\n  dryRun?: boolean;\n}\n\nexport interface TriggerMcpClientOptions {\n  aiInteractionId: number;\n}\n\nexport interface McpResponse {\n  success: boolean;\n  request: string;\n  response: string;\n  model?: string;\n  tools_invoked?: string[];\n  tool_calls?: any[];\n  duration_ms?: number;\n  errors?: string[];\n  trace?: string[];\n  content_type?: string;\n}\n\nexport interface ISelectionProviderContext {\n  // query: string;\n}\n\nexport interface ISelectionProviderValues {\n  label: string;\n  value: string;\n}\n\nexport interface ISelectionProvider<T extends ISelectionProviderContext> {\n  help(): string;\n\n  name(): string;\n\n  value(optionValue: string, ctxt: T): Promise<ISelectionProviderValues | any>;\n\n  values(query: any, ctxt: T): Promise<readonly ISelectionProviderValues[]>;\n}\n\nexport interface IDashboardVariableSelectionProvider<T extends ISelectionProviderContext> extends ISelectionProvider<T> {\n}\n\nexport interface IMcpToolResponseHandler {\n  apply(aiInteraction: AiInteraction);\n}\n\nexport interface IDashboardQuestionDataProvider<TContext, TData> {\n  help(): string;\n\n  name(): string;\n\n  getData(question: DashboardQuestion, expressions?: SqlExpression[], ctxt?: TContext): Promise<TData[] | TData>;\n}\n\n/**\n * @deprecated Use `IEntityComputedFieldProvider` instead.\n */\nexport interface IComputedFieldProvider<T> {\n  help(): string;\n\n  name(): string;\n\n  valueType(): string;\n\n  computeValue(dto: any, ctxt: T): Promise<string | number>; // FIXME : Improve the types to make it more specific using generics\n}\n\nexport interface IEntityComputedFieldProvider {\n  help(): string;\n\n  name(): string;\n}\n\nexport interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue = void> extends IEntityComputedFieldProvider {\n  preComputeValue(triggerEntity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<TValue>;\n}\n\nexport interface IEntityPostComputeFieldProvider<TTriggerEntity, TContext> extends IEntityComputedFieldProvider {\n  postComputeAndSaveValue(triggerEntity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<void>;\n}\n\nexport interface ISolidDatabaseModule {\n  name(): string;\n\n  type(): DatasourceType;\n}\n\nexport enum EventType {\n  USER_REGISTERED = 'user.registered',\n}\n\nexport class EventDetails<T> {\n  constructor(\n    public type: any,\n    public payload: T,\n  ) { }\n}\n\nexport interface IMail<TResponse = unknown> {\n  sendEmail(\n    to: string,\n    subject: string,\n    body: string,\n    shouldQueueEmails: boolean,\n    wrapperAttachments?: MailAttachmentWrapper[],\n    attachments?: MailAttachment[],\n    parentEntity?: any,\n    parentEntityId?: any,\n    cc?: string[],\n    bcc?: string[],\n    from?: string,\n  ): Promise<TResponse>;\n\n  sendEmailUsingTemplate(\n    to: string,\n    templateName: string,\n    templateParams: any,\n    shouldQueueEmails: boolean,\n    wrapperAttachments?: MailAttachmentWrapper[],\n    attachments?: MailAttachment[],\n    parentEntity?: any,\n    parentEntityId?: any,\n    cc?: string[],\n    bcc?: string[],\n    from?: string,\n  ): Promise<TResponse>;\n}\n\nexport interface ISMS {\n  sendSMS(to: string, body: string, shouldQueueSms: boolean): Promise<any>;\n\n  sendSMSUsingTemplate(\n    to: string,\n    templateName: string,\n    templateParams: any,\n    shouldQueueSms: boolean,\n  ): Promise<any>;\n}\n\nexport interface IWhatsAppTransport {\n  sendWhatsAppMessage(\n    to: string,\n    templateId: string,\n    parameters: any,\n    parentEntity?: any,\n    parentEntityId?: any\n  ): Promise<any>;\n}\n\nexport interface MailAttachmentWrapper {\n  relativePath?: string;\n  attachment?: MailAttachment;\n}\n\nexport interface MailAttachment {\n  filename: string;\n  templatePath?: string; // deprecated\n  templateParams?: any; // deprecated\n  content?: string | Buffer;\n  contentType?: string;\n  path?: string; //Filesystem absolute path or URL. \n}\n\nexport enum BrokerType {\n  RabbitMQ = 'rabbitmq',\n  Database = 'database'\n}\n\nexport interface QueuesModuleOptions {\n  name: string;\n  type: BrokerType;\n  queueName: string;\n}\n\nexport type MediaWithFullUrl = Media & {\n  _full_url: string;\n};\n"]}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AAsJA,IAAY,SAEX;AAFD,WAAY,SAAS;IACnB,gDAAmC,CAAA;AACrC,CAAC,EAFW,SAAS,yBAAT,SAAS,QAEpB;AAED,MAAa,YAAY;IACvB,YACS,IAAS,EACT,OAAU;QADV,SAAI,GAAJ,IAAI,CAAK;QACT,YAAO,GAAP,OAAO,CAAG;IACf,CAAC;CACN;AALD,oCAKC;AAmED,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,mCAAqB,CAAA;IACrB,mCAAqB,CAAA;AACvB,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB","sourcesContent":["import { CreateEmailTemplateDto } from 'src/dtos/create-email-template.dto';\nimport { CreateSmsTemplateDto } from 'src/dtos/create-sms-template.dto';\nimport { SignUpDto } from 'src/dtos/sign-up.dto';\nimport { Readable } from 'stream';\nimport { CreateMediaStorageProviderMetadataDto } from './dtos/create-media-storage-provider-metadata.dto';\nimport { DatasourceType } from './dtos/create-model-metadata.dto';\nimport { CreateModuleMetadataDto } from './dtos/create-module-metadata.dto';\nimport { CreateRoleMetadataDto } from './dtos/create-role-metadata.dto';\nimport { CreateSecurityRuleDto } from './dtos/create-security-rule.dto';\nimport { FieldMetadata } from './entities/field-metadata.entity';\nimport { Media } from './entities/media.entity';\nimport { DashboardQuestion } from './entities/dashboard-question.entity';\nimport { ComputedFieldMetadata } from './helpers/solid-registry';\nimport { SqlExpression } from './services/question-data-providers/chartjs-sql-data-provider.service';\nimport { CreateDashboardDto } from './dtos/create-dashboard.dto';\nimport { AiInteraction } from './entities/ai-interaction.entity';\n\nexport interface FieldCrudManager {\n  // fieldMetadata: FieldMetadata;\n  // entityManager?: EntityManager;\n  // createDto: any;\n  // files : Array<Express.Multer.File>;\n  validate(\n    dto: any,\n    files: Array<Express.Multer.File>,\n  ): ValidationError[] | Promise<ValidationError[]>;\n  transformForCreate(dto: any, ctxt?: any): any | Promise<any>;\n}\n\nexport interface ValidationError {\n  field: string;\n  error: string;\n}\n\n// export interface MediaStorage\nexport interface MediaStorageProvider<T> {\n  store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;\n  delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void>;\n  retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;\n  storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]>;\n  // delete(file: string): Promise<void>;\n}\n\nexport interface ModuleMetadataConfiguration {\n  moduleMetadata?: CreateModuleMetadataDto,\n  roles?: CreateRoleMetadataDto[],\n  users?: SignUpDto[],\n  actions?: any[],\n  menus?: any[],\n  views?: any[],\n  emailTemplates?: CreateEmailTemplateDto[],\n  smsTemplates?: CreateSmsTemplateDto[],\n  mediaStorageProviders?: CreateMediaStorageProviderMetadataDto[]\n  securityRules?: CreateSecurityRuleDto[],\n  dashboards?: CreateDashboardDto[],\n}\n\nexport interface CodeGenerationOptions {\n  moduleId?: number;\n  moduleUserKey?: string;\n  modelId?: number;\n  modelUserKey?: string;\n  fieldIdsForRemoval?: number[];\n  dryRun?: boolean;\n}\n\nexport interface TriggerMcpClientOptions {\n  aiInteractionId: number;\n}\n\nexport interface McpResponse {\n  success: boolean;\n  request: string;\n  response: string;\n  model?: string;\n  tools_invoked?: string[];\n  tool_calls?: any[];\n  duration_ms?: number;\n  errors?: string[];\n  trace?: string[];\n  content_type?: string;\n}\n\nexport interface ISelectionProviderContext {\n  // query: string;\n}\n\nexport interface ISelectionProviderValues {\n  label: string;\n  value: string;\n}\n\nexport interface ISelectionProvider<T extends ISelectionProviderContext> {\n  help(): string;\n\n  name(): string;\n\n  value(optionValue: string, ctxt: T): Promise<ISelectionProviderValues | any>;\n\n  values(query: any, ctxt: T): Promise<readonly ISelectionProviderValues[]>;\n}\n\nexport interface IDashboardVariableSelectionProvider<T extends ISelectionProviderContext> extends ISelectionProvider<T> {\n}\n\nexport interface IMcpToolResponseHandler {\n  apply(aiInteraction: AiInteraction);\n}\n\nexport interface IDashboardQuestionDataProvider<TContext, TData> {\n  help(): string;\n\n  name(): string;\n\n  getData(question: DashboardQuestion, expressions?: SqlExpression[], ctxt?: TContext): Promise<TData[] | TData>;\n}\n\n/**\n * @deprecated Use `IEntityComputedFieldProvider` instead.\n */\nexport interface IComputedFieldProvider<T> {\n  help(): string;\n\n  name(): string;\n\n  valueType(): string;\n\n  computeValue(dto: any, ctxt: T): Promise<string | number>; // FIXME : Improve the types to make it more specific using generics\n}\n\nexport interface IEntityComputedFieldProvider {\n  help(): string;\n\n  name(): string;\n}\n\nexport interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue = void> extends IEntityComputedFieldProvider {\n  preComputeValue(triggerEntity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<TValue>;\n}\n\nexport interface IEntityPostComputeFieldProvider<TTriggerEntity, TContext> extends IEntityComputedFieldProvider {\n  postComputeAndSaveValue(triggerEntity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<void>;\n}\n\nexport interface ISolidDatabaseModule {\n  name(): string;\n\n  type(): DatasourceType;\n}\n\nexport enum EventType {\n  USER_REGISTERED = 'user.registered',\n}\n\nexport class EventDetails<T> {\n  constructor(\n    public type: any,\n    public payload: T,\n  ) { }\n}\n\nexport interface IMail<TResponse = unknown> {\n  sendEmail(\n    to: string,\n    subject: string,\n    body: string,\n    shouldQueueEmails: boolean,\n    wrapperAttachments?: MailAttachmentWrapper[],\n    attachments?: MailAttachment[],\n    parentEntity?: any,\n    parentEntityId?: any,\n    cc?: string[],\n    bcc?: string[],\n    from?: string,\n  ): Promise<TResponse>;\n\n  sendEmailUsingTemplate(\n    to: string,\n    templateName: string,\n    templateParams: any,\n    shouldQueueEmails: boolean,\n    wrapperAttachments?: MailAttachmentWrapper[],\n    attachments?: MailAttachment[],\n    parentEntity?: any,\n    parentEntityId?: any,\n    cc?: string[],\n    bcc?: string[],\n    from?: string,\n  ): Promise<TResponse>;\n}\n\nexport interface ISMS {\n  sendSMS(to: string, body: string, shouldQueueSms: boolean): Promise<any>;\n\n  sendSMSUsingTemplate(\n    to: string,\n    templateName: string,\n    templateParams: any,\n    shouldQueueSms: boolean,\n  ): Promise<any>;\n}\n\nexport interface IWhatsAppTransport {\n  sendWhatsAppMessage(\n    to: string,\n    templateId: string,\n    parameters: any,\n    parentEntity?: any,\n    parentEntityId?: any\n  ): Promise<any>;\n}\n\nexport interface MailAttachmentWrapper {\n  relativePath?: string;\n  attachment?: MailAttachment;\n}\n\nexport interface MailAttachment {\n  filename: string;\n  templatePath?: string; // deprecated\n  templateParams?: any; // deprecated\n  content?: string | Buffer;\n  contentType?: string;\n  path?: string; //Filesystem absolute path or URL. \n}\n\nexport enum BrokerType {\n  RabbitMQ = 'rabbitmq',\n  Database = 'database'\n}\n\nexport interface QueuesModuleOptions {\n  name: string;\n  type: BrokerType;\n  queueName: string;\n}\n\nexport type MediaWithFullUrl = Media & {\n  _full_url: string;\n};\n\n\nexport type ErrorCode = string;\n\nexport type ErrorMeta = {\n  message: string;\n  httpStatus?: number;\n};\n\nexport type ErrorRule = {\n  /** Canonical error code. Keep them kebab-case for consistency. */\n  code: ErrorCode;\n  /** Higher runs earlier. Defaults to 0 if not provided. */\n  priority?: number;\n  /** Return true if this rule matches the combined error text. */\n  match: (combinedErrorText: string) => boolean;\n  /** Display + HTTP mapping for this code. */\n  meta: ErrorMeta;\n};\n\nexport interface IErrorCodeProvider {\n  /** Used for registry identity & logs */\n  name(): string;\n\n  /**\n   * Return all rules this provider contributes.\n   * These will be merged with other providers’ rules, then sorted by priority.\n   */\n  rules(): ReadonlyArray<ErrorRule>;\n\n  /**\n   * Optional fallback meta for codes this provider owns (when called by getMessage/getHttpStatus).\n   * If omitted, the ErrorMapperService will rely on the rule.meta of the first matching rule.\n   */\n  resolve?(code: ErrorCode): ErrorMeta | undefined;\n}"]}

package/dist/repository/security-rule.repository.js

@@ -77,7 +77,7 @@ let SecurityRuleRepository = SecurityRuleRepository_1 = class SecurityRuleReposi
     }
     async upsertWithDto(createDto) {
         const roleRepository = this.dataSource.getRepository(role_metadata_entity_1.RoleMetadata);
-        if (!createDto.roleId) {
+        if (createDto.roleId) {
             const role = await roleRepository.findOne({
                 where: {
                     id: createDto.roleId,
@@ -94,7 +94,7 @@ let SecurityRuleRepository = SecurityRuleRepository_1 = class SecurityRuleReposi
             createDto['role'] = role;
         }
         const modelMetadataRepository = this.dataSource.getRepository(model_metadata_entity_1.ModelMetadata);
-        if (!createDto.modelMetadataId) {
+        if (createDto.modelMetadataId) {
             const modelMetadata = await modelMetadataRepository.findOne({
                 where: {
                     id: createDto.modelMetadataId,

package/dist/repository/security-rule.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"security-rule.repository.js","sourceRoot":"","sources":["../../src/repository/security-rule.repository.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { CreateSecurityRuleDto } from 'src/dtos/create-security-rule.dto';\nimport { SecurityRuleConfig } from 'src/dtos/security-rule-config.dto';\nimport { UpdateSecurityRuleDto } from 'src/dtos/update-security-rule.dto';\nimport { CommonEntity } from 'src/entities/common.entity';\nimport { ModelMetadata } from 'src/entities/model-metadata.entity';\nimport { RoleMetadata } from 'src/entities/role-metadata.entity';\nimport { SecurityRule } from 'src/entities/security-rule.entity';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\nimport { CrudHelperService, FilterCombinator } from 'src/services/crud-helper.service';\nimport { Brackets, DataSource, Repository, SelectQueryBuilder } from 'typeorm';\n\n@Injectable()\nexport class SecurityRuleRepository extends Repository<SecurityRule> {\n    private readonly logger = new Logger(SecurityRuleRepository.name);\n    constructor(\n        private dataSource: DataSource,\n        private readonly solidRegistry: SolidRegistry,\n        private readonly crudHelperService: CrudHelperService,\n    ) {\n        super(SecurityRule, dataSource.createEntityManager());\n    }\n\n    applySecurityRules<T extends CommonEntity>(qb: SelectQueryBuilder<T>, modelSingularName: string, activeUser: ActiveUserData, securityRuleAlias: string = qb.alias): SelectQueryBuilder<T> {\n        // Fetch the security rules for the model and roles\n        const securityRules = this.solidRegistry.getSecurityRules(modelSingularName, activeUser.roles);\n\n        // If no security rules, return the original query builder\n        if (!securityRules.length) {\n            return qb;\n        }\n\n        // Apply each security rule to the query builder. The rules are combined with OR logic at the top level.\n        qb.andWhere(new Brackets((outerQb) => {\n            for (const rule of securityRules) {\n                try {\n                    const parsedRule = JSON.parse(\n                        this.resolveSecurityRuleConfig(rule.securityRuleConfig, activeUser)\n                    ) as SecurityRuleConfig;\n\n                if (parsedRule && parsedRule.filters) {\n                        outerQb.orWhere( // combine each rule-group with OR at the outer level\n                            new Brackets((innerQb) => {\n                               this.crudHelperService.applyFilters(innerQb, parsedRule.filters, securityRuleAlias, qb); // AND within a rule\n                            })\n                        );\n                    }\n                } catch (error) {\n                    this.logger.warn(`Error parsing security rule: ${rule.securityRuleConfig}`, error);\n                }\n            }\n        }));\n\n        return qb;\n    }\n\n\n    private resolveSecurityRuleConfig(configString: string, activeUser: ActiveUserData) {\n        return configString.replace('$activeUserId', activeUser.sub.toString());\n    }\n\n    async toDto(securityRule: SecurityRule): Promise<UpdateSecurityRuleDto> {\n        // load the role and model relations for the security rule\n        let populatedSecurityRule: SecurityRule = securityRule;\n        // If the security rule does not have the role and model relations loaded, load them\n        if (!securityRule.role || !securityRule.modelMetadata) {\n            populatedSecurityRule = await this.findOne({\n                where: {\n                    id: securityRule.id,\n                },\n                relations: {\n                    role: true,\n                    modelMetadata: true,\n                },\n            });\n        }\n\n        return {\n            id: populatedSecurityRule.id,\n            name: populatedSecurityRule.name,\n            description: populatedSecurityRule.description,\n            roleId: populatedSecurityRule.role.id,\n            roleUserKey: populatedSecurityRule.role.name,\n            modelMetadataId: populatedSecurityRule.modelMetadata.id,\n            modelMetadataUserKey: populatedSecurityRule.modelMetadata.singularName,\n            securityRuleConfig: populatedSecurityRule.securityRuleConfig,\n        };\n    }\n\n    async upsertWithDto(createDto: CreateSecurityRuleDto) {\n        // Populate the role from roleId or roleUserKey\n        const roleRepository = this.dataSource.getRepository(RoleMetadata);\n        if (!createDto.roleId) {\n            const role = await roleRepository.findOne({\n                where: {\n                    id: createDto.roleId,\n                },\n            });\n            createDto['role'] = role;\n        }\n\n        if (createDto.roleUserKey) {\n            const role = await roleRepository.findOne({\n                where: {\n                    name: createDto.roleUserKey,\n                },\n            });\n            createDto['role'] = role;\n        }\n\n        // Populate the model from modelMetadataId or modelMetadataUserKey\n        const modelMetadataRepository = this.dataSource.getRepository(ModelMetadata);\n        if (!createDto.modelMetadataId) {\n            const modelMetadata = await modelMetadataRepository.findOne({\n                where: {\n                    id: createDto.modelMetadataId,\n                },\n            });\n            createDto['modelMetadata'] = modelMetadata;\n        }\n        if (createDto.modelMetadataUserKey) {\n            const modelMetadata = await modelMetadataRepository.findOne({\n                where: {\n                    singularName: createDto.modelMetadataUserKey,\n                },\n            });\n            createDto['modelMetadata'] = modelMetadata;\n        }\n\n        // First check if module already exists using name\n        const existingSecurityRule = await this.findOne({\n            where: {\n                name: createDto.name,\n            },\n        });\n\n        if (existingSecurityRule) {\n            const updatedSecurityRule = this.merge(existingSecurityRule, createDto);\n            return this.save(updatedSecurityRule);\n        }\n        else {\n            const securityRule = this.create(createDto);\n            return this.save(securityRule);\n        }\n    }\n\n}"]}
+{"version":3,"file":"security-rule.repository.js","sourceRoot":"","sources":["../../src/repository/security-rule.repository.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { CreateSecurityRuleDto } from 'src/dtos/create-security-rule.dto';\nimport { SecurityRuleConfig } from 'src/dtos/security-rule-config.dto';\nimport { UpdateSecurityRuleDto } from 'src/dtos/update-security-rule.dto';\nimport { CommonEntity } from 'src/entities/common.entity';\nimport { ModelMetadata } from 'src/entities/model-metadata.entity';\nimport { RoleMetadata } from 'src/entities/role-metadata.entity';\nimport { SecurityRule } from 'src/entities/security-rule.entity';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\nimport { CrudHelperService, FilterCombinator } from 'src/services/crud-helper.service';\nimport { Brackets, DataSource, Repository, SelectQueryBuilder } from 'typeorm';\n\n@Injectable()\nexport class SecurityRuleRepository extends Repository<SecurityRule> {\n    private readonly logger = new Logger(SecurityRuleRepository.name);\n    constructor(\n        private dataSource: DataSource,\n        private readonly solidRegistry: SolidRegistry,\n        private readonly crudHelperService: CrudHelperService,\n    ) {\n        super(SecurityRule, dataSource.createEntityManager());\n    }\n\n    applySecurityRules<T extends CommonEntity>(qb: SelectQueryBuilder<T>, modelSingularName: string, activeUser: ActiveUserData, securityRuleAlias: string = qb.alias): SelectQueryBuilder<T> {\n        // Fetch the security rules for the model and roles\n        const securityRules = this.solidRegistry.getSecurityRules(modelSingularName, activeUser.roles);\n\n        // If no security rules, return the original query builder\n        if (!securityRules.length) {\n            return qb;\n        }\n\n        // Apply each security rule to the query builder. The rules are combined with OR logic at the top level.\n        qb.andWhere(new Brackets((outerQb) => {\n            for (const rule of securityRules) {\n                try {\n                    const parsedRule = JSON.parse(\n                        this.resolveSecurityRuleConfig(rule.securityRuleConfig, activeUser)\n                    ) as SecurityRuleConfig;\n\n                if (parsedRule && parsedRule.filters) {\n                        outerQb.orWhere( // combine each rule-group with OR at the outer level\n                            new Brackets((innerQb) => {\n                               this.crudHelperService.applyFilters(innerQb, parsedRule.filters, securityRuleAlias, qb); // AND within a rule\n                            })\n                        );\n                    }\n                } catch (error) {\n                    this.logger.warn(`Error parsing security rule: ${rule.securityRuleConfig}`, error);\n                }\n            }\n        }));\n\n        return qb;\n    }\n\n\n    private resolveSecurityRuleConfig(configString: string, activeUser: ActiveUserData) {\n        return configString.replace('$activeUserId', activeUser.sub.toString());\n    }\n\n    async toDto(securityRule: SecurityRule): Promise<UpdateSecurityRuleDto> {\n        // load the role and model relations for the security rule\n        let populatedSecurityRule: SecurityRule = securityRule;\n        // If the security rule does not have the role and model relations loaded, load them\n        if (!securityRule.role || !securityRule.modelMetadata) {\n            populatedSecurityRule = await this.findOne({\n                where: {\n                    id: securityRule.id,\n                },\n                relations: {\n                    role: true,\n                    modelMetadata: true,\n                },\n            });\n        }\n\n        return {\n            id: populatedSecurityRule.id,\n            name: populatedSecurityRule.name,\n            description: populatedSecurityRule.description,\n            roleId: populatedSecurityRule.role.id,\n            roleUserKey: populatedSecurityRule.role.name,\n            modelMetadataId: populatedSecurityRule.modelMetadata.id,\n            modelMetadataUserKey: populatedSecurityRule.modelMetadata.singularName,\n            securityRuleConfig: populatedSecurityRule.securityRuleConfig,\n        };\n    }\n\n    async upsertWithDto(createDto: CreateSecurityRuleDto) {\n        // Populate the role from roleId or roleUserKey\n        const roleRepository = this.dataSource.getRepository(RoleMetadata);\n        if (createDto.roleId) {\n            const role = await roleRepository.findOne({\n                where: {\n                    id: createDto.roleId,\n                },\n            });\n            createDto['role'] = role;\n        }\n\n        if (createDto.roleUserKey) {\n            const role = await roleRepository.findOne({\n                where: {\n                    name: createDto.roleUserKey,\n                },\n            });\n            createDto['role'] = role;\n        }\n\n        // Populate the model from modelMetadataId or modelMetadataUserKey\n        const modelMetadataRepository = this.dataSource.getRepository(ModelMetadata);\n        if (createDto.modelMetadataId) {\n            const modelMetadata = await modelMetadataRepository.findOne({\n                where: {\n                    id: createDto.modelMetadataId,\n                },\n            });\n            createDto['modelMetadata'] = modelMetadata;\n        }\n        if (createDto.modelMetadataUserKey) {\n            const modelMetadata = await modelMetadataRepository.findOne({\n                where: {\n                    singularName: createDto.modelMetadataUserKey,\n                },\n            });\n            createDto['modelMetadata'] = modelMetadata;\n        }\n\n        // First check if module already exists using name\n        const existingSecurityRule = await this.findOne({\n            where: {\n                name: createDto.name,\n            },\n        });\n\n        if (existingSecurityRule) {\n            const updatedSecurityRule = this.merge(existingSecurityRule, createDto);\n            return this.save(updatedSecurityRule);\n        }\n        else {\n            const securityRule = this.create(createDto);\n            return this.save(securityRule);\n        }\n    }\n\n}"]}

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

@@ -3058,8 +3058,8 @@
                         "ormType": "varchar",
                         "length": 128,
                         "required": true,
-                        "unique": true,
-                        "index": true,
+                        "unique": false,
+                        "index": false,
                         "private": false,
                         "encrypt": false,
                         "isSystem": true

package/dist/services/authentication.service.js

@@ -149,6 +149,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
     }
     async populateForSignup(user, signUpDto, isUserActive = true, onForcePasswordChange) {
+        let autoGeneratedPwdPermission = await this.settingService.getConfigValue('iamAutoGeneratedPassword');
         if (signUpDto.roles && signUpDto.roles.length > 0) {
             for (let i = 0; i < signUpDto.roles.length; i++) {
                 const roleName = signUpDto.roles[i];
@@ -168,7 +169,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         if (signUpDto.password) {
             pwd = await this.hashingService.hash(signUpDto.password);
         }
-        else {
+        if (autoGeneratedPwdPermission?.toString().toLowerCase() === 'true') {
             autoGeneratedPwd = this.generatePassword();
             pwd = await this.hashingService.hash(autoGeneratedPwd);
             user.forcePasswordChange = true;
@@ -604,10 +605,10 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         if (!user) {
             isValidUser = false;
         }
-        if (!user.active) {
+        if (isValidUser && !user?.active) {
             isValidUser = false;
         }
-        if (user.lastLoginProvider !== 'local') {
+        if (isValidUser && user?.lastLoginProvider !== 'local') {
             isValidUser = false;
         }
         if (isValidUser) {
@@ -624,7 +625,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             errorCode: '',
             data: {
                 user: {
-                    email: user.email,
+                    email: user?.email,
                 },
             }
         };