@solidstarters/solid-core 1.2.203 → 1.2.206

package/src/services/settings/default-settings-provider.service.ts

@@ -0,0 +1,157 @@
+import { Injectable } from "@nestjs/common";
+import { Environment } from "src/decorators/disallow-in-production.decorator";
+import { SettingsProvider } from "src/decorators/settings-provider.decorator";
+import { ISettingsProvider, SettingDefinition, SettingLevel } from "src/interfaces";
+
+const DEFAULT_MEDIA_UPLOAD_DIR = 'media-uploads';
+const DEFAULT_MEDIA_FILE_STORAGE_DIR = 'media-files-storage';
+
+// 1. 
+const getSolidCoreSettings = (isProd: boolean) => ([
+  { moduleName: "solid-core", key: "iamGoogleOAuthEnabled", value: false, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "authPagesLayout", value: "center", level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "authPagesTheme", value: "light", level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "appLogo", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "companylogo", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "favicon", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "appLogoPosition", value: "in_form_view", level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "showAuthContent", value: false, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "appTitle", value: process.env.SOLID_APP_NAME || "Solid App", level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "appSubtitle", value: process.env.SOLID_APP_SUBTITLE || "", level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "appDescription", value: process.env.SOLID_APP_DESCRIPTION || "", level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "showLegalLinks", value: false, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "appTnc", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "appPrivacyPolicy", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "enableDarkMode", value: true, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "copyright", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "enableUsername", value: true, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "enabledNotification", value: true, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "contactSupportEmail", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "contactSupportDisplayName", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "contactSupportIcon", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "authScreenRightBackgroundImage", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "authScreenLeftBackgroundImage", value: null, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "authScreenCenterBackgroundImage", value: null, level: SettingLevel.SystemAdminEditable },
+  {
+    moduleName: "solid-core", key: "solidXGenAiCodeBuilderConfig", value: JSON.stringify({
+      defaultProvider: "",
+      availableProviders: []
+    }), level: SettingLevel.SystemAdminEditable
+  },
+  { moduleName: "solid-core", key: "mcpEnabled", value: process.env.MCP_ENABLED || false, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "mcpServerUrl", value: process.env.MCP_SERVER_URL, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "mcpApiKey", value: process.env.MCP_API_KEY, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "dateTimeFormat", value: process.env.DATE_TIME_FORMAT || "YYYY-MM-DD HH:mm:ss", level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "dateFormat", value: process.env.DATE_FORMAT || "YYYY-MM-DD", level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "baseUrl", value: process.env.BASE_URL, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "solidAppWebsiteUrl", value: process.env.SOLID_APP_WEBSITE_URL, level: SettingLevel.SystemAdminEditable },
+
+  // app-builder-settings-provider.service.ts, app-builder.config.ts
+  { moduleName: "solid-core", key: "moduleMetadataSeederFiles", value: process.env.AB_MODULE_METADATA_SEEDER_FILES ?? '', level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "uploadDir", value: process.env.AB_MEDIA_UPLOAD_DIR ?? DEFAULT_MEDIA_UPLOAD_DIR, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "fileStorageDir", value: process.env.AB_MEDIA_FILE_STORAGE_DIR ?? DEFAULT_MEDIA_FILE_STORAGE_DIR, level: SettingLevel.SystemAdminReadonly },
+
+  // aws-s3-settings-provider.service.ts
+  { moduleName: "solid-core", key: "S3_AWS_ACCESS_KEY", value: process.env.S3_AWS_ACCESS_KEY, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "S3_AWS_SECRET_KEY", value: process.env.S3_AWS_SECRET_KEY, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "S3_AWS_REGION_NAME", value: process.env.S3_AWS_REGION_NAME, level: SettingLevel.SystemAdminReadonly },
+
+  // email-settings-provider.service.ts
+  { moduleName: "solid-core", key: "emailProvider", value: process.env.COMMON_EMAIL_PROVIDER ?? "SMTPEMailService", level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "emailTemplateSeederFiles", value: process.env.COMMON_EMAIL_TEMPLATE_SEEDER_FILES, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "shouldQueueEmails", value: (process.env.COMMON_EMAIL_SHOULD_QUEUE ?? 'false') === 'true', level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "smtpMailHost", value: process.env.COMMON_SMTP_EMAIL_SMTP_HOST, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "smtpMailPort", value: +(process.env.COMMON_SMTP_EMAIL_SMTP_PORT ?? 587), level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "smtpMailUsername", value: process.env.COMMON_SMTP_EMAIL_USERNAME, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "smtpMailPassword", value: process.env.COMMON_SMTP_EMAIL_PASSWORD, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "smtpMailFrom", value: process.env.COMMON_SMTP_EMAIL_FROM ?? process.env.COMMON_EMAIL_FROM, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "apiMailKey", value: process.env.COMMON_API_EMAIL_KEY, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "apiMailFrom", value: process.env.COMMON_EMAIL_FROM, level: SettingLevel.SystemAdminReadonly },
+
+  // genai-settings-provider.service.ts
+  { moduleName: "solid-core", key: "ragServerUrl", value: process.env.GENAI_RAG_SERVER_URL, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "ragServerLogin", value: process.env.GENAI_RAG_SERVER_LOGIN, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "ragServerPassword", value: process.env.GENAI_RAG_SERVER_PASSWORD, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "mcpPythonExecutable", value: process.env.MCP_PYTHON_EXECUTABLE, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "mcpClient", value: process.env.MCP_CLIENT, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "mcpRestartTouchFile", value: process.env.MCP_RESTART_TOUCH_FILE || "tmp/restart.touch", level: SettingLevel.SystemEnv },
+
+  // google-oauth-settings-provider.service.ts
+  { moduleName: "solid-core", key: "clientID", value: process.env.IAM_GOOGLE_OAUTH_CLIENT_ID, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "clientSecret", value: process.env.IAM_GOOGLE_OAUTH_CLIENT_SECRET, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "callbackURL", value: process.env.IAM_GOOGLE_OAUTH_CALLBACK_URL, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "redirectURL", value: process.env.IAM_GOOGLE_OAUTH_REDIRECT_URL, level: SettingLevel.SystemAdminReadonly },
+
+  // iam-settings-provider.service.ts
+  { moduleName: "solid-core", key: "passwordLessAuth", value: (process.env.IAM_PASSWORD_LESS_AUTH?.trim() ?? 'false') === 'true', level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "passwordBasedAuth", value: (process.env.IAM_PASSWORD_BASED_AUTH?.trim() ?? 'true') === 'true', level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "passwordlessRegistrationValidateWhat", value: (process.env.IAM_PASSWORD_LESS_REGISTRATION_VALIDATE_WHAT ?? 'email').split(',').map((item) => item.trim()), level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "allowPublicRegistration", value: (process.env.IAM_ALLOW_PUBLIC_REGISTRATION ?? 'true') === 'true', level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "activateUserOnRegistration", value: (process.env.IAM_ACTIVATE_USER_ON_REGISTRATION ?? 'true') === 'true', level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "autoLoginUserOnRegistration", value: (process.env.IAM_AUTO_LOGIN_USER_ON_REGISTRATION ?? 'false') === 'true', level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "otpExpiry", value: parseInt(process.env.IAM_OTP_EXPIRY ?? '10'), level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "forgotPasswordVerificationTokenExpiry", value: parseInt(process.env.IAM_FORGOT_PASSWORD_VERIFICATION_TOKEN_EXPIRY ?? '10'), level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "defaultRole", value: process.env.IAM_DEFAULT_ROLE ?? 'Public', level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "dummyOtp", value: process.env.IAM_OTP_DUMMY, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "forgotPasswordSendVerificationTokenOn", value: process.env.IAM_FORGOT_PASSWORD_SEND_VERIFICATION_TOKEN_ON ?? 'email', level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "forceChangePasswordOnFirstLogin", value: false, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "authenticationPasswordRegex", value: process.env.PASSWORD_REGEX || '^$|^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[^\\da-zA-Z]).*$', level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "authenticationPasswordRegexErrorMessage", value: process.env.PASSWORD_REGEX_ERROR_MESSAGE || 'Password must contain at least one uppercase, one lowercase, one number, and one special character.', level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "authenticationPasswordComplexityDescription", value: process.env.PASSWORD_COMPLEXITY_DESC || 'Password must contain at least one uppercase, one lowercase, one number, and one special character.', level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "iamAutoGeneratedPassword", value: process.env.IAM_AUTOGENERATED_PASSWORD || true, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "passwordPepper", value: process.env.IAM_PASSWORD_PEPPER || '', level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "showNameFieldsForRegistration", value: process.env.IAM_SHOW_NAME_FIELDS_FOR_REGISTRATION === 'true' ? true : false, level: SettingLevel.SystemAdminEditable },
+  { moduleName: "solid-core", key: "sendWelcomeEmailOnSignup", value: (process.env.IAM_SEND_WELCOME_EMAIL_ON_SIGNUP ?? 'false').toLowerCase() === 'true', level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "sendWelcomeSmsOnSignup", value: (process.env.IAM_SEND_WELCOME_SMS_ON_SIGNUP ?? 'false').toLowerCase() === 'true', level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "frontendLoginPageUrl", value: process.env.IAM_FRONTEND_APP_LOGIN_PAGE_URL, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "frontendForgotPasswordPageUrl", value: process.env.IAM_FRONTEND_APP_FORGOT_PASSWORD_PAGE_URL, level: SettingLevel.SystemAdminReadonly },
+
+  // jwt-settings-provider.service.ts
+  { moduleName: "solid-core", key: "secret", value: process.env.IAM_JWT_SECRET, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "audience", value: process.env.IAM_JWT_TOKEN_AUDIENCE, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "issuer", value: process.env.IAM_JWT_TOKEN_ISSUER, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "accessTokenTtl", value: parseInt(process.env.IAM_JWT_ACCESS_TOKEN_TTL ?? (isProd ? "1200" : "86400"), 10,), level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "refreshTokenTtl", value: parseInt(process.env.IAM_JWT_REFRESH_TOKEN_TTL ?? "604800", 10), level: SettingLevel.SystemEnv },
+
+  // queues-settings-provider.service.ts
+  { moduleName: "solid-core", key: "queuesDefaultBroker", value: process.env.QUEUES_DEFAULT_BROKER || 'database', level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "queuesServiceRole", value: process.env.QUEUES_SERVICE_ROLE, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "queuesRabbitMqUrl", value: process.env.QUEUES_RABBIT_MQ_URL, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "solidCliRunning", value: process.env.SOLID_CLI_RUNNING || "false", level: SettingLevel.SystemEnv },
+
+  // sms-settings-provider.service.ts
+  { moduleName: "solid-core", key: "smsProvider", value: process.env.COMMON_SMS_PROVIDER, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "smsTemplateSeederFiles", value: process.env.COMMON_SMS_TEMPLATE_SEEDER_FILES, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "shouldQueueSms", value: (process.env.COMMON_SMS_SHOULD_QUEUE ?? 'false') === 'true', level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "msg91SmsUrl", value: process.env.COMMON_MSG91_SMS_URL, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "msg91SmsApiKey", value: process.env.COMMON_MSG91_SMS_API_KEY, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "twilioAccountSid", value: process.env.COMMON_TWILIO_ACCOUNT_SID, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "twilioAuthToken", value: process.env.COMMON_TWILIO_AUTH_TOKEN, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "twilioNumber", value: process.env.COMMON_TWILIO_NUMBER, level: SettingLevel.SystemAdminReadonly },
+
+  // tiny-url-settings-provider.service.ts
+  { moduleName: "solid-core", key: "tinyUrlApiUrl", value: process.env.COMMON_SHORT_URL_API_URL, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "tinyUrlApiKey", value: process.env.COMMON_SHORT_URL_API_KEY, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "tinyUrlDomain", value: process.env.COMMON_SHORT_URL_DOMAIN, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "tinyUrlEnabled", value: (process.env.COMMON_SHORT_URL_ENABLED ?? 'false') === 'true', level: SettingLevel.SystemAdminReadonly },
+
+  // whatsapp-settings-provider.service.ts
+  { moduleName: "solid-core", key: "whatsappProvider", value: process.env.COMMON_WHATSAPP_PROVIDER, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "msg91WhatsappUrl", value: process.env.COMMON_WHATSAPP_API_URL, level: SettingLevel.SystemAdminReadonly },
+  { moduleName: "solid-core", key: "msg91WhatsappApiKey", value: process.env.COMMON_WHATSAPP_API_KEY, level: SettingLevel.SystemEnv },
+  { moduleName: "solid-core", key: "msg91WhatsappIntegratedNumber", value: process.env.COMMON_WHATSAPP_INTEGRATED_NUMBER, level: SettingLevel.SystemAdminReadonly },
+] as const satisfies SettingDefinition[]);
+
+// 2. 
+export type SolidCoreSetting = ReturnType<typeof getSolidCoreSettings>[number]["key"];
+
+// 3. 
+@SettingsProvider()
+@Injectable()
+export class SolidCoreDefaultSettingsProvider implements ISettingsProvider {
+
+  getSettings() {
+    const isProd = (process.env.ENV as Environment) === Environment.Production;
+    return getSolidCoreSettings(isProd);
+  }
+}

package/src/services/short-url/tiny-url.service.ts

@@ -1,8 +1,8 @@
 import { HttpService } from "@nestjs/axios";
-import { Inject, Injectable, Logger } from "@nestjs/common";
-import { ConfigType } from "@nestjs/config";
-import commonConfig from "src/config/common.config";
+import { Injectable, Logger } from "@nestjs/common";
 import { CreateShortUrlDto } from "src/dtos/create-short-url.dto";
+import { SettingService } from "../setting.service";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 interface TinyUrlRequest {
     url: string;
@@ -36,16 +36,18 @@ interface TinyUrlResponseData {
 @Injectable()
 export class TinyUrlService {
     constructor(
-        @Inject(commonConfig.KEY)
-        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
         private readonly httpService: HttpService,
+        private readonly settingService: SettingService
     ) { }
     protected readonly logger = new Logger(TinyUrlService.name);
     async shortenUrl(shortUrlDto: CreateShortUrlDto): Promise<string> {
-        if (!this.commonConfiguration.shortUrl.enabled) {
+        const shotyUrlEnable = this.settingService.getConfigValue<SolidCoreSetting>("tinyUrlEnabled")
+        const shotyUrlapiUrl = this.settingService.getConfigValue<SolidCoreSetting>("tinyUrlApiUrl")
+        const shotyUrlApiKey = this.settingService.getConfigValue<SolidCoreSetting>("tinyUrlApiKey")
+        if (!shotyUrlEnable) {
             return shortUrlDto.url;
         }
-        const shortUrlApiUrl = `${this.commonConfiguration.shortUrl.apiUrl}/create?api_token=${this.commonConfiguration.shortUrl.apiKey}`;
+        const shortUrlApiUrl = `${shotyUrlapiUrl}/create?api_token=${shotyUrlApiKey}`;
         const body = this.createTinyUrlRequest(shortUrlDto)
         const response = await this.httpService.axiosRef.post(shortUrlApiUrl, body);
         const tinyUrlResponse = response.data as TinyUrlResponse;

package/src/services/sms/Msg91BaseSMSService.ts

@@ -1,19 +1,21 @@
 import { Logger } from "@nestjs/common";
 import { ConfigType } from "@nestjs/config";
 import Handlebars from "handlebars";
-import commonConfig from "src/config/common.config";
 import { QueueMessage } from "src/interfaces/mq";
 import { SmsTemplateService } from "../sms-template.service";
 import { ISMS } from "../../interfaces";
 import { PublisherFactory } from "../queues/publisher-factory.service";
+import { SettingService } from "../setting.service";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 export abstract class Msg91BaseSMSService implements ISMS {
     protected readonly logger = new Logger(Msg91BaseSMSService.name);
     constructor(
-        protected readonly commonConfiguration: ConfigType<typeof commonConfig>,
+        protected readonly settingService: SettingService,
         protected readonly smsPublisher: string,
         protected readonly publisherFactory: PublisherFactory<any>,
-        protected readonly smsTemplateService: SmsTemplateService,
+        protected readonly smsTemplateService: SmsTemplateService
+
     ) { }
 
     sendSMS(_to: string, _body: string, _shouldQueueSms: boolean): Promise<void> {
@@ -59,7 +61,7 @@ export abstract class Msg91BaseSMSService implements ISMS {
             await this.sendSMSAsynchronously(message);
         }
         // If developer has not, however system config mandates that we send using queue, still we send.
-        else if (shouldQueueSms === false && this.commonConfiguration.shouldQueueSms === true) {
+        else if (shouldQueueSms === false && this.settingService.getConfigValue<SolidCoreSetting>("shouldQueueSms") === true) {
             await this.sendSMSAsynchronously(message);
         }
         // Else we send synch

package/src/services/sms/Msg91OTPService.ts

@@ -1,13 +1,13 @@
 import { HttpService } from "@nestjs/axios";
 import { Inject, Injectable } from "@nestjs/common";
-import { ConfigType } from "@nestjs/config";
-import commonConfig from "src/config/common.config";
 import { QueueMessage } from "src/interfaces/mq";
 import { SmsTemplateService } from "../sms-template.service";
 import { Msg91BaseSMSService } from "./Msg91BaseSMSService";
 import { ISMS } from "../../interfaces";
 import { PublisherFactory } from "../queues/publisher-factory.service";
+import { SettingService } from "../setting.service";
 import { SmsProvider } from "src/decorators/sms-provider.decorator";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 interface OtpParams {
     otp: string,
@@ -20,19 +20,19 @@ interface OtpParams {
 @SmsProvider()
 export class Msg91OTPService extends Msg91BaseSMSService implements ISMS {
     constructor(
-        @Inject(commonConfig.KEY)
-        commonConfiguration: ConfigType<typeof commonConfig>,
+        settingService: SettingService,
+        // smsPublisher: OTPQueuePublisher,
         publisherFactory: PublisherFactory<any>,
         smsTemplateService: SmsTemplateService,
         private readonly httpService: HttpService,
     ) {
-        super(commonConfiguration, 'Msg91OTPQueuePublisher', publisherFactory, smsTemplateService);
+        super(settingService, 'Msg91OTPQueuePublisher', publisherFactory, smsTemplateService);
     }
 
     async sendSMSSynchronously(message: QueueMessage<any>): Promise<any> {
         const { to, templateId, otp } = message.payload;
-        const params = { otp, template_id: templateId, mobile: to, authkey: this.commonConfiguration.msg91Sms.apiKey }
-        const otpUrl = `${this.commonConfiguration.msg91Sms.url}/otp?${this.paramsToQueryString(params)}`;
+        const params = { otp, template_id: templateId, mobile: to, authkey: this.settingService.getConfigValue<SolidCoreSetting>("msg91SmsApiKey") }
+        const otpUrl = `${this.settingService.getConfigValue<SolidCoreSetting>("msg91SmsUrl")}/otp?${this.paramsToQueryString(params)}`;
         await this.httpService.axiosRef.post(otpUrl, {});
         this.logger.debug(`Sending OTP to ${to} with url ${otpUrl}`);
     }

package/src/services/sms/Msg91SMSService.ts

@@ -1,33 +1,34 @@
 import { HttpService } from "@nestjs/axios";
 import { Inject, Injectable } from "@nestjs/common";
 import { ConfigType } from "@nestjs/config";
-import commonConfig from "src/config/common.config";
 import { QueueMessage } from "src/interfaces/mq";
 import { SmsTemplateService } from "../sms-template.service";
 import { Msg91BaseSMSService } from "./Msg91BaseSMSService";
 import { ISMS } from "../../interfaces";
 import { PublisherFactory } from "../queues/publisher-factory.service";
+import { SettingService } from "../setting.service";
 import { SmsProvider } from "src/decorators/sms-provider.decorator";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 @Injectable()
 @SmsProvider()
 export class Msg91SMSService extends Msg91BaseSMSService implements ISMS {
     constructor(
-        @Inject(commonConfig.KEY)
-        commonConfiguration: ConfigType<typeof commonConfig>,
+        settingService: SettingService,
+
         // smsPublisher: SmsQueuePublisher,
         publisherFactory: PublisherFactory<any>,
         smsTemplateService: SmsTemplateService,
         private readonly httpService: HttpService,
     ) {
-        super(commonConfiguration, 'Msg91SmsQueuePublisher', publisherFactory, smsTemplateService)
+        super(settingService, 'Msg91SmsQueuePublisher', publisherFactory, smsTemplateService)
     }
 
     async sendSMSSynchronously(message: QueueMessage<any>): Promise<any> {
         const { to, templateId, ...templateParams } = message.payload;
         const body = { template_id: templateId, short_url: "0", recipients: [{ mobiles: to, ...templateParams }] };
-        const headers = { "authkey": this.commonConfiguration.msg91Sms.apiKey };
-        await this.httpService.axiosRef.post(`${this.commonConfiguration.msg91Sms.url}/flow`, body, { headers });
+        const headers = { "authkey": this.settingService.getConfigValue<SolidCoreSetting>("msg91SmsApiKey") };
+        await this.httpService.axiosRef.post(`${this.settingService.getConfigValue<SolidCoreSetting>("msg91SmsUrl")}/flow`, body, { headers });
         this.logger.debug(`Sending SMS to ${to} with body ${JSON.stringify(body)} and headers ${JSON.stringify(headers)}`);
     }
 }

package/src/services/sms/TwilioSMSService.ts

@@ -1,13 +1,13 @@
 import Handlebars from "handlebars";
-import { Inject, Injectable, Logger } from "@nestjs/common";
-import { ConfigType } from "@nestjs/config";
-import commonConfig from "src/config/common.config";
+import { Injectable, Logger } from "@nestjs/common";
 import { SmsTemplateService } from "../sms-template.service";
 import { ISMS } from "../../interfaces";
 import { PublisherFactory } from "../queues/publisher-factory.service";
 import twilio from 'twilio';
 import { QueueMessage } from "src/interfaces/mq";
+import { SettingService } from "../setting.service";
 import { SmsProvider } from "src/decorators/sms-provider.decorator";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 
 @Injectable()
@@ -16,16 +16,20 @@ export class TwilioSMSService implements ISMS {
     private readonly logger = new Logger(TwilioSMSService.name);
 
     constructor(
-        @Inject(commonConfig.KEY)
-        private commonConfiguration: ConfigType<typeof commonConfig>,
         private publisherFactory: PublisherFactory<any>,
         private smsTemplateService: SmsTemplateService,
-    ) { }
+        private settingService: SettingService
+    ) {
+        // super(commonConfiguration, 'OTPQueuePublisher', publisherFactory, smsTemplateService);
+    }
 
     async sendSMS(to: string, body: string, shouldQueueSms: boolean): Promise<any> {
-        const accountSid = this.commonConfiguration.twilio.accountSid;
-        const authToken = this.commonConfiguration.twilio.authToken;
-        const twilioNumber = this.commonConfiguration.twilio.number;
+
+
+
+        const accountSid = this.settingService.getConfigValue<SolidCoreSetting>('twilioAccountSid');
+        const authToken = this.settingService.getConfigValue<SolidCoreSetting>('twilioAuthToken');
+        const twilioNumber = this.settingService.getConfigValue<SolidCoreSetting>('twilioNumber');
         if (!accountSid || !authToken || !twilioNumber) {
             throw new Error("Missing COMMON_TWILIO_ACCOUNT_SID or COMMON_TWILIO_AUTH_TOKEN or COMMON_TWILIO_NUMBER in env.");
         }
@@ -42,7 +46,7 @@ export class TwilioSMSService implements ISMS {
             await this.sendSMSAsynchronously(message);
         }
         // If developer has not, however system config mandates that we send using queue, still we send.
-        else if (shouldQueueSms === false && this.commonConfiguration.shouldQueueSms === true) {
+        else if (shouldQueueSms === false && this.settingService.getConfigValue<SolidCoreSetting>('shouldQueueSms') === true) {
             await this.sendSMSAsynchronously(message);
         }
         // Else we send synch
@@ -80,21 +84,18 @@ export class TwilioSMSService implements ISMS {
     }
 
     async sendSMSSynchronously(message: QueueMessage<any>): Promise<any> {
-        const accountSid = this.commonConfiguration.twilio.accountSid;
-        const authToken = this.commonConfiguration.twilio.authToken;
-        const twilioNumber = this.commonConfiguration.twilio.number;
+        const accountSid = this.settingService.getConfigValue<SolidCoreSetting>('twilioAccountSid');
+        const authToken = this.settingService.getConfigValue<SolidCoreSetting>('twilioAuthToken');
+        const twilioNumber = this.settingService.getConfigValue<SolidCoreSetting>('twilioNumber');
+
         if (!accountSid || !authToken || !twilioNumber) {
             throw new Error("Missing COMMON_TWILIO_ACCOUNT_SID or COMMON_TWILIO_AUTH_TOKEN or COMMON_TWILIO_NUMBER in env.");
         }
-
         const { to, body } = message.payload;
-
         const client = twilio(accountSid, authToken);
         try {
             const toSplit = to.split(',');
-
             const r = [];
-
             for (let i = 0; i < toSplit.length; i++) {
                 const actualTo = toSplit[i];
                 const twilioResponseMsg = await client.messages.create({
@@ -102,11 +103,9 @@ export class TwilioSMSService implements ISMS {
                     from: twilioNumber,
                     to: actualTo,
                 });
-
                 this.logger.debug(`Sending SMS to ${actualTo} using Twilio`);
                 this.logger.debug(`Twilio response: `);
                 this.logger.debug(JSON.stringify(twilioResponseMsg))
-
                 r.push(twilioResponseMsg);
             }
 

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

@@ -1,31 +1,19 @@
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 
-import { ConfigService } from '@nestjs/config';
-import { DiscoveryService, ModuleRef } from '@nestjs/core';
+import { ModuleRef } from '@nestjs/core';
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { SmsTemplateRepository } from 'src/repository/sms-template.repository';
 import { EntityManager } from 'typeorm';
 import { SmsTemplate } from '../entities/sms-template.entity';
-import { CrudHelperService } from './crud-helper.service';
 import { CRUDService } from './crud.service';
-import { FileService } from './file.service';
 import { MediaStorageProviderMetadataService } from './media-storage-provider-metadata.service';
 import { MediaService } from './media.service';
-import { ModelMetadataService } from './model-metadata.service';
-import { ModuleMetadataService } from './module-metadata.service';
 
 @Injectable()
 export class SmsTemplateService extends CRUDService<SmsTemplate>{
     constructor(
-        @Inject(forwardRef(() => ModelMetadataService))
-        readonly modelMetadataService: ModelMetadataService,
-            readonly moduleMetadataService: ModuleMetadataService,
             readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
-            readonly configService: ConfigService,
-            readonly fileService: FileService,
             readonly mediaService: MediaService,
-            readonly discoveryService: DiscoveryService,
-            readonly crudHelperService: CrudHelperService,
             @InjectEntityManager()
             readonly entityManager: EntityManager,
             // @InjectRepository(SmsTemplate, 'default')
@@ -33,7 +21,7 @@ export class SmsTemplateService extends CRUDService<SmsTemplate>{
             readonly repo: SmsTemplateRepository,
             readonly moduleRef: ModuleRef,
     ) {
-        super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'smsTemplate', 'app-builder', moduleRef);
+        super(entityManager, repo, 'smsTemplate', 'app-builder', moduleRef);
      }
 
     async removeByName(name: string) {