@solidstarters/solid-core 1.2.203 → 1.2.206

package/src/dtos/create-setting.dto.ts

@@ -16,11 +16,24 @@ export class CreateSettingDto {
     @ApiProperty()
     type: string;
     @IsOptional()
+    @IsString()
+    @ApiProperty()
+    level: string;
+    @IsOptional()
     @IsInt()
     @ApiProperty({ description: "This is the user id field" })
     userId: number;
     @IsString()
     @IsOptional()
-    @ApiProperty({ description: "This is the user id field" })
+    @ApiProperty({ description: "This is the user userkey field" })
     userUserKey: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the moduleMetadata id field" })
+    moduleMetadataId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the moduleMetadata userkey field" })
+    moduleMetadataUserKey: string;
 }

package/src/dtos/update-setting.dto.ts

@@ -18,6 +18,10 @@ export class UpdateSettingDto {
     @ApiProperty()
     type: string;
     @IsOptional()
+    @IsString()
+    @ApiProperty()
+    level: string;
+    @IsOptional()
     @IsInt()
     @ApiProperty({ description: "This is the user id field" })
     userId: number;
@@ -25,4 +29,14 @@ export class UpdateSettingDto {
     @IsOptional()
     @ApiProperty({ description: "This is the user id field" })
     userUserKey: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the moduleMetadata id field" })
+    moduleMetadataId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the moduleMetadata userkey field" })
+    moduleMetadataUserKey: string;
+
 }

package/src/entities/setting.entity.ts

@@ -1,17 +1,31 @@
 import { CommonEntity } from 'src/entities/common.entity'
 import { Entity, Column, Index, JoinColumn, ManyToOne } from 'typeorm';
 import { User } from 'src/entities/user.entity'
+import { ModuleMetadata } from './module-metadata.entity';
 
 @Entity("ss_setting")
 export class Setting extends CommonEntity {
+
     @Index({ unique: true })
     @Column({ type: "varchar", nullable: false })
     key: string;
+
     @Column({ type: "varchar", nullable: true })
     value: string;
+
     @Column({ name: "type", type: "varchar", nullable: true })
     type: string;
+
+    @Column({ name: "level", type: "varchar", nullable: true })
+    level: string;
+
+    @Index()
     @ManyToOne(() => User, { nullable: true })
     @JoinColumn()
     user: User;
-}
+
+    @Index()
+    @ManyToOne(() => ModuleMetadata, { nullable: true })
+    @JoinColumn()
+    moduleMetadata: ModuleMetadata;
+}

package/src/factories/mail.factory.ts

@@ -1,9 +1,10 @@
 import { Inject, Injectable, Logger } from "@nestjs/common";
 import { ConfigType } from "@nestjs/config";
 import { ModuleRef } from "@nestjs/core";
-import commonConfig from "src/config/common.config";
 import { SolidRegistry } from "src/helpers/solid-registry";
 import { IMail } from "src/interfaces";
+import { SettingService } from "src/services/setting.service";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 function norm(s?: string) {
     return s?.trim().toLowerCase();
@@ -16,12 +17,11 @@ export class MailFactory {
     constructor(
         private readonly moduleRef: ModuleRef, // Use the module ref to dynamically resolve the mail service
         private readonly solidRegistry: SolidRegistry,
-        @Inject(commonConfig.KEY)
-        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+        private readonly settingService: SettingService,
     ) { }
 
     getMailService(): IMail {
-        const mailServiceName = this.commonConfiguration.emailProvider;
+        const mailServiceName = this.settingService.getConfigValue<SolidCoreSetting>("emailProvider") ?? "SMTPEMailService";
         const mailProviders = this.solidRegistry.getMailProviders();
         // Return the instance which matches the mailServiceName
         if (!mailProviders.length) {

package/src/factories/sms.factory.ts

@@ -1,9 +1,9 @@
-import { Inject, Injectable, Logger } from "@nestjs/common";
-import { ConfigType } from "@nestjs/config";
+import { Injectable, Logger } from "@nestjs/common";
 import { ModuleRef } from "@nestjs/core";
-import commonConfig from "src/config/common.config";
 import { SolidRegistry } from "src/helpers/solid-registry";
 import { ISMS } from "src/interfaces";
+import { SettingService } from "src/services/setting.service";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 function norm(s?: string) {
     return s?.trim().toLowerCase();
@@ -17,13 +17,15 @@ export class SmsFactory {
     constructor(
         private readonly moduleRef: ModuleRef,
         private readonly solidRegistry: SolidRegistry,
-        @Inject(commonConfig.KEY)
-        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+        private readonly settingService: SettingService,
+        // @Inject(commonConfig.KEY)
+        // private readonly commonConfiguration: ConfigType<typeof commonConfig>,
     ) { }
 
     getSmsService(name: string = null): ISMS {
         // This is the default provider
-        const smsServiceName = name || this.commonConfiguration.smsProvider;
+        // const smsServiceName = name || this.commonConfiguration.smsProvider;
+        const smsServiceName = this.settingService.getConfigValue<SolidCoreSetting>('smsProvider');
         if (!smsServiceName) {
             throw new Error("Unable to resolve sms provider")
         }
@@ -40,4 +42,4 @@ export class SmsFactory {
         return smsServiceProvider.instance as ISMS;
     }
 
-}
+}

package/src/factories/whatsapp.factory.ts

@@ -1,9 +1,10 @@
 import { Inject, Injectable, Logger } from "@nestjs/common";
 import { ConfigType } from "@nestjs/config";
 import { ModuleRef } from "@nestjs/core";
-import commonConfig from "src/config/common.config";
 import { SolidRegistry } from "src/helpers/solid-registry";
 import { IWhatsAppTransport } from "src/interfaces";
+import { SettingService } from "src/services/setting.service";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 function norm(s?: string) {
     return s?.trim().toLowerCase();
@@ -16,13 +17,12 @@ export class WhatsAppFactory {
     constructor(
         private readonly moduleRef: ModuleRef, // Use the module ref to dynamically resolve the mail service
         private readonly solidRegistry: SolidRegistry,
-        @Inject(commonConfig.KEY)
-        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+        private readonly settingService: SettingService,
     ) { }
 
     getWhatsappService(name: string = null): IWhatsAppTransport {
         // This is the default provider
-        const whatsappServiceName = name || this.commonConfiguration.whatsappProvider;
+        const whatsappServiceName = name || this.settingService.getConfigValue<SolidCoreSetting>("whatsappProvider");
         if (!whatsappServiceName) {
             throw new Error("Unable to resolve whatsapp provider")
         }

package/src/guards/access-token.guard.ts

@@ -1,3 +1,4 @@
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 import {
   CanActivate,
   ExecutionContext,
@@ -5,22 +6,20 @@ import {
   Injectable,
   UnauthorizedException,
 } from '@nestjs/common';
-import { ConfigType } from '@nestjs/config';
 import { JwtService } from '@nestjs/jwt';
 import { Request } from 'express';
 import { ActiveUserData } from '../interfaces/active-user-data.interface';
-import { jwtConfig } from 'src/config/jwt.config';
 import { REQUEST_USER_KEY } from "../constants";
 import { PermissionMetadataService } from '../services/permission-metadata.service';
 import { ClsService } from 'nestjs-cls';
+import { SettingService } from '../services/setting.service';
 
 @Injectable()
 export class AccessTokenGuard implements CanActivate {
   constructor(
     private readonly jwtService: JwtService,
-    @Inject(jwtConfig.KEY)
-    private readonly jwtConfiguration: ConfigType<typeof jwtConfig>,
     private readonly permissionsService: PermissionMetadataService,
+    private readonly settingService: SettingService,
     private readonly cls: ClsService
   ) { }
 
@@ -32,9 +31,17 @@ export class AccessTokenGuard implements CanActivate {
       throw new UnauthorizedException();
     }
     try {
+
+      const jwtConfiguration = {
+        secret: this.settingService.getConfigValue<SolidCoreSetting>("secret"),
+        audience: this.settingService.getConfigValue<SolidCoreSetting>("audience"),
+        issuer: this.settingService.getConfigValue<SolidCoreSetting>("issuer"),
+        accessTokenTtl: this.settingService.getConfigValue<SolidCoreSetting>("accessTokenTtl"),
+        refreshTokenTtl: this.settingService.getConfigValue<SolidCoreSetting>("refreshTokenTtl")
+      }
       const payload: ActiveUserData = await this.jwtService.verifyAsync(
         token,
-        this.jwtConfiguration,
+        jwtConfiguration
       );
 
       // Load permissions given the user. 

package/src/helpers/cors.helper.ts

@@ -1,9 +1,9 @@
 import { CorsOptions } from 'cors';
-import { ConfigService } from '@nestjs/config';
 
 /** Build CorsOptions from env; supports wildcards like https://*.example.com */
-export function buildDefaultCorsOptions(configService: ConfigService): CorsOptions {
-  const rawOrigins = configService.get<string>('SECURITY_CORS_ORIGINS') ?? '*';
+export function buildDefaultCorsOptions(): CorsOptions {
+  const rawOrigins = process.env.SECURITY_CORS_ORIGINS ?? '*';
+
   const allowed = rawOrigins.split(',').map(s => s.trim()).filter(Boolean);
 
   const escapeRx = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

package/src/helpers/error-mapper.service.ts

@@ -68,7 +68,6 @@ export class ErrorMapperService {
         for (const p of providers) {
             try {
                 const rules = p.rules() ?? [];
-                // Optional: namespace collision check can be added here if desired
                 all.push(...rules);
             } catch (e) {
                 this.logger.warn(`ErrorCodeProvider.rules() failed for ${p.name?.()}: ${e}`);

package/src/helpers/google-oauth.helper.ts

@@ -1,9 +1,13 @@
-import { ConfigType } from "@nestjs/config";
-import { iamConfig } from "src/config/iam.config";
 
-export function isGoogleOAuthConfigured(iamConfiguration: ConfigType<typeof iamConfig>): boolean {
-    const googleOauthConfig = iamConfiguration.googleOauth;
-    
-    return !!googleOauthConfig.clientID  
+export type GoogleAuthConfiguration = {
+  clientID: String,
+  clientSecret: String,
+  callbackURL: String,
+  redirectURL: String
+}
+
+export function isGoogleOAuthConfigured(googleOauthConfig: GoogleAuthConfiguration): boolean {
+
+  return !!googleOauthConfig.clientID
     && !!googleOauthConfig.clientSecret && !!googleOauthConfig.callbackURL && !!googleOauthConfig.redirectURL;
-  }
+}

package/src/helpers/module.helper.ts

@@ -32,7 +32,7 @@ export const getDynamicModuleNames = (): string[] => {
     .map(dirent => dirent.name);
 
   // logger.debug(`Enabled dynamic modules:`, enabledModules);
-  console.log(`Dynamic Modules Are:`, enabledModules);
+  // console.log(`Dynamic Modules Are:`, enabledModules);
 
   return enabledModules;
 }
@@ -67,7 +67,7 @@ export const getDynamicModuleNamesBasedOnMetadata = (): string[] => {
     .map(dirent => dirent.name);
 
   // logger.debug(`Enabled dynamic modules basis src:`, enabledModules);
-  console.log(`Src Based Dynamic Modules Are:`, enabledModules);
+  // console.log(`Src Based Dynamic Modules Are:`, enabledModules);
   return enabledModules;
 }
 

package/src/helpers/solid-registry.ts

@@ -5,11 +5,12 @@ import { CommonEntity } from 'src/entities/common.entity';
 import { Locale } from 'src/entities/locale.entity';
 import { SecurityRule } from 'src/entities/security-rule.entity';
 import { IScheduledJob } from 'src/services/scheduled-jobs/scheduled-job.interface';
-import { IDashboardQuestionDataProvider, IDashboardVariableSelectionProvider, IErrorCodeProvider, ISecurityRuleConfigProvider, ISelectionProvider, ISelectionProviderContext, ISolidDatabaseModule } from "../interfaces";
+import { IDashboardQuestionDataProvider, IDashboardVariableSelectionProvider, IErrorCodeProvider, ISecurityRuleConfigProvider, ISelectionProvider, ISelectionProviderContext, ISolidDatabaseModule, ISettingsProvider, SettingDefinition } from "../interfaces";
 import { DatasourceType } from 'src/dtos/create-model-metadata.dto';
 import { ObjectLiteral } from 'typeorm';
 import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
 import { RelationMetadata } from 'typeorm/metadata/RelationMetadata';
+import { Setting } from 'src/entities/setting.entity';
 
 type ControllerMetadata = {
   name: string;
@@ -84,6 +85,7 @@ export class SolidRegistry {
   private smsProviders: Set<InstanceWrapper> = new Set();
   private securityRuleConfigProviders: Set<InstanceWrapper> = new Set();
   private errorCodeProviders: Set<InstanceWrapper> = new Set();
+  private settingsProviders: Set<InstanceWrapper> = new Set();
 
   registerErrorCodeProvider(errorCodeProvider: InstanceWrapper): void {
     this.errorCodeProviders.add(errorCodeProvider);
@@ -145,6 +147,37 @@ export class SolidRegistry {
     this.modules = new Set(modules);
   }
 
+  registerSettingsProvider(provider: InstanceWrapper) {
+    this.settingsProviders.add(provider);
+  }
+
+  registerSecurityRules(securityRules: SecurityRule[]) {
+    this.securityRules = securityRules;
+  }
+
+  registerlocales(locales: Locale[]) {
+    this.locales = locales;
+  }
+
+  registerComputedFieldMetadata(computedFieldMetadata: ComputedFieldMetadata[]) {
+    this.computedFieldMetadata = computedFieldMetadata;
+  }
+
+  getSettingsProviders(): InstanceWrapper[] {
+    return Array.from(this.settingsProviders);
+  }
+
+  getSettingsProviderInstance<T extends ISelectionProviderContext>(name: string): ISelectionProvider<T> {
+    const settingsProviders = this.getSettingsProviders();
+
+    for (let i = 0; i < settingsProviders.length; i++) {
+      const settingsProvider = settingsProviders[i];
+      if (settingsProvider.instance.name() === name) {
+        return settingsProvider.instance;
+      }
+    }
+  }
+
   getMailProviders(): Array<InstanceWrapper> {
     return Array.from(this.mailProviders);
   }
@@ -236,10 +269,8 @@ export class SolidRegistry {
         return dasbhoardQuestionDataProvider.instance;
       }
     }
-
   }
 
-
   getComputedFieldProviders(): Array<InstanceWrapper> {
     return Array.from(this.computedFieldProviders);
   }
@@ -291,18 +322,6 @@ export class SolidRegistry {
     return module
   }
 
-  registerSecurityRules(securityRules: SecurityRule[]) {
-    this.securityRules = securityRules;
-  }
-
-  registerlocales(locales: Locale[]) {
-    this.locales = locales;
-  }
-
-  registerComputedFieldMetadata(computedFieldMetadata: ComputedFieldMetadata[]) {
-    this.computedFieldMetadata = computedFieldMetadata;
-  }
-
   getComputedFieldMetadata(): ComputedFieldMetadata[] {
     return this.computedFieldMetadata;
   }
@@ -328,4 +347,14 @@ export class SolidRegistry {
     // return Reflect.getMetadataKeys(CommonEntity.prototype) as (keyof CommonEntity)[];
   }
 
-}
+
+  getAllSettingsProviderInstance<T extends ISelectionProviderContext>(): ISelectionProvider<T> {
+    const settingsProviders = this.getSettingsProviders();
+
+    for (let i = 0; i < settingsProviders.length; i++) {
+      const settingsProvider = settingsProviders[i];
+      return settingsProvider.instance;
+    }
+  }
+}
+

package/src/index.ts

@@ -4,9 +4,6 @@ export * from './commands/refresh-module.command'
 export * from './commands/remove-fields.command'
 export * from './commands/seed.command'
 
-export * from './config/app-builder.config'
-export {default as commonConfig} from './config/common.config'
-export * from './config/iam.config'
 export * from './config/cache.options'
 
 export * from './decorators/active-user.decorator'
@@ -25,6 +22,7 @@ export * from './decorators/solid-service.decorator'
 export * from './decorators/mail-provider.decorator'
 export * from './decorators/security-rule-config-provider.decorator'
 export * from './decorators/sms-provider.decorator'
+export * from './decorators/settings-provider.decorator'
 
 export * from './dtos/post-chatter-message.dto'
 export * from './dtos/security-rule-config.dto'
@@ -236,7 +234,6 @@ export * from './services/hashing.service'
 export * from './services/list-of-values.service'
 export * from './services/mail/elastic-email.service'
 export * from './services/mail/smtp-email.service'
-export * from './services/media-storage-provider-metadata-seeder.service'
 export * from './services/media-storage-provider-metadata.service'
 export * from './services/media.service'
 export * from './services/mediaStorageProviders/file-s3-storage-provider'
@@ -267,6 +264,7 @@ export * from './services/user.service'
 export * from './services/view-metadata.service'
 export * from './services/whatsapp/Msg91WhatsappService' //rename
 export * from './services/setting.service'
+export * from './services/settings/default-settings-provider.service'
 export * from './services/security-rule.service'
 export * from './services/request-context.service'
 export * from './services/chatter-message.service'

package/src/interfaces.ts

@@ -58,6 +58,25 @@ export interface ModuleMetadataConfiguration {
   dashboards?: CreateDashboardDto[],
 }
 
+export enum SettingLevel {
+  SystemEnv = 'system-env',
+  SystemAdminReadonly = 'system-admin-readonly',
+  SystemAdminEditable = 'system-admin-editable',
+  InternalUser = "internal-user"
+}
+
+export interface SettingDefinition<T = any> {
+  moduleName: string;
+  key: string;
+  value: T;
+  level: SettingLevel;
+}
+
+// solid-core/settings/settings-provider.interface.ts
+export interface ISettingsProvider {
+  getSettings(): SettingDefinition[];
+}
+
 export interface CodeGenerationOptions {
   moduleId?: number;
   moduleUserKey?: string;
@@ -355,3 +374,13 @@ export interface McpComputedProviderResponse {
 export interface ISecurityRuleConfigProvider {
   securityRuleConfig(activeUser: ActiveUserData, securityRule: SecurityRule): Promise<SecurityRuleConfig>;
 }
+
+
+export interface AwsS3Config {
+  S3_AWS_ACCESS_KEY: string;
+  S3_AWS_SECRET_KEY: string;
+  S3_AWS_REGION_NAME: string;
+}
+
+// Prevents inference so callers must provide explicit type arguments; reusable for other APIs.
+export type NoInfer<T> = [T][T extends any ? 0 : never];

package/src/passport-strategies/google-oauth.strategy.ts

@@ -2,9 +2,8 @@ import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
 import { AuthGuard, PassportStrategy } from '@nestjs/passport';
 import { Strategy, VerifyCallback } from 'passport-google-oauth2';
-import { isGoogleOAuthConfigured } from 'src/helpers/google-oauth.helper';
+import { GoogleAuthConfiguration, isGoogleOAuthConfigured } from 'src/helpers/google-oauth.helper';
 import { v4 as uuid } from 'uuid';
-import { iamConfig } from '../config/iam.config';
 import { UserService } from '../services/user.service';
 
 const DUMMY_CLIENT_ID = 'DUMMY_CLIENT_ID';
@@ -19,19 +18,23 @@ export class GoogleOauthGuard extends AuthGuard('google') { }
 export class GoogleOauthStrategy extends PassportStrategy(Strategy, 'google') {
   private readonly logger = new Logger(GoogleOauthStrategy.name);
   constructor(
-    @Inject(iamConfig.KEY) private iamConfiguration: ConfigType<typeof iamConfig>,
     private readonly userService: UserService
   ) {
     // TODO: Have added default dummy values for the configuration, since the configuration is not mandatory.
     // Perhaps a cleaner way needs to be figured out
     super({
-      clientID: iamConfiguration.googleOauth.clientID ?? DUMMY_CLIENT_ID,
-      clientSecret: iamConfiguration.googleOauth.clientSecret ?? DUMMY_CLIENT_SECRET,
-      callbackURL: iamConfiguration.googleOauth.callbackURL ?? DUMMY_CALLBACK_URL,
+      clientID: process.env.IAM_GOOGLE_OAUTH_CLIENT_ID ?? DUMMY_CLIENT_ID,
+      clientSecret: process.env.IAM_GOOGLE_OAUTH_CLIENT_SECRET ?? DUMMY_CLIENT_SECRET,
+      callbackURL: process.env.IAM_GOOGLE_OAUTH_CALLBACK_URL ?? DUMMY_CALLBACK_URL,
       scope: ['profile', 'email'],
     });
-
-    if (!isGoogleOAuthConfigured(iamConfiguration)) {
+    const googleOauth: GoogleAuthConfiguration = {
+      clientID: process.env.IAM_GOOGLE_OAUTH_CLIENT_ID,
+      clientSecret: process.env.IAM_GOOGLE_OAUTH_CLIENT_SECRET,
+      callbackURL: process.env.IAM_GOOGLE_OAUTH_CALLBACK_URL,
+      redirectURL: process.env.IAM_GOOGLE_OAUTH_REDIRECT_URL,
+    }
+    if (!isGoogleOAuthConfigured(googleOauth)) {
       this.logger.debug('Google OAuth strategy is not configured');
     }
   }

package/src/seeders/email-template-seeder.service.ts

@@ -1,11 +1,12 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import * as fs from 'fs';
 import * as path from 'path';
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 import { ConfigType } from '@nestjs/config';
 import { EmailTemplateService } from '../services/email-template.service';
-import commonConfig from '../config/common.config';
 import { CreateEmailTemplateDto } from '../dtos/create-email-template.dto';
+import { SettingService } from 'src/services/setting.service';
 
 @Injectable()
 export class EmailTemplateSeederService {
@@ -13,13 +14,14 @@ export class EmailTemplateSeederService {
 
     constructor(
         private readonly emailTemplateService: EmailTemplateService,
-        @Inject(commonConfig.KEY)
-        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+        private readonly settingService: SettingService
     ) { }
 
     async seed() {
         // Read the module metadata from a file specified in the .env 
-        const seedDataFiles = this.commonConfiguration.emailTemplateSeederFiles.split(',');
+        const seedDataFileVariable = this.settingService.getConfigValue<SolidCoreSetting>("emailTemplateSeederFiles");
+        const seedDataFiles = seedDataFileVariable.split(',');
+
         for (let i = 0; i < seedDataFiles.length; i++) {
             const seedDataFile = seedDataFiles[i];
             const fullPath = path.join(process.cwd(), seedDataFile);