npm - @solidstarters/solid-core - Versions diffs - 1.2.109 → 1.2.111 - Mend

@solidstarters/solid-core 1.2.109 → 1.2.111

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.109",
+  "version": "1.2.111",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/seeders/seed-data/email-templates/forgot-password.handlebars.html CHANGED Viewed

@@ -116,19 +116,19 @@
 <body>
     <div class="email-wrapper">
-        <!-- Logo outside the box -->
+        {{#if companyLogoUrl}}
         <div class="logo">
-            <img src="https://yourcompany.com/logo.png" alt="Company Logo" />
+            <img src="{{companyLogoUrl}}" alt="Company Logo" />
         </div>
+        {{/if}}
-        <!-- Content Box -->
         <div class="content-box">
-            <h2 class="title">Hi, {{ fullName }} !</h2>
+            <h2 class="title">Hi {{ fullName }},</h2>
             <p class="intro">
-                Welcome to {{ solidAppName }}
+                We received a request to reset your password for <strong>{{ solidAppName }}</strong>.
             </p>
             <p class="intro">
-                You requested a password reset. Click the button below to set a new password:
+                Please click the link below to set a new password:
             </p>
             <div class="button-container">
                 <a href="{{ passwordResetLink }}" class="button" target="_blank">
@@ -136,7 +136,12 @@
                 </a>
             </div>
             <p class="footer-text">
-                If you have any questions, just reply to this email—we’re happy to help.
+                If you did not request this, please ignore this email.
+            </p>
+            <p class="intro">
+                Regards,
+                <br />
+                The {{ solidAppName }} Team.
             </p>
         </div>

package/src/seeders/seed-data/email-templates/on-force-password-change.handlebars.html CHANGED Viewed

@@ -116,24 +116,25 @@
 <body>
     <div class="email-wrapper">
-        <!-- Logo outside the box -->
+        {{#if companyLogoUrl}}
         <div class="logo">
-            <img src="https://yourcompany.com/logo.png" alt="Company Logo" />
+            <img src="{{companyLogoUrl}}" alt="Company Logo" />
         </div>
+        {{/if}}
-        <!-- Content Box -->
         <div class="content-box">
-            <h2 class="title">Hi, {{ fullName }} !</h2>
+            <h2 class="title">Hi {{ fullName }},</h2>
             <p class="intro">
-                Welcome to {{ solidAppName }}
+                Welcome aboard! Your account for <strong>{{ solidAppName }}</strong> has been created.
             </p>
-            <p class="intro">
-                We're excited to have you on board. Here are your login details:
+            <p class="intro" style="margin-top: 10px;">
+                For your security, you'll be prompted to set a new password upon your first login. Please use the
+                temporary password provided to log in for the first time.
             </p>
             <div class="credentials">
                 <p><strong>Email:</strong> {{ email }}</p>
-                <p><strong>Password:</strong> {{ password }}</p>
+                <p><strong>Temporary Password:</strong> {{ password }}</p>
             </div>
             <div class="button-container">
@@ -141,9 +142,10 @@
                     Login to Your Account
                 </a>
             </div>
-            <p class="footer-text">
-                If you have any questions, just reply to this email—we’re happy to help.
+            <p class="intro">
+                Regards,
+                <br/ >
+                The {{ solidAppName }} Team.
             </p>
         </div>

package/src/seeders/seed-data/email-templates/otp-on-login.handlebars.html CHANGED Viewed

@@ -115,24 +115,32 @@
 <body>
     <div class="email-wrapper">
-        <!-- Logo outside the box -->
+        {{#if companyLogoUrl}}
         <div class="logo">
-            <img src="https://yourcompany.com/logo.png" alt="Company Logo" />
+            <img src="{{companyLogoUrl}}" alt="Company Logo" />
         </div>
+        {{/if}}
-        <!-- Content Box -->
         <div class="content-box">
-            <h2 class="title">Hi, {{ fullName }}</h2>
+            <h2 class="title">Hi {{ fullName }},</h2>
             <p class="intro">
-                Login to {{ solidAppName }}, using the below verification code.
+                Your One-Time Password (OTP) to log in to <strong>{{ solidAppName }}</strong> is:
             </p>
             <div class="button-container">
                 <div class="button">
                     {{ emailVerificationTokenOnLogin }}
                 </div>
             </div>
+            <p class="intro">
+                This code is valid for 10 minutes.
+            </p>
             <p class="footer-text">
-                If you have any questions, just reply to this email—we’re happy to help.
+                If you did not attempt to log in, please disregard this email or contact our support team.
+            </p>
+            <p class="intro">
+                Regards,
+                <br />
+                The {{ solidAppName }} Team.
             </p>
         </div>

package/src/seeders/seed-data/email-templates/otp-on-register.handlebars.html CHANGED Viewed

@@ -115,25 +115,36 @@
 <body>
     <div class="email-wrapper">
-        <!-- Logo outside the box -->
+        {{#if companyLogoUrl}}
         <div class="logo">
-            <img src="https://yourcompany.com/logo.png" alt="Company Logo" />
+            <img src="{{companyLogoUrl}}" alt="Company Logo" />
         </div>
+        {{/if}}
-        <!-- Content Box -->
         <div class="content-box">
-            <h2 class="title">Hi, {{ fullName }}</h2>
+            <h2 class="title">Hi {{ fullName }},</h2>
             <p class="intro">
-                To get started with {{ solidAppName }}, please verify your account using the
-                below verification code.
+                Thank you for signing up for <strong>{{ solidAppName }}!</strong>
+            </p>
+            <p class="intro" style="margin-top: 10px;">
+                To complete your registration, please use the following One-Time Password (OTP) to verify your email
+                address:
             </p>
             <div class="button-container">
                 <div class="button">
                     {{ emailVerificationTokenOnRegistration }}
                 </div>
             </div>
+            <p class="intro">
+                This code is valid for 10 minutes. Please do not share this code with anyone.
+            </p>
             <p class="footer-text">
-                If you have any questions, just reply to this email—we’re happy to help.
+                If you did not attempt to sign up, please disregard this email.
+            </p>
+            <p class="intro">
+                Regards,
+                <br />
+                The {{ solidAppName }} Team.
             </p>
         </div>

package/src/seeders/seed-data/solid-core-metadata.json CHANGED Viewed

@@ -9300,7 +9300,7 @@
       "name": "on-force-password-change",
       "displayName": "Default: On Force Password Change",
       "body": "on-force-password-change.handlebars.html",
-      "subject": "{{solidAppName}} - Your New Account.",
+      "subject": "Welcome to {{solidAppName}}!",
       "description": "When using password based signUp, if the user does not specify the password of the new account being created the system automatically triggers a force password change email.",
       "active": true,
       "type": "text"
@@ -9309,7 +9309,7 @@
       "name": "otp-on-register",
       "displayName": "Default: Otp On Register",
       "body": "otp-on-register.handlebars.html",
-      "subject": "{{solidAppName}} - Verify Your New Account.",
+      "subject": "Verify Your Email for {{solidAppName}}",
       "description": "This template is used to generate the account verification email sent to users to verify their email address when they register.",
       "active": true,
       "type": "text"
@@ -9318,7 +9318,7 @@
       "name": "otp-on-login",
       "displayName": "Default: Otp On Login",
       "body": "otp-on-login.handlebars.html",
-      "subject": "{{solidAppName}} - Verification Token For Your Login.",
+      "subject": "Your One-Time Password for {{solidAppName}}",
       "description": "This template is used to send the email with the OTP when logging in.",
       "active": true,
       "type": "text"
@@ -9327,7 +9327,7 @@
       "name": "forgot-password",
       "displayName": "Default: Forgot Password",
       "body": "forgot-password.handlebars.html",
-      "subject": "{{solidAppName}} - Password Reset Instructions.",
+      "subject": "Reset Your Password for {{solidAppName}}",
       "description": "This template is used to send the verification token required by users to reset their password.",
       "active": true,
       "type": "text"

package/src/services/authentication.service.ts CHANGED Viewed

@@ -82,6 +82,10 @@ export class AuthenticationService {
     ) { }
+    private async getCompanyLogo(): Promise<string> {
+        return await this.settingService.getConfigValue('companylogo');
+    }
     async resolveUser(username: string, email: string) {
         return await this.userRepository.findOne({
             where: [
@@ -235,7 +239,8 @@ export class AuthenticationService {
         return password;
     }
-    private notifyUserOnForcePasswordChange(user: User, autoGeneratedPwd: string) {
+    private async notifyUserOnForcePasswordChange(user: User, autoGeneratedPwd: string) {
+        const companyLogo = await this.getCompanyLogo();
         this.mailService.sendEmailUsingTemplate(
             user.email,
@@ -244,9 +249,11 @@ export class AuthenticationService {
                 solidAppName: process.env.SOLID_APP_NAME,
                 solidAppWebsiteUrl: process.env.SOLID_APP_WEBSITE_URL,
                 frontendLoginPageUrl: process.env.IAM_FRONTEND_APP_LOGIN_PAGE_URL,
+                email: user.email,
                 fullName: user.fullName,
                 userName: user.username,
                 password: autoGeneratedPwd,
+                companyLogoUrl: companyLogo
             },
             this.commonConfiguration.shouldQueueEmails,
             'user',
@@ -351,7 +358,8 @@ export class AuthenticationService {
         }
     }
-    private notifyUserOnOtpInitiateRegistration(user: User, registrationValidationSources: string[]) {
+    private async notifyUserOnOtpInitiateRegistration(user: User, registrationValidationSources: string[]) {
+        const companyLogo = await this.getCompanyLogo();
         if (this.iamConfiguration.dummyOtp)
             return; // Do nothing if dummy otp is configured.
         if (registrationValidationSources.includes(RegistrationValidationSource.EMAIL)) {
@@ -364,6 +372,7 @@ export class AuthenticationService {
                     firstName: user.username,
                     fullName: user.fullName ? user.fullName : user.username,
                     emailVerificationTokenOnRegistration: user.emailVerificationTokenOnRegistration,
+                    companyLogoUrl: companyLogo
                 },
                 this.commonConfiguration.shouldQueueEmails,
                 'user',
@@ -380,6 +389,7 @@ export class AuthenticationService {
                     mobileVerificationTokenOnRegistration: user.mobileVerificationTokenOnRegistration,
                     firstName: user.username,
                     fullName: user.fullName ? user.fullName : user.username,
+                    companyLogoUrl: companyLogo
                 }
             );
         }
@@ -532,7 +542,9 @@ export class AuthenticationService {
         return { message: 'User login initiated. OTP sent to the user.' };
     }
-    private notifyUserOnOtpInititateLogin(user: User, loginType: RegistrationValidationSource) {
+    private async notifyUserOnOtpInititateLogin(user: User, loginType: RegistrationValidationSource) {
+        const companyLogo = await this.getCompanyLogo();
         if (this.iamConfiguration.dummyOtp)
             return; // Do nothing if dummy otp is configured.
         if (loginType === RegistrationValidationSource.EMAIL) {
@@ -545,6 +557,7 @@ export class AuthenticationService {
                     firstName: user.username,
                     emailVerificationTokenOnLogin: user.emailVerificationTokenOnLogin,
                     fullName: user.fullName ? user.fullName : user.username,
+                    companyLogoUrl: companyLogo
                 },
                 this.commonConfiguration.shouldQueueEmails,
                 'user',
@@ -561,6 +574,7 @@ export class AuthenticationService {
                     mobileVerificationTokenOnLogin: user.mobileVerificationTokenOnLogin,
                     firstName: user.username,
                     fullName: user.fullName ? user.fullName : user.username,
+                    companyLogoUrl: companyLogo
                 }
             );
         }
@@ -732,7 +746,9 @@ export class AuthenticationService {
         }
     }
-    private notifyUserOnForgotPassword(user: User) {
+    private async notifyUserOnForgotPassword(user: User) {
+        const companyLogo = await this.getCompanyLogo();
         const forgotPasswordSendVerificationTokenOn = this.iamConfiguration.forgotPasswordSendVerificationTokenOn;
         if (forgotPasswordSendVerificationTokenOn == ForgotPasswordSendVerificationTokenOn.EMAIL) {
@@ -745,7 +761,8 @@ export class AuthenticationService {
                     firstName: user.username,
                     fullName: user.fullName,
                     // TODO: Need to prefix this with the page url where the forgot password page will open up.
-                    passwordResetLink: `${process.env.IAM_FRONTEND_APP_FORGOT_PASSWORD_PAGE_URL}?token=${user.verificationTokenOnForgotPassword}&username=${user.username}`
+                    passwordResetLink: `${process.env.IAM_FRONTEND_APP_FORGOT_PASSWORD_PAGE_URL}?token=${user.verificationTokenOnForgotPassword}&username=${user.username}`,
+                    companyLogoUrl: companyLogo
                 },
                 this.commonConfiguration.shouldQueueEmails,
                 'user',
@@ -761,8 +778,8 @@ export class AuthenticationService {
                     solidAppName: process.env.SOLID_APP_NAME,
                     otp: user.verificationTokenOnForgotPassword,
                     verificationTokenOnForgotPassword: user.verificationTokenOnForgotPassword,
-                    firstName: user.username
+                    firstName: user.username,
+                    companyLogoUrl: companyLogo
                 }
             );
         }

package/src/services/setting.service.ts CHANGED Viewed

@@ -49,6 +49,7 @@ export class SettingService extends CRUDService<Setting> {
       authPagesTheme: "light",
       appLogo: "",
       companylogo: "",
+      favicon: "",
       appLogoPosition: "in_form_view",
       showAuthContent: false,
       appTitle: process.env.SOLID_APP_NAME || "Solid App",
@@ -132,6 +133,7 @@ export class SettingService extends CRUDService<Setting> {
       authPagesTheme: "light",
       appLogo: "",
       companylogo: "",
+      favicon: "",
       appLogoPosition: "in_form_view", //in_form_view | in_image_view
       showAuthContent: false,
       appTitle: process.env.SOLID_APP_NAME || "Solid App",
@@ -188,7 +190,10 @@ export class SettingService extends CRUDService<Setting> {
     if (files && files.length > 0) {
       for (const file of files) {
         const key = file.fieldname;
-        const fileStoragePath = `${this.configService.get('app-builder.fileStorageDir')}/${file.filename}-${file.originalname}`;
+        const relativePath = `${file.filename}-${file.originalname}`;
+        const fileStoragePath = `${this.configService.get('app-builder.fileStorageDir')}/${relativePath}`;
+        const baseUrl = process.env.BASE_URL || '';
+        const fullUrl = `${baseUrl}/${fileStoragePath}`;
         await this.fileService.copyFile(file.path, fileStoragePath);
         await this.fileService.deleteFile(file.path);
@@ -196,13 +201,13 @@ export class SettingService extends CRUDService<Setting> {
         if (existingKeys.has(key)) {
           const existingSetting = existingSettings.find(s => s.key === key);
           if (existingSetting) {
-            existingSetting.value = fileStoragePath;
+            existingSetting.value = fullUrl;
             settingsToUpdate.push(existingSetting);
           }
         } else {
           const newSetting = new Setting();
           newSetting.key = key;
-          newSetting.value = fileStoragePath;
+          newSetting.value = fullUrl;
           settingsToCreate.push(newSetting);
         }
       }