@solidstarters/solid-core 1.2.191 → 1.2.192

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

@@ -10,6 +10,7 @@ import { FileService } from "src/services/file.service";
 import { CrudHelperService } from "src/services/crud-helper.service";
 import { MqMessage } from '../entities/mq-message.entity';
 import { Logger } from '@nestjs/common';
+import { MqMessageRepository } from 'src/repository/mq-message.repository';
 
 @Injectable()
 export class MqMessageService extends CRUDService<MqMessage> {
@@ -25,8 +26,9 @@ export class MqMessageService extends CRUDService<MqMessage> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(MqMessage)
-    readonly repo: Repository<MqMessage>,
+    // @InjectRepository(MqMessage)
+    // readonly repo: Repository<MqMessage>,
+    readonly repo: MqMessageRepository,
     readonly moduleRef: ModuleRef
   ) {
     super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'mqMessage', 'solid-core', moduleRef);

package/src/services/permission-metadata.service.ts

@@ -13,6 +13,7 @@ import { CrudHelperService } from "src/services/crud-helper.service";
 import { PermissionMetadata } from '../entities/permission-metadata.entity';
 import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { classify } from '@angular-devkit/core/src/utils/strings';
+import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
 
 @Injectable()
 export class PermissionMetadataService extends CRUDService<PermissionMetadata> {
@@ -25,9 +26,10 @@ export class PermissionMetadataService extends CRUDService<PermissionMetadata> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(PermissionMetadata, 'default')
-    readonly repo: Repository<PermissionMetadata>,
-      readonly moduleRef: ModuleRef
+    // @InjectRepository(PermissionMetadata, 'default')
+    // readonly repo: Repository<PermissionMetadata>,
+    readonly repo: PermissionMetadataRepository,
+    readonly moduleRef: ModuleRef
   
   ) {
     super(modelMetadataService, moduleMetadataService,  configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'permissionMetadata', 'solid-core',moduleRef);

package/src/services/queues/rabbitmq-publisher.service.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@nestjs/common';
+import { Logger, OnModuleDestroy } from '@nestjs/common';
 import * as amqp from 'amqplib';
 import { v4 as uuidv4 } from 'uuid';
 import { QueuesModuleOptions } from "../../interfaces";
@@ -6,11 +6,16 @@ import { QueueMessage, QueuePublisher } from '../../interfaces/mq';
 import { MqMessageQueueService } from '../mq-message-queue.service';
 import { MqMessageService } from '../mq-message.service';
 
-export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
+export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePublisher<T> {
     private readonly logger = new Logger(RabbitMqPublisher.name);
     private readonly url: string;
     private readonly serviceRole: string;
 
+    // Maintain connection...
+    private connection: amqp.Connection | null = null;
+    private channel: amqp.Channel | null = null;
+    private connectingPromise: Promise<void> | null = null;
+
     constructor(
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,
@@ -23,27 +28,106 @@ export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
         if (!this.serviceRole) {
             this.logger.debug('Queue service Role is not defined in the environment variables');
         }
-        this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
+        // this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
 
     abstract options(): QueuesModuleOptions;
 
-    async establishConnection(): Promise<amqp.Connection> {
+    private async ensureConnectionAndChannel(): Promise<amqp.Channel> {
+        if (this.channel) {
+            return this.channel;
+        }
 
-        const url = new URL(this.url);
+        // If another call is already connecting, wait for it
+        if (this.connectingPromise) {
+            await this.connectingPromise;
+            if (this.channel) return this.channel;
+        }
+
+        this.connectingPromise = (async () => {
+            const url = new URL(this.url);
+
+            const conn = await amqp.connect({
+                protocol: url.protocol.replace(':', ''), // "amqps"
+                hostname: url.hostname,
+                port: parseInt(url.port),
+                username: url.username,
+                // Node's URL already decodes percent-encoding; decodeURIComponent is not needed
+                // But without it does not seem to be working...
+                password: decodeURIComponent(url.password),
+                frameMax: 131072,
+            });
+
+            conn.on('error', (err) => {
+                this.logger.error(`RabbitMQ connection error: ${err.message}`, err.stack);
+            });
+
+            conn.on('close', () => {
+                this.logger.warn('RabbitMQ connection closed, resetting');
+                this.connection = null;
+                this.channel = null;
+            });
 
-        const connection = await amqp.connect({
-            protocol: url.protocol.replace(':', ''),
-            hostname: url.hostname,
-            port: parseInt(url.port),
-            username: url.username,
-            password: url.password,
-            frameMax: 131072,
-        });
+            const channel = await conn.createChannel();
+
+            const options = this.options();
+            const queueName = options.queueName;
+            const exchangeName = `${queueName}.exchange`;
+            const routingKey = `${queueName}.routing-key`;
+
+            await channel.assertExchange(exchangeName, 'direct', {});
+            const queue = await channel.assertQueue(queueName, {});
+            await channel.bindQueue(queue.queue, exchangeName, routingKey);
+
+            this.connection = conn;
+            this.channel = channel;
+        })();
+
+        try {
+            await this.connectingPromise;
+        } finally {
+            this.connectingPromise = null;
+        }
+
+        if (!this.channel) {
+            throw new Error('Failed to initialize RabbitMQ channel');
+        }
 
-        return connection
+        return this.channel;
     }
 
+    // Nest will call this for every subclass instance, because they inherit the method
+    async onModuleDestroy(): Promise<void> {
+        await this.closeConnectionAndChannel();
+    }
+
+    private async closeConnectionAndChannel(): Promise<void> {
+        if (this.channel) {
+            try {
+                await this.channel.close();
+            } catch (err) {
+                this.logger.warn(
+                    `RabbitMqPublisher error closing channel: ${(err as Error).message}`,
+                );
+            } finally {
+                this.channel = null;
+            }
+        }
+
+        if (this.connection) {
+            try {
+                await this.connection.close();
+            } catch (err) {
+                this.logger.warn(
+                    `RabbitMqPublisher error closing connection: ${(err as Error).message}`,
+                );
+            } finally {
+                this.connection = null;
+            }
+        }
+    }
+
+
     async publish(message: QueueMessage<T>): Promise<string> {
         if (!this.url) {
             this.logger.error('RabbitMqPublisher url is not defined in the environment variables');
@@ -58,13 +142,7 @@ export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
             throw new Error('Queue service Role is subscriber, cannot publish messages');
         }
 
-        this.logger.debug(`RabbitMqPublisher publishing with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
-
-        // const connection = await amqp.connect(this.url);
-        const connection = await this.establishConnection();
-        // this.logger.debug(`RabbitMqPublisher publisher connected options: ${JSON.stringify(this.options())} and url: ${url}`);
-
-        const channel = await connection.createChannel();
+        const channel = await this.ensureConnectionAndChannel();
         // this.logger.debug(`RabbitMqPublisher publisher channel created options: ${JSON.stringify(this.options())} and url: ${url}`);
 
         const options = this.options();
@@ -73,15 +151,6 @@ export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
         const exchangeName = `${queueName}.exchange`;
         const routingKey = `${queueName}.routing-key`;
 
-        await channel.assertExchange(exchangeName, 'direct', {});
-        // this.logger.debug(`RabbitMqPublisher channel asserted: ${JSON.stringify(this.options())} and url: ${url}`);
-
-        const queue = await channel.assertQueue(queueName, {});
-        // this.logger.debug(`RabbitMqPublisher queue asserted: ${JSON.stringify(this.options())} and url: ${url}`);
-
-        await channel.bindQueue(queue.queue, exchangeName, routingKey);
-        // this.logger.debug(`RabbitMqPublisher queue bound: ${JSON.stringify(this.options())} and url: ${url}`);
-
         // Set default values for retry. 
         // by default there are no retries.
         if (!message.retryCount) message.retryCount = 0;
@@ -111,20 +180,9 @@ export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
             }
         }
         finally {
-            // TODO: check if we want to do this or keep the connection open all the time. 
-            // connection.close();
-            // setTimeout(() => {
-            //     connection.close();
-            //     this.logger.error('RabbitMqPublisher connection closed');
-            // }, 3000);
         }
         // this.logger.debug(`Sent message: ${JSON.stringify(message)}`);
 
-        // TODO: check if we want to do this or keep the connection open all the time. 
-        // setTimeout(() => {
-        //     connection.close();
-        // }, 500);
-
         // return the newly created message id.
         return message.messageId;
     }

package/src/services/queues/rabbitmq-subscriber.service.ts

@@ -23,7 +23,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         if (!this.serviceRole) {
             this.logger.debug('Queue service Role is not defined in the environment variables');
         }
-        this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
+        // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
 
     abstract subscribe(message: QueueMessage<T>);
@@ -34,12 +34,17 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
 
         const url = new URL(this.url);
 
+        // this.logger.debug(`user: ${url.username}`);
+        // // just for local debug, don’t log in prod
+        // this.logger.debug(`pass: ${url.password}`);
+        // this.logger.debug(`path (vhost): ${url.pathname}`);
+
         const connection = await amqp.connect({
             protocol: url.protocol.replace(':', ''),
             hostname: url.hostname,
             port: parseInt(url.port),
             username: url.username,
-            password: url.password,
+            password: decodeURIComponent(url.password),
             frameMax: 131072,
         });
 
@@ -50,10 +55,18 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         // we will start subscriber only if the current service role is subscriber. 
         if (this.url && ['both', 'subscriber'].includes(this.serviceRole)) {
 
-            // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${url}`);
+            // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
             // const connection = await amqp.connect(this.url);
-            const connection = await this.establishConnection();
-            // this.logger.debug(`RabbitMqSubscriber connection established: ${JSON.stringify(this.options())} and url: ${url}`);
+
+            let connection;
+            try {
+                connection = await this.establishConnection();
+                // this.logger.debug(`RabbitMqSubscriber connection established: ${JSON.stringify(this.options())} and url: ${this.url}`);
+            }
+            catch (err) {
+                this.logger.error(`Failed to connect to RabbitMQ: ${(err as Error).message}`, (err as Error).stack);
+                throw err;
+            }
 
             const channel = await connection.createChannel();
             // this.logger.debug(`RabbitMqSubscriber channel created: ${JSON.stringify(this.options())} and url: ${url}`);

package/src/services/role-metadata.service.ts

@@ -1,18 +1,20 @@
 import { forwardRef, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+import { ConfigService } from '@nestjs/config';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, In, Repository } from 'typeorm';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { CrudHelperService } from "src/services/crud-helper.service";
 import { CRUDService } from 'src/services/crud.service';
+import { FileService } from "src/services/file.service";
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { ConfigService } from '@nestjs/config';
-import { FileService } from "src/services/file.service";
-import { CrudHelperService } from "src/services/crud-helper.service";
+import { EntityManager, In } from 'typeorm';
 
-import { RoleMetadata } from '../entities/role-metadata.entity';
-import { PermissionMetadata } from '../entities/permission-metadata.entity';
-import { CreateRoleMetadataDto } from '../dtos/create-role-metadata.dto';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
+import { RoleMetadataRepository } from 'src/repository/role-metadata.repository';
+import { CreateRoleMetadataDto } from '../dtos/create-role-metadata.dto';
+import { PermissionMetadata } from '../entities/permission-metadata.entity';
+import { RoleMetadata } from '../entities/role-metadata.entity';
 
 @Injectable()
 export class RoleMetadataService extends CRUDService<RoleMetadata> {
@@ -28,10 +30,12 @@ export class RoleMetadataService extends CRUDService<RoleMetadata> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(RoleMetadata, 'default')
-    readonly repo: Repository<RoleMetadata>,
-    @InjectRepository(PermissionMetadata)
-    private readonly permissionRepository: Repository<PermissionMetadata>,
+    // @InjectRepository(RoleMetadata, 'default')
+    // readonly repo: Repository<RoleMetadata>,
+    readonly repo: RoleMetadataRepository,
+    // @InjectRepository(PermissionMetadata)
+    // private readonly permissionRepository: Repository<PermissionMetadata>,
+    readonly permissionRepository: PermissionMetadataRepository,
     readonly moduleRef: ModuleRef
 
   ) {

package/src/services/saved-filters.service.ts

@@ -1,16 +1,17 @@
 import { Injectable } from '@nestjs/common';
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService, ModuleRef  } from "@nestjs/core";
-import { EntityManager, Repository } from 'typeorm';
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { EntityManager } from 'typeorm';
 
+import { ConfigService } from '@nestjs/config';
+import { CrudHelperService } from 'src/services/crud-helper.service';
 import { CRUDService } from 'src/services/crud.service';
+import { FileService } from 'src/services/file.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { ConfigService } from '@nestjs/config';
-import { FileService } from 'src/services/file.service';
-import { CrudHelperService } from 'src/services/crud-helper.service';
 
 
+import { SavedFiltersRepository } from 'src/repository/saved-filters.repository';
 import { SavedFilters } from '../entities/saved-filters.entity';
 
 @Injectable()
@@ -24,8 +25,9 @@ export class SavedFiltersService extends CRUDService<SavedFilters>{
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(SavedFilters, 'default')
-    readonly repo: Repository<SavedFilters>,
+    // @InjectRepository(SavedFilters, 'default')
+    // readonly repo: Repository<SavedFilters>,
+    readonly repo: SavedFiltersRepository,
     readonly moduleRef: ModuleRef
 
  ) {

package/src/services/scheduled-job.service.ts

@@ -10,6 +10,7 @@ import { FileService } from './file.service';
 import { CrudHelperService } from './crud-helper.service';
 import { CRUDService } from './crud.service';
 import { Logger } from '@nestjs/common';
+import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 
 @Injectable()
 export class ScheduledJobService extends CRUDService<ScheduledJob> {
@@ -24,8 +25,9 @@ export class ScheduledJobService extends CRUDService<ScheduledJob> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(ScheduledJob)
-    readonly repo: Repository<ScheduledJob>,
+    // @InjectRepository(ScheduledJob)
+    // readonly repo: Repository<ScheduledJob>,
+    readonly repo: ScheduledJobRepository,
     readonly moduleRef: ModuleRef
 
   ) {

package/src/services/scheduled-jobs/scheduler.service.ts

@@ -1,20 +1,20 @@
-import { Injectable, Logger, Inject } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { IsNull, LessThanOrEqual, Repository } from 'typeorm';
+import { Injectable, Logger } from '@nestjs/common';
+import { IsNull, LessThanOrEqual } from 'typeorm';
 
-import { ISchedulerService } from './scheduler.interface';
-import { SolidRegistry } from 'src/helpers/solid-registry';
-import { ScheduledJob } from 'src/entities/scheduled-job.entity';
-import { IScheduledJob } from './scheduled-job.interface';
 import { Cron, CronExpression } from '@nestjs/schedule';
+import { ScheduledJob } from 'src/entities/scheduled-job.entity';
+import { SolidRegistry } from 'src/helpers/solid-registry';
+import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
+import { ISchedulerService } from './scheduler.interface';
 
 @Injectable()
 export class SchedulerServiceImpl implements ISchedulerService {
     private readonly logger = new Logger(SchedulerServiceImpl.name);
 
     constructor(
-        @InjectRepository(ScheduledJob)
-        private readonly scheduledJobRepo: Repository<ScheduledJob>,
+        // @InjectRepository(ScheduledJob)
+        // private readonly scheduledJobRepo: Repository<ScheduledJob>,
+        private readonly scheduledJobRepo: ScheduledJobRepository,
         private readonly solidRegistry: SolidRegistry,
     ) { }
 

package/src/services/security-rule.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, OnApplicationBootstrap } from '@nestjs/common';
+import { forwardRef, Inject, Injectable, OnApplicationBootstrap } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager, Repository } from 'typeorm';
@@ -13,6 +13,7 @@ import { CrudHelperService } from 'src/services/crud-helper.service';
 
 import { SecurityRule } from '../entities/security-rule.entity';
 import { SolidRegistry } from 'src/helpers/solid-registry';
+import { SecurityRuleRepository } from 'src';
 
 @Injectable()
 export class SecurityRuleService extends CRUDService<SecurityRule> implements OnApplicationBootstrap {
@@ -25,8 +26,10 @@ export class SecurityRuleService extends CRUDService<SecurityRule> implements On
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(SecurityRule, 'default')
-    readonly repo: Repository<SecurityRule>,
+    // @InjectRepository(SecurityRule, 'default')
+    // readonly repo: Repository<SecurityRule>,
+    @Inject(forwardRef(() => SecurityRuleRepository))
+    readonly repo: SecurityRuleRepository,
     readonly moduleRef: ModuleRef,
     readonly solidRegistry: SolidRegistry,
 

package/src/services/setting.service.ts

@@ -15,6 +15,7 @@ import { Setting } from '../entities/setting.entity';
 import { RequestContextService } from './request-context.service';
 import { User } from 'src/entities/user.entity';
 import { CreateSettingDto } from 'src/dtos/create-setting.dto';
+import { SettingRepository } from 'src/repository/setting.repository';
 
 @Injectable()
 export class SettingService extends CRUDService<Setting> {
@@ -30,8 +31,9 @@ export class SettingService extends CRUDService<Setting> {
     private readonly commonConfiguration: ConfigType<typeof commonConfig>,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(Setting, 'default')
-    readonly repo: Repository<Setting>,
+    // @InjectRepository(Setting, 'default')
+    // readonly repo: Repository<Setting>,
+    readonly repo: SettingRepository,
     readonly moduleRef: ModuleRef,
     private readonly requestContextService: RequestContextService,
     @InjectRepository(User) private readonly userRepository: Repository<User>,
@@ -43,8 +45,8 @@ export class SettingService extends CRUDService<Setting> {
   async seedDefaultSettings(): Promise<void> {
     const settingsSeederData = {
       allowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
-      iamPasswordRegistrationEnabled: this.iamConfiguration.iamPasswordRegistrationEnabled,
-      passwordlessRegistration: this.iamConfiguration.passwordlessRegistration,
+      passwordBasedAuth: this.iamConfiguration.passwordBasedAuth,
+      passwordLessAuth: this.iamConfiguration.passwordLessAuth,
       activateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
       iamGoogleOAuthEnabled: false,
       authPagesLayout: "center",
@@ -67,12 +69,15 @@ export class SettingService extends CRUDService<Setting> {
       copyright: null,
       enableUsername: true,
       enabledNotification: true,
-      contactSupportEmail : null,
+      contactSupportEmail: null,
       contactSupportDisplayName: null,
       contactSupportIcon: null,
       authScreenRightBackgroundImage: null,
       authScreenLeftBackgroundImage: null,
       authScreenCenterBackgroundImage: null,
+      authenticationPasswordRegex: this.iamConfiguration.PASSWORD_REGEX,
+      authenticationPasswordRegexErrorMessage: this.iamConfiguration.PASSWORD_REGEX_ERROR_MESSAGE,
+      authenticationPasswordComplexityDescription: this.iamConfiguration.PASSWORD_COMPLEXITY_DESC,
       solidXGenAiCodeBuilderConfig: JSON.stringify({
             defaultProvider: "",
             availableProviders: []
@@ -91,7 +96,7 @@ export class SettingService extends CRUDService<Setting> {
         setting.key = key;
         setting.value = typeof value === 'boolean' ? value.toString() :
           Array.isArray(value) ? value.join(',') :
-            value === null || value === undefined ? '' : String(value);
+            value === null || value === undefined ? null : String(value);
         settingsToInsert.push(setting);
       }
     }
@@ -109,17 +114,22 @@ export class SettingService extends CRUDService<Setting> {
     }
 
     const settingsMap: Record<string, any> = {};
+    const arrayKeysToSkip = [
+      'authenticationPasswordRegex',
+      'authenticationPasswordRegexErrorMessage',
+      'authenticationPasswordComplexityDescription',
+    ];
     for (const setting of settingsArray) {
       if (setting.key && setting.value !== undefined && setting.value !== null) {
         let value = setting.value;
-                try {
+        try {
           settingsMap[setting.key] = JSON.parse(value);
         } catch {
           if (value === 'true' || value === 'false') {
             settingsMap[setting.key] = value === 'true';
           } else if (!isNaN(Number(value)) && value.trim() !== '') {
             settingsMap[setting.key] = Number(value);
-          } else if (value.includes(',')) {
+          } else if (!arrayKeysToSkip.includes(setting.key) && value.includes(',')) {
             settingsMap[setting.key] = value.split(',').map(item => item.trim());
           } else {
             settingsMap[setting.key] = value;
@@ -139,7 +149,7 @@ export class SettingService extends CRUDService<Setting> {
         //   settingsMap[setting.key] = value;
         // }
       }
-    } 
+    }
 
     const defaultSettings = this.getDefaultSettings();
 
@@ -154,8 +164,8 @@ export class SettingService extends CRUDService<Setting> {
   private getDefaultSettings(): Record<string, any> {
     return {
       allowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
-      iamPasswordRegistrationEnabled: this.iamConfiguration.iamPasswordRegistrationEnabled,
-      passwordlessRegistration: this.iamConfiguration.passwordlessRegistration,
+      passwordBasedAuth: this.iamConfiguration.passwordBasedAuth,
+      passwordLessAuth: this.iamConfiguration.passwordLessAuth,
       activateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
       iamGoogleOAuthEnabled: false,
       authPagesLayout: "center",
@@ -179,12 +189,15 @@ export class SettingService extends CRUDService<Setting> {
       forceChangePasswordOnFirstLogin: this.iamConfiguration.forceChangePasswordOnFirstLogin,
       enableUsername: true,
       enabledNotification: true,
-      contactSupportEmail : null,
+      contactSupportEmail: null,
       contactSupportDisplayName: null,
       contactSupportIcon: null,
       authScreenRightBackgroundImage: null,
       authScreenLeftBackgroundImage: null,
       authScreenCenterBackgroundImage: null,
+      authenticationPasswordRegex: this.iamConfiguration.PASSWORD_REGEX,
+      authenticationPasswordRegexErrorMessage: this.iamConfiguration.PASSWORD_REGEX_ERROR_MESSAGE,
+      authenticationPasswordComplexityDescription: this.iamConfiguration.PASSWORD_COMPLEXITY_DESC,
       solidXGenAiCodeBuilderConfig: JSON.stringify({
             defaultProvider: "",
             availableProviders: []
@@ -322,7 +335,11 @@ export class SettingService extends CRUDService<Setting> {
 
     const system: Record<string, any> = {};
     const user: Record<string, any> = {};
-
+    const arrayKeysToSkip = [
+      'authenticationPasswordRegex',
+      'authenticationPasswordRegexErrorMessage',
+      'authenticationPasswordComplexityDescription',
+    ];
     for (const setting of settingsArray) {
       if (setting.key && setting.value !== undefined && setting.value !== null) {
         const value = setting.value;
@@ -335,7 +352,7 @@ export class SettingService extends CRUDService<Setting> {
             parsedValue = value === 'true';
           } else if (!isNaN(Number(value)) && value.trim() !== '') {
             parsedValue = Number(value);
-          } else if (value.includes(',')) {
+          } else if (!arrayKeysToSkip.includes(setting.key) && value.includes(',')) {
             parsedValue = value.split(',').map(item => item.trim());
           } else {
             parsedValue = value;

package/src/services/sms-template.service.ts

@@ -15,6 +15,7 @@ import { FileService } from './file.service';
 import { MediaService } from './media.service';
 import { DiscoveryService, ModuleRef } from '@nestjs/core';
 import { CrudHelperService } from './crud-helper.service';
+import { SmsTemplateRepository } from 'src/repository/sms-template.repository';
 
 @Injectable()
 export class SmsTemplateService extends CRUDService<SmsTemplate>{
@@ -29,8 +30,9 @@ export class SmsTemplateService extends CRUDService<SmsTemplate>{
             readonly crudHelperService: CrudHelperService,
             @InjectEntityManager()
             readonly entityManager: EntityManager,
-            @InjectRepository(SmsTemplate, 'default')
-            readonly repo: Repository<SmsTemplate>,
+            // @InjectRepository(SmsTemplate, 'default')
+            // readonly repo: Repository<SmsTemplate>,
+            readonly repo: SmsTemplateRepository,
             readonly moduleRef: ModuleRef,
     ) {
         super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'smsTemplate', 'app-builder', moduleRef);