npm - @solidstarters/solid-core - Versions diffs - 1.2.201 → 1.2.203 - Mend

@solidstarters/solid-core 1.2.201 → 1.2.203

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 (262) hide show

package/src/seeders/seed-data/email-templates/email-on-signup.handlebars.html ADDED Viewed

@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8" />
+    <title>Welcome to {{ solidAppName }}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style>
+        @import url("https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&display=swap");
+        body {
+            margin: 0;
+            padding: 0;
+            background-color: #f4f4f7;
+            font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
+            color: #333;
+        }
+        .email-wrapper {
+            max-width: 600px;
+            margin: 0 auto;
+            padding: 20px;
+        }
+        .logo {
+            text-align: center;
+            margin-bottom: 20px;
+        }
+        .logo img {
+            height: 50px;
+        }
+        .content-box {
+            background-color: #ffffff;
+            padding: 40px;
+            border-radius: 8px;
+        }
+        .title {
+            font-size: 22px;
+            margin-bottom: 10px;
+        }
+        .intro {
+            font-size: 16px;
+            line-height: 1.6;
+            margin: 0 0 12px 0;
+        }
+        .credentials {
+            background-color: #f9f9f9;
+            padding: 15px;
+            border-radius: 5px;
+            margin: 18px 0;
+            font-size: 16px;
+        }
+        .button-container {
+            text-align: center;
+            margin: 24px 0 30px 0;
+        }
+        .button {
+            display: inline-block;
+            padding: 12px 24px;
+            background-color: #722ED1;
+            color: #ffffff;
+            text-decoration: none;
+            font-weight: bold;
+            border-radius: 4px;
+        }
+        .footer {
+            text-align: center;
+            font-size: 12px;
+            color: #6b6e76;
+            margin-top: 40px;
+        }
+        @media only screen and (max-width: 600px) {
+            .email-wrapper {
+                width: 100% !important;
+                padding: 20px 0 !important;
+                margin: 0;
+            }
+            .content-box {
+                padding: 20px !important;
+                border-radius: 0;
+            }
+            .title {
+                font-size: 18px !important;
+            }
+            .button {
+                padding: 10px !important;
+                font-size: 14px;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="email-wrapper">
+        {{#if companyLogoUrl}}
+        <div class="logo">
+            <img src="{{companyLogoUrl}}" alt="Company Logo" />
+        </div>
+        {{/if}}
+        <div class="content-box">
+            <h2 class="title">Welcome, {{ fullName }}!</h2>
+            <p class="intro">
+                We’re excited to have you on <strong>{{ solidAppName }}</strong>. Your account has been created and is
+                ready to use.
+            </p>
+            <div class="credentials">
+                <p><strong>Username:</strong> {{ userName }}</p>
+                <p><strong>Email:</strong> {{ email }}</p>
+            </div>
+            {{#if frontendLoginPageUrl}}
+            <div class="button-container">
+                <a class="button" href="{{ frontendLoginPageUrl }}" target="_blank" rel="noopener">Go to Login</a>
+            </div>
+            {{/if}}
+            <div class="credentials">
+                <p style="margin:0 0 8px 0;"><strong>How to sign in</strong></p>
+                <p class="intro" style="margin:0 0 8px 0;">
+                    Please check with your system administrator for the login method configured for your account.
+                </p>
+                <ul style="padding-left:20px; margin:0;">
+                    <li class="intro" style="margin-bottom:6px;">If password-based sign-in is enabled, your administrator will share or manage your password separately.</li>
+                    <li class="intro" style="margin-bottom:6px;">If OTP-based sign-in is enabled, you can log in with your email or mobile number and retrieve a one-time code.</li>
+                    <li class="intro" style="margin-bottom:0;">If Google OAuth is enabled, sign in with your Google Workspace credentials.</li>
+                </ul>
+            </div>
+            <p class="intro">
+                If you didn’t request this account, you can safely ignore this email or contact support.
+            </p>
+            <p class="intro">
+                Cheers,<br />
+                The {{ solidAppName }} Team
+            </p>
+        </div>
+        <div class="footer">
+            © 2025 <a href="{{ solidAppWebsiteUrl }}" target="_blank">{{ solidAppName }}</a>. All rights reserved.
+        </div>
+    </div>
+</body>
+</html>

package/src/seeders/seed-data/sms-templates/text-on-signup.handlebars.txt ADDED Viewed

@@ -0,0 +1,10 @@
+Welcome to {{ solidAppName }}!
+Your account ({{ userName }} / {{ email }}) is ready.
+To sign in, use the login page {{ frontendLoginPageUrl }} (if provided).
+Check with your administrator for your login method:
+- Password sign-in: admin will share/manage your password.
+- OTP sign-in: use your email or mobile to receive a code.
+- Google OAuth: sign in with your Google Workspace account.
+If you didn’t request this, ignore this message.

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

@@ -2564,7 +2564,6 @@
         "tableName": "ss_scheduled_jobs",
         "userKeyFieldUserKey": "scheduleName",
         "isChild": false,
-        "enableAuditTracking": true,
         "enableSoftDelete": false,
         "draftPublishWorkflow": false,
         "internationalisation": false,
@@ -2586,8 +2585,7 @@
             "encryptionType": null,
             "decryptWhen": null,
             "columnName": null,
-            "isUserKey": true,
-            "enableAuditTracking": false
+            "isUserKey": true
           },
           {
             "name": "isActive",
@@ -2601,8 +2599,7 @@
             "encrypt": false,
             "encryptionType": null,
             "decryptWhen": null,
-            "columnName": null,
-            "enableAuditTracking": false
+            "columnName": null
           },
           {
             "name": "frequency",
@@ -2627,7 +2624,6 @@
             "encryptionType": null,
             "decryptWhen": null,
             "columnName": null,
-            "enableAuditTracking": false,
             "isMultiSelect": false
           },
           {
@@ -2644,8 +2640,7 @@
             "encrypt": false,
             "encryptionType": null,
             "decryptWhen": null,
-            "columnName": null,
-            "enableAuditTracking": false
+            "columnName": null
           },
           {
             "name": "endTime",
@@ -2661,8 +2656,7 @@
             "encrypt": false,
             "encryptionType": null,
             "decryptWhen": null,
-            "columnName": null,
-            "enableAuditTracking": false
+            "columnName": null
           },
           {
             "name": "startDate",
@@ -2678,8 +2672,7 @@
             "encrypt": false,
             "encryptionType": null,
             "decryptWhen": null,
-            "columnName": null,
-            "enableAuditTracking": false
+            "columnName": null
           },
           {
             "name": "endDate",
@@ -2695,8 +2688,7 @@
             "encrypt": false,
             "encryptionType": null,
             "decryptWhen": null,
-            "columnName": null,
-            "enableAuditTracking": false
+            "columnName": null
           },
           {
             "name": "dayOfMonth",
@@ -2714,8 +2706,7 @@
             "encrypt": false,
             "encryptionType": null,
             "decryptWhen": null,
-            "columnName": null,
-            "enableAuditTracking": false
+            "columnName": null
           },
           {
             "name": "lastRunAt",
@@ -2730,8 +2721,7 @@
             "encrypt": false,
             "encryptionType": null,
             "decryptWhen": null,
-            "columnName": null,
-            "enableAuditTracking": false
+            "columnName": null
           },
           {
             "name": "nextRunAt",
@@ -2746,8 +2736,7 @@
             "encrypt": false,
             "encryptionType": null,
             "decryptWhen": null,
-            "columnName": null,
-            "enableAuditTracking": false
+            "columnName": null
           },
           {
             "name": "dayOfWeek",
@@ -2774,7 +2763,6 @@
             "encryptionType": null,
             "decryptWhen": null,
             "columnName": null,
-            "enableAuditTracking": false,
             "isMultiSelect": true
           },
           {
@@ -2795,7 +2783,6 @@
             "decryptWhen": null,
             "columnName": null,
             "isUserKey": false,
-            "enableAuditTracking": false,
             "selectionValueType": "string",
             "selectionDynamicProvider": "ListOfScheduledJobsSelectionProvider",
             "selectionDynamicProviderCtxt": "{}"
@@ -5269,9 +5256,9 @@
   ],
   "users": [
     {
-      "username": "admin@example.service.com",
-      "email": "admin@example.service.com",
-      "password": "Admin@3214$",
+      "username": "sa",
+      "email": "sa@solidxai.com",
+      "password": "",
       "forcePasswordChange": true,
       "fullName": "Default Admin",
       "roles": [
@@ -8993,6 +8980,13 @@
               "widget": "SolidUserNameAvatarWidget"
             }
           },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "fullName",
+              "isSearchable": true
+            }
+          },
           {
             "type": "field",
             "attrs": {
@@ -11026,6 +11020,22 @@
               "sortable": true,
               "filterable": true
             }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "event",
+              "sortable": true,
+              "filterable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "ipAddress",
+              "sortable": true,
+              "filterable": true
+            }
           }
         ]
       }
@@ -11070,6 +11080,24 @@
                         "attrs": {
                           "name": "user"
                         }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "event"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "ipAddress"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "userAgent"
+                        }
                       }
                     ]
                   },
@@ -12457,6 +12485,15 @@
       "description": "This template notifies users that their account password was successfully changed.",
       "active": true,
       "type": "text"
+    },
+    {
+      "name": "email-on-signup",
+      "displayName": "Default: Email On Signup",
+      "body": "email-on-signup.handlebars.html",
+      "subject": "Welcome to {{solidAppName}}",
+      "description": "Welcome email sent to users after signup.",
+      "active": true,
+      "type": "text"
     }
   ],
   "smsTemplates": [
@@ -12486,6 +12523,15 @@
       "smsProviderTemplateId": "666bd246d6fc051047560595",
       "active": true,
       "type": "text"
+    },
+    {
+      "name": "text-on-signup",
+      "displayName": "Default: Text On Signup",
+      "body": "text-on-signup.handlebars.txt",
+      "description": "Welcome SMS sent to users after signup.",
+      "smsProviderTemplateId": "666bd246d6fc051047560595",
+      "active": true,
+      "type": "text"
     }
   ],
   "mediaStorageProviders": [
@@ -12526,4 +12572,4 @@
     }
   ],
   "modelSequences": []
-}
+}

package/src/seeders/user-seeder.service.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { AuthenticationService } from '../services/authentication.service';
 import { UserService } from '../services/user.service';
+import { v4 as uuidv4 } from 'uuid';
 @Injectable()
 export class UserSeederService {
@@ -13,13 +14,13 @@ export class UserSeederService {
     async seed() {
         // see if the user already exists,
-        let user = await this.userService.findOneByUsername("admin@example.service.com");
+        let user = await this.userService.findOneByUsername("sa");
         if (!user) {
             user = await this.authenticationService.signUp({
-                username: 'admin@example.service.com',
-                email: 'admin@example.service.com',
-                password: 'Admin@3214$',
+                username: 'sa',
+                email: 'sa@solidxai.com',
+                password: uuidv4(),
             });
             this.logger.log(`Newly created user is ${user}`);

package/src/services/1.js ADDED Viewed

@@ -0,0 +1,6 @@
+1. Do i need to create a storeStreams method for aws service too?
+    - Handle later
+2. queues handling -> if queues is enabled by default, i.e triggerExport(exportTransactionEntity.id).
+    - startExport should either return the data or return the transaction id
+3. How to handle scenarios wherein, nested related exist.(do i need to only get the userkey)
+    - show the userKey

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

@@ -49,6 +49,7 @@ import { RoleMetadataService } from './role-metadata.service';
 import { SettingService } from './setting.service';
 import { UserActivityHistoryService } from './user-activity-history.service';
 import { UserService } from './user.service';
+import { SmsFactory } from 'src/factories/sms.factory';
 enum LoginProvider {
     LOCAL = 'local',
@@ -79,7 +80,8 @@ export class AuthenticationService {
         private readonly httpService: HttpService,
         // private readonly mailService: SMTPEMailService,
         private readonly mailServiceFactory: MailFactory,
-        private readonly smsService: Msg91OTPService,
+        // private readonly smsService: Msg91OTPService,
+        private readonly smsFactory: SmsFactory,
         private readonly eventEmitter: EventEmitter2,
         private readonly settingService: SettingService,
         private readonly roleMetadataService: RoleMetadataService,
@@ -174,7 +176,7 @@ export class AuthenticationService {
             const savedUser = await this.userRepository.save(user);
             // Also assign a default role to the newly created user.
             const userRoles = signUpDto.roles ?? [];
-            if (this.iamConfiguration.defaultRole) {
+            if (signUpDto.username !== 'sa' && this.iamConfiguration.defaultRole) {
                 userRoles.push(this.iamConfiguration.defaultRole);
             }
             await this.handlePostSignup(savedUser, userRoles, pwd, autoGeneratedPwd);
@@ -197,7 +199,7 @@ export class AuthenticationService {
             // Merge the extended signUpDto attributes into the user entity
             //@ts-ignore
             const extensionUser = extensionUserRepo.merge(extensionUserRepo.create() as T, extensionUserDto);
-            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto, true, onForcePasswordChange);
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto, extensionUserDto.active ?? true, onForcePasswordChange);
             const savedUser = await extensionUserRepo.save(user);
             await this.handlePostSignup(savedUser, signUpDto.roles, pwd, autoGeneratedPwd);
@@ -278,6 +280,9 @@ export class AuthenticationService {
         if (user.forcePasswordChange && autoGeneratedPwd) {
             this.notifyUserOnForcePasswordChange(user, autoGeneratedPwd);
         }
+        // Send welcome notifications (email/SMS) if enabled.
+        await this.notifyUserOnSignup(user);
     }
@@ -323,6 +328,56 @@ export class AuthenticationService {
     }
+    private isWelcomeEmailEnabled(): boolean {
+        return this.iamConfiguration.sendWelcomeEmailOnSignup;
+    }
+    private isWelcomeSmsEnabled(): boolean {
+        return this.iamConfiguration.sendWelcomeSmsOnSignup;
+    }
+    private async notifyUserOnSignup(user: User) {
+        const companyLogo = await this.getCompanyLogo();
+        // Email welcome
+        if (this.isWelcomeEmailEnabled()) {
+            const mailService = this.mailServiceFactory.getMailService();
+            mailService.sendEmailUsingTemplate(
+                user.email,
+                'email-on-signup',
+                {
+                    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,
+                    companyLogoUrl: companyLogo
+                },
+                this.commonConfiguration.shouldQueueEmails,
+                null,
+                null,
+                'user',
+                user.id
+            );
+        }
+        // SMS welcome
+        if (this.isWelcomeSmsEnabled() && user.mobile) {
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(
+                user.mobile,
+                'text-on-signup',
+                {
+                    solidAppName: process.env.SOLID_APP_NAME,
+                    frontendLoginPageUrl: process.env.IAM_FRONTEND_APP_LOGIN_PAGE_URL,
+                    firstName: user.username,
+                    fullName: user.fullName ? user.fullName : user.username
+                },
+                this.commonConfiguration.shouldQueueSms,
+            );
+        }
+    }
     async otpInitiateRegistration(signUpDto: OTPSignUpDto) {
         try {
             if (!this.isPasswordlessRegistrationEnabled()) {
@@ -444,7 +499,8 @@ export class AuthenticationService {
             );
         }
         if (registrationValidationSources.includes(RegistrationValidationSource.MOBILE)) {
-            this.smsService.sendSMSUsingTemplate(
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(
                 user.mobile,
                 'otp-on-register',
                 {
@@ -454,7 +510,8 @@ export class AuthenticationService {
                     firstName: user.username,
                     fullName: user.fullName ? user.fullName : user.username,
                     companyLogoUrl: companyLogo
-                }
+                },
+                this.commonConfiguration.shouldQueueSms,
             );
         }
     }
@@ -649,7 +706,8 @@ export class AuthenticationService {
             );
         }
         if (loginType === RegistrationValidationSource.MOBILE) {
-            this.smsService.sendSMSUsingTemplate(
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(
                 user.mobile,
                 'otp-on-login',
                 {
@@ -659,7 +717,8 @@ export class AuthenticationService {
                     firstName: user.username,
                     fullName: user.fullName ? user.fullName : user.username,
                     companyLogoUrl: companyLogo
-                }
+                },
+                this.commonConfiguration.shouldQueueSms,
             );
         }
     }
@@ -783,14 +842,16 @@ export class AuthenticationService {
         }
         // Update Password
-        const newPwd = await this.hashingService.hash(changePasswordDto.newPassword);
+        const pwdData = await this.userService.hashPassword(
+            changePasswordDto.newPassword,
+        );
         user.password = changePasswordDto.newPassword;
-        user.passwordScheme = this.hashingService.name(); // e.g. bcrypt
-        user.passwordSchemeVersion = this.hashingService.currentVersion(); // e.g. 1, 2, 3 ...
+        user.password = pwdData.password;
+        user.passwordScheme = pwdData.passwordScheme;
+        user.passwordSchemeVersion = pwdData.passwordSchemeVersion;
         // Everytime the user changes the password we reset the forcePasswordChange flag back to false.
         user.forcePasswordChange = false;
-        user.password = newPwd;
         await this.userRepository.save(user);
@@ -888,7 +949,8 @@ export class AuthenticationService {
         }
         // Assuming all users do not have mobile as mandatory.
         if (forgotPasswordSendVerificationTokenOn == ForgotPasswordSendVerificationTokenOn.MOBILE && user.mobile) {
-            this.smsService.sendSMSUsingTemplate(
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(
                 user.mobile,
                 'forgot-password',
                 {
@@ -897,7 +959,8 @@ export class AuthenticationService {
                     verificationTokenOnForgotPassword: user.verificationTokenOnForgotPassword,
                     firstName: user.username,
                     companyLogoUrl: companyLogo
-                }
+                },
+                this.commonConfiguration.shouldQueueSms,
             );
         }
     }
@@ -977,7 +1040,8 @@ export class AuthenticationService {
         }
         // Assuming all users do not have mobile as mandatory.
         if (forgotPasswordSendVerificationTokenOn == ForgotPasswordSendVerificationTokenOn.MOBILE && user.mobile) {
-            this.smsService.sendSMSUsingTemplate(
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(
                 user.mobile,
                 'forgot-password',
                 {
@@ -986,7 +1050,8 @@ export class AuthenticationService {
                     verificationTokenOnForgotPassword: user.verificationTokenOnForgotPassword,
                     firstName: user.username,
                     companyLogoUrl: companyLogo
-                }
+                },
+                this.commonConfiguration.shouldQueueSms,
             );
         }
     }

package/src/services/computed-fields/entity/alpha-num-external-id-computed-field-provider.ts CHANGED Viewed

@@ -28,8 +28,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return 'Provider used to compute external ID for a CommonEntity with support for static or dynamic prefix.';
   }
-  async preComputeValue(triggerEntity: T, computedFieldMetadata: ComputedFieldMetadata<AlphaNumExternalIdContext>
-  ) {
+  async preComputeValue(triggerEntity: T, computedFieldMetadata: ComputedFieldMetadata<AlphaNumExternalIdContext>) {
     const { prefix, length, dynamicFieldPrefix } = computedFieldMetadata.computedFieldValueProviderCtxt;
     const eventContext = computedFieldMetadata.eventContext;
     const entityName = eventContext?.metadataName ?? eventContext.databaseEntity?.constructor?.name ?? '';