@solidstarters/solid-core 1.2.116 → 1.2.117

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.116",
+  "version": "1.2.117",
   "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/config/iam.config.ts

@@ -12,7 +12,7 @@ export const iamConfig = registerAs('iam', () => {
         defaultRole: process.env.IAM_DEFAULT_ROLE ?? 'Public',
         dummyOtp: process.env.IAM_OTP_DUMMY,
         forgotPasswordSendVerificationTokenOn: process.env.IAM_FORGOT_PASSWORD_SEND_VERIFICATION_TOKEN_ON ?? 'email',
-
+        forceChangePasswordOnFirstLogin:true,
         googleOauth: {
             clientID: process.env.IAM_GOOGLE_OAUTH_CLIENT_ID,
             clientSecret: process.env.IAM_GOOGLE_OAUTH_CLIENT_SECRET,

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

@@ -8811,6 +8811,13 @@
                       "label": "Iam Allow Public Registration"
                     }
                   },
+                  {
+                    "type": "field",
+                    "attrs": {
+                      "name": "forceChangePasswordOnFirstLogin",
+                      "label": "Force Password Change On First Login"
+                    }
+                  },
                   {
                     "type": "field",
                     "attrs": {

package/src/services/authentication.service.ts

@@ -82,6 +82,10 @@ export class AuthenticationService {
 
     ) { }
 
+    private async getConfig( key: string): Promise<any> {
+        return this.settingService.getConfigValue(key);
+    }
+    
     private async getCompanyLogo(): Promise<string> {
         return await this.settingService.getConfigValue('companylogo');
     }
@@ -118,7 +122,7 @@ export class AuthenticationService {
 
         return user;
     }
-
+        
     async signUp(signUpDto: SignUpDto, activeUser: ActiveUserData = null): Promise<User> {
         // If public registrations are disabled and no activeUser is present when invoking signUp then we throw an exception.
         if (!(await this.settingService.getConfigValue('allowPublicRegistration')) && !activeUser) {
@@ -126,9 +130,9 @@ export class AuthenticationService {
         }
 
         try {
-            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new User(), signUpDto, this.iamConfiguration.activateUserOnRegistration);
+            const onForcePasswordChange = await this.getConfig('forceChangePasswordOnFirstLogin');
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new User(), signUpDto, this.iamConfiguration.activateUserOnRegistration,onForcePasswordChange);
             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) {
@@ -141,7 +145,7 @@ export class AuthenticationService {
             return savedUser;
         } catch (err) {
             const pgUniqueViolationErrorCode = '23505';
-            if (err.code === pgUniqueViolationErrorCode) {
+        if (err.code === pgUniqueViolationErrorCode) {
                 throw new ConflictException();
             }
             throw err;
@@ -150,10 +154,11 @@ export class AuthenticationService {
 
     async signupForExtensionUser<T extends User, U extends CreateUserDto>(signUpDto: SignUpDto, extensionUserDto: U, extensionUserRepo: Repository<T>): Promise<T> {
         try {
+            const onForcePasswordChange = await this.getConfig('forceChangePasswordOnFirstLogin');
             // 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);
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto,onForcePasswordChange);
             const savedUser = await extensionUserRepo.save(user);
 
             await this.handlePostSignup(savedUser, signUpDto.roles, pwd, autoGeneratedPwd);
@@ -170,7 +175,7 @@ export class AuthenticationService {
     }
 
 
-    private async populateForSignup<T extends User>(user: T, signUpDto: SignUpDto, isUserActive: boolean = true) {
+    private async populateForSignup<T extends User>(user: T, signUpDto: SignUpDto, isUserActive: boolean = true,onForcePasswordChange?:boolean) {
         // const user = new User();
 
         if (signUpDto.roles && signUpDto.roles.length > 0) {
@@ -182,10 +187,11 @@ export class AuthenticationService {
         user.username = signUpDto.username;
         user.email = signUpDto.email;
         user.fullName = signUpDto.fullName;
+        user.forcePasswordChange = onForcePasswordChange;
         if (signUpDto.mobile) {
             user.mobile = signUpDto.mobile;
         }
-
+        this.logger.debug("user",user);
         // If password has been specified by the user, then we simply create & activate the user based on the configuration parameter "activateUserOnRegistration".
         let pwd = '';
         let autoGeneratedPwd = '';

package/src/services/setting.service.ts

@@ -146,7 +146,8 @@ export class SettingService extends CRUDService<Setting> {
       shouldQueueEmails: this.commonConfiguration.shouldQueueEmails,
       shouldQueueSms: this.commonConfiguration.shouldQueueSms,
       enableDarkMode: true,
-      copyright : ""
+      copyright : "",
+      forceChangePasswordOnFirstLogin:true
     };
   }
 
@@ -154,7 +155,7 @@ export class SettingService extends CRUDService<Setting> {
     try {
       const settingsArray: Setting[] = await this.repo.find();
       const settingEntry = settingsArray.find(setting => setting.key === settingKey);
-
+      
       if (settingEntry && settingEntry.value !== null && settingEntry.value !== undefined) {
         const value = settingEntry.value;