@solidstarters/solid-core 1.2.189 → 1.2.192

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);

package/src/services/solid-introspect.service.ts

@@ -13,6 +13,7 @@ import { IS_DASHBOARD_QUESTION_DATA_PROVIDER } from 'src/decorators/dashboard-qu
 import { IS_MAIL_PROVIDER } from 'src/decorators/mail-provider.decorator';
 import { IS_WA_PROVIDER } from 'src/decorators/whatsapp-provider.decorator';
 import { IS_ERROR_CODE_PROVIDER } from 'src/decorators/error-codes-provider.decorator';
+import { IS_SECURITY_RULE_CONFIG_PROVIDER } from 'src/decorators/security-rule-config-provider.decorator';
 
 @Injectable()
 export class SolidIntrospectService implements OnApplicationBootstrap {
@@ -73,7 +74,6 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
       this.solidRegistry.registerDashboardQuestionDataProvider(provider);
     });
 
-
     // Register all IComputedProvider implementations
     const computedFieldProviders = this.discoveryService
       .getProviders()
@@ -130,7 +130,7 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
       this.solidRegistry.registerMailProvider(mailProvider);
     });
 
-    // Register all IMail implementations
+    // Register all IWhatsappTransport implementations
     const whatsappProviders = this.discoveryService
       .getProviders()
       .filter((provider) => this.isWhatsappProvider(provider));
@@ -138,6 +138,15 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     whatsappProviders.forEach((whatsappProvider) => {
       this.solidRegistry.registerWhatsappProvider(whatsappProvider);
     });
+
+    // Register all ISecurityRuleConfigProvider implementations
+    const securityRuleConfigProviders = this.discoveryService
+      .getProviders()
+      .filter((provider) => this.isSecurityRuleConfigProvider(provider));
+
+    securityRuleConfigProviders.forEach((securityRuleConfigProvider) => {
+      this.solidRegistry.registerSecurityRuleConfigProvider(securityRuleConfigProvider);
+    });
   }
 
   isDashboardQuestionDataProvider(providerWrapper: InstanceWrapper<any>) {
@@ -256,6 +265,18 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     return !!isWhatsappProvider;
   }
 
+  private isSecurityRuleConfigProvider(provider: InstanceWrapper) {
+    const { instance } = provider;
+    if (!instance) return false;
+
+    const isSecurityRuleConfigProvider = this.reflector.get<boolean>(
+      IS_SECURITY_RULE_CONFIG_PROVIDER,
+      instance.constructor,
+    );
+
+    return !!isSecurityRuleConfigProvider;
+  }
+
   private isModule(provider: InstanceWrapper): boolean {
     const metatype = provider.metatype;
     // Check if it's a Static Module (Class-Based)

package/src/services/user-activity-history.service.ts

@@ -14,6 +14,7 @@ import { CrudHelperService } from 'src/services/crud-helper.service';
 import { UserActivityHistory } from '../entities/user-activity-history.entity';
 import { RequestContextService } from './request-context.service';
 import { User } from 'src/entities/user.entity';
+import { UserActivityHistoryRepository } from 'src/repository/user-activity-history.repository';
 
 @Injectable()
 export class UserActivityHistoryService extends CRUDService<UserActivityHistory> {
@@ -26,8 +27,9 @@ export class UserActivityHistoryService extends CRUDService<UserActivityHistory>
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(UserActivityHistory, 'default')
-    readonly repo: Repository<UserActivityHistory>,
+    // @InjectRepository(UserActivityHistory, 'default')
+    // readonly repo: Repository<UserActivityHistory>,
+    readonly repo: UserActivityHistoryRepository,
     readonly moduleRef: ModuleRef,
     readonly requestContextService: RequestContextService,
 

package/src/services/user-view-metadata.service.ts

@@ -14,6 +14,7 @@ import { CrudHelperService } from 'src/services/crud-helper.service';
 import { UserViewMetadata } from '../entities/user-view-metadata.entity';
 import { UpsertUserViewMetadataDto } from 'src/dtos/upsert-user-view-metadata.dto';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
+import { UserViewMetadataRepository } from 'src/repository/user-view-metadata.repository';
 
 @Injectable()
 export class UserViewMetadataService extends CRUDService<UserViewMetadata> {
@@ -26,8 +27,9 @@ export class UserViewMetadataService extends CRUDService<UserViewMetadata> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(UserViewMetadata, 'default')
-    readonly repo: Repository<UserViewMetadata>,
+    // @InjectRepository(UserViewMetadata, 'default')
+    // readonly repo: Repository<UserViewMetadata>,
+    readonly repo: UserViewMetadataRepository,
     readonly moduleRef: ModuleRef
 
   ) {

package/src/services/user.service.ts

@@ -17,6 +17,7 @@ import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { iamConfig } from 'src/config/iam.config';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { UserRepository } from 'src/repository/user.repository';
+import { RoleMetadataRepository } from 'src/repository/role-metadata.repository';
 
 @Injectable()
 export class UserService extends CRUDService<User> {
@@ -33,8 +34,9 @@ export class UserService extends CRUDService<User> {
     readonly repo: UserRepository,
     @InjectRepository(User, 'default')
     readonly nonSecurityRuleAwareRepo : Repository<User>,
-    @InjectRepository(RoleMetadata)
-    private readonly roleRepository: Repository<RoleMetadata>,
+    // @InjectRepository(RoleMetadata)
+    // private readonly roleRepository: Repository<RoleMetadata>,
+    private readonly roleRepository: RoleMetadataRepository,
     readonly moduleRef: ModuleRef,
     @Inject(iamConfig.KEY)
     private readonly iamConfiguration: ConfigType<typeof iamConfig>,
@@ -218,6 +220,7 @@ export class UserService extends CRUDService<User> {
       const user = new User();
       user.username = oauthUserDto.email;
       user.email = oauthUserDto.email;
+      user.fullName = oauthUserDto.name;
       user.lastLoginProvider = oauthUserDto.provider;
       user.accessCode = oauthUserDto.accessCode;
       user.googleAccessToken = oauthUserDto.accessToken;

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

@@ -1,27 +1,28 @@
 import { BadRequestException, Injectable, Logger } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { InjectEntityManager, InjectRepository } from '@nestjs/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 { EntityManager, Repository } from 'typeorm';
+import { EntityManager } from 'typeorm';
 
 
 import { classify } from '@angular-devkit/core/src/utils/strings';
 import { Locale } from 'src/entities/locale.entity';
+import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 import { SolidRegistry } from 'src/helpers/solid-registry';
+import { FieldMetadataRepository } from 'src/repository/field-metadata.repository';
+import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
+import { ViewMetadataRepository } from 'src/repository/view-metadata.repository';
 import { UpdateViewMetadataDto } from '../dtos/update-view-metadata.dto';
 import { FieldMetadata } from '../entities/field-metadata.entity';
-import { ModelMetadata } from '../entities/model-metadata.entity';
 import { ViewMetadata } from '../entities/view-metadata.entity';
 import { ActionMetadataService } from './action-metadata.service';
 import { SolidIntrospectService } from './solid-introspect.service';
 import { UserViewMetadataService } from './user-view-metadata.service';
-import { ViewMetadataRepository } from 'src/repository/view-metadata.repository';
-import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 
 @Injectable()
 export class ViewMetadataService extends CRUDService<ViewMetadata> {
@@ -39,10 +40,11 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
     readonly entityManager: EntityManager,
     // @InjectRepository(ViewMetadata, 'default')
     readonly repo: ViewMetadataRepository,
-    @InjectRepository(FieldMetadata)
-    private readonly fieldMetadataRepo: Repository<FieldMetadata>,
-    @InjectRepository(ModelMetadata)
-    private readonly modelMetadataRepo: Repository<ModelMetadata>,
+    // @InjectRepository(FieldMetadata)
+    // private readonly fieldMetadataRepo: Repository<FieldMetadata>,
+    // @InjectRepository(ModelMetadata)
+    // private readonly modelMetadataRepo: Repository<ModelMetadata>,
+    private readonly modelMetadataRepo: ModelMetadataRepository,
     private readonly modelMetadataHelperService: ModelMetadataHelperService,
     readonly moduleRef: ModuleRef
   ) {