@solidstarters/solid-core 1.2.53 → 1.2.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.53",
+  "version": "1.2.56",
   "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/controllers/field-metadata.controller.ts

@@ -64,7 +64,7 @@ export class FieldMetadataController {
     @ApiBearerAuth("jwt")
     @Delete(':id')
     async delete(@Param('id') id: number) {
-        return this.fieldMetadataService.remove(id);
+        return this.fieldMetadataService.delete(id);
     }
 
 

package/src/controllers/media-storage-provider-metadata.controller.ts

@@ -57,8 +57,8 @@ export class MediaStorageProviderMetadataController {
 
     @ApiBearerAuth("jwt")
     @Delete(':id')
-    remove(@Param('id') id: number) {
-        return this.mediaStorageProviderService.remove(id);
+    delete(@Param('id') id: number) {
+        return this.mediaStorageProviderService.delete(id);
     }
 
 }

package/src/controllers/module-metadata.controller.ts

@@ -82,7 +82,7 @@ export class ModuleMetadataController {
 
   @ApiBearerAuth("jwt")
   @Delete(':id')
-  remove(@Param('id') id: number) {
+  delete(@Param('id') id: number) {
     return this.moduleMetadataService.remove(id);
   }
 }

package/src/helpers/schematic.service.ts

@@ -15,6 +15,7 @@ type FieldOptions = {
   fields: any[]; //FIXME This type can be improved
   modelEnableSoftDelete?: boolean;
   parentModel?: string;
+  parentModule?: string;
 };
 export const REMOVE_FIELDS_COMMAND = 'remove-fields';
 export const REFRESH_MODEL_COMMAND = 'refresh-model';
@@ -31,7 +32,7 @@ enum SYSTEM_FIELDS_TO_IGNORE_FOR_CODE_GENERATION {
 export class SchematicService {
   private readonly logger = new Logger(SchematicService.name);
   private readonly SCHEMATIC_PROJECT = '@solidstarters/solid-code-builder';
-  constructor(private readonly commandService: CommandService) {}
+  constructor(private readonly commandService: CommandService) { }
 
   async executeSchematicCommand(
     command: string,
@@ -62,7 +63,7 @@ export class SchematicService {
       if (fieldOptions.table) {
         modelCommand += ` --table=${fieldOptions.table}`;
       }
-      
+
       if (fieldOptions.dataSource) {
         modelCommand += ` --data-source=${fieldOptions.dataSource}`;
       }
@@ -70,26 +71,29 @@ export class SchematicService {
       if (fieldOptions.modelEnableSoftDelete) {
         modelCommand += ` --model-enable-soft-delete=${fieldOptions.modelEnableSoftDelete}`;
       }
-      
+
       if (fieldOptions.parentModel) {
         modelCommand += ` --parent-model=${fieldOptions.parentModel}`;
       }
-      
+      if (fieldOptions.parentModule) {
+        modelCommand += ` --parent-module=${fieldOptions.parentModule}`;
+      }
+
       let fieldCommand = fieldOptions.fields
         .filter((field) => {
           return !Object.values(SYSTEM_FIELDS_TO_IGNORE_FOR_CODE_GENERATION).includes(field.name);
-        }) 
+        })
         .map((field) => {
           return `--fields='${JSON.stringify(field)}'`;
         })
         .join(' ');
-      const schematicCommand =  modelCommand + ' ' + fieldCommand;
+      const schematicCommand = modelCommand + ' ' + fieldCommand;
       // console.log('schematicCommand', schematicCommand);
       return schematicCommand;
     } else if (command === ADD_MODULE_COMMAND) {
       const moduleOptions = options as GenerateModuleOptions;
       // console.log('moduleOptions', moduleOptions);
-      const schematicCommand =  ` ${baseCommand} --module=${moduleOptions.module}`;
+      const schematicCommand = ` ${baseCommand} --module=${moduleOptions.module}`;
       // console.log('schematicCommand', schematicCommand);
       this.logger.debug('schematicCommand', schematicCommand);
       return schematicCommand;
@@ -97,5 +101,5 @@ export class SchematicService {
       throw new Error('Schematic command not supported.');
     }
   }
-  
+
 }

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

@@ -5355,7 +5355,7 @@
                               {
                                 "type": "field",
                                 "attrs": {
-                                  "name": "view"
+                                  "name": "viewMetadata"
                                 }
                               }
                             ]
@@ -5813,7 +5813,7 @@
                     "type": "field",
                     "attrs": {
                       "name": "roles",
-                      "renderMode": "checkbox",
+                      "widget": "checkbox",
                       "inlineCreateAutoSave": "true",
                       "renderModeCheckboxPreprocessor": "MenuItemMetadataRolesFormFieldPreprocessor",
                       "inlineCreate": "true",
@@ -5899,7 +5899,7 @@
             "type": "field",
             "attrs": {
               "name": "relativeUri",
-              "renderMode": "image",
+              "widget": "image",
               "isSearchable": true
             }
           },
@@ -5986,7 +5986,7 @@
                         "attrs": {
                           "name": "relativeUri",
                           "label": "relativeUri",
-                          "renderMode": "image"
+                          "widget": "image"
                         }
                       },
                       {
@@ -7029,7 +7029,7 @@
             "attrs": {
               "name": "permissions",
               "isSearchable": true,
-              "renderMode": "checkbox",
+              "widget": "checkbox",
               "inlineCreate": "true"
             }
           },
@@ -7122,7 +7122,7 @@
                             "type": "field",
                             "attrs": {
                               "name": "permissions",
-                              "renderMode": "inputSwitch",
+                              "widget": "inputSwitch",
                               "showLabel": false
                             }
                           }

package/src/services/authentication.service.ts

@@ -39,6 +39,7 @@ import {
     RegistrationValidationSource,
     TransactionalRegistrationValidationSource
 } from "../constants";
+import { CreateUserDto } from 'src/dtos/create-user.dto';
 
 enum LoginProvider {
     LOCAL = 'local',
@@ -112,55 +113,15 @@ export class AuthenticationService {
         }
 
         try {
-            const user = new User();
-            user.username = signUpDto.username;
-            user.email = signUpDto.email;
-            user.fullName = signUpDto.fullName;
-            if (signUpDto.mobile) {
-                user.mobile = signUpDto.mobile;
-            }
-            // 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 = '';
-            if (signUpDto.password) {
-                pwd = await this.hashingService.hash(signUpDto.password);
-            }
-            else {
-                // TODO: If password is not specified then auto-generate a random password, trigger this password over an email to the user.
-                // TODO: Also track if the user has to force reset / change their password, and then activate the user. 
-                autoGeneratedPwd = this.generatePassword();
-                pwd = await this.hashingService.hash(autoGeneratedPwd);
-                user.forcePasswordChange = true;
-            }
-            user.password = pwd;
-            user.active = this.iamConfiguration.activateUserOnRegistration;
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new User(), signUpDto, this.iamConfiguration.activateUserOnRegistration);
             const savedUser = await this.userRepository.save(user);
 
             // Also assign a default role to the newly created user. 
-            let roles = [];
+            const userRoles = signUpDto.roles ?? [];
             if (this.iamConfiguration.defaultRole) {
-                roles.push(this.iamConfiguration.defaultRole);
-            }
-            // Default Internal user role assigned 
-            roles.push("Internal User");
-            if (signUpDto.roles) {
-                roles = [...roles, ...signUpDto.roles];
-            }
-            roles = Array.from(new Set([...roles]));
-            if (roles.length > 0) {
-                this.userService.addRolesToUser(user.username, roles);
-            }
-            // Tanay: Adding user password to history table
-            const userPasswordHistory = new UserPasswordHistory();
-            userPasswordHistory.passwordHash = pwd;
-            userPasswordHistory.user = savedUser;
-            await this.userPasswordHistoryRepository.save(userPasswordHistory);
-
-            // if forcePasswordChange is true, then we trigger an email to the user to change the password, this needs to be done using a queue. 
-            // Create a new method like notifyUserOnForcePasswordChange, create a new email template we can call it on-force-password-change this template to include the random password
-            if (user.forcePasswordChange && autoGeneratedPwd) {
-                this.notifyUserOnForcePasswordChange(user, autoGeneratedPwd);
+                userRoles.push(this.iamConfiguration.defaultRole);
             }
+            await this.handlePostSignup(savedUser, userRoles, pwd, autoGeneratedPwd);
 
             // TODO: make provision to trigger a welcome email also.
 
@@ -174,6 +135,79 @@ export class AuthenticationService {
         }
     }
 
+    async signupForExtensionUser<T extends User, U extends CreateUserDto>(signUpDto: SignUpDto, extensionUserDto: U, extensionUserRepo: Repository<T>): Promise<T> {
+        try {
+            // 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);
+            const savedUser = await extensionUserRepo.save(user);
+
+            await this.handlePostSignup(savedUser, signUpDto.roles,  pwd, autoGeneratedPwd);
+
+            return savedUser;
+        }
+        catch (err) {
+            const pgUniqueViolationErrorCode = '23505';
+            if (err.code === pgUniqueViolationErrorCode) {
+                throw new ConflictException();
+            }
+            throw err;
+        }
+    }
+
+  
+    private async populateForSignup<T extends User>(user: T, signUpDto: SignUpDto, isUserActive: boolean = true) {
+        // const user = new User();
+        user.username = signUpDto.username;
+        user.email = signUpDto.email;
+        user.fullName = signUpDto.fullName;
+        if (signUpDto.mobile) {
+            user.mobile = signUpDto.mobile;
+        }
+        // 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 = '';
+        if (signUpDto.password) {
+            pwd = await this.hashingService.hash(signUpDto.password);
+        }
+        else {
+            // TODO: If password is not specified then auto-generate a random password, trigger this password over an email to the user.
+            // TODO: Also track if the user has to force reset / change their password, and then activate the user. 
+            autoGeneratedPwd = this.generatePassword();
+            pwd = await this.hashingService.hash(autoGeneratedPwd);
+            user.forcePasswordChange = true;
+        }
+        user.password = pwd;
+        // user.active = this.iamConfiguration.activateUserOnRegistration;
+        user.active = isUserActive;
+        return { user, pwd, autoGeneratedPwd };
+    }
+
+    private async handlePostSignup(user: User, roles: string[]=[], pwd: string, autoGeneratedPwd: string) {
+        let userRoles = [];
+        // Default Internal user role assigned 
+        userRoles.push("Internal User");
+        if (roles) {
+            userRoles = [...userRoles, ...roles];
+        }
+        userRoles = Array.from(new Set([...userRoles]));
+        if (userRoles.length > 0) {
+            this.userService.addRolesToUser(user.username, userRoles);
+        }
+        // Tanay: Adding user password to history table
+        const userPasswordHistory = new UserPasswordHistory();
+        userPasswordHistory.passwordHash = pwd;
+        userPasswordHistory.user = user;
+        await this.userPasswordHistoryRepository.save(userPasswordHistory);
+
+        // if forcePasswordChange is true, then we trigger an email to the user to change the password, this needs to be done using a queue. 
+        // Create a new method like notifyUserOnForcePasswordChange, create a new email template we can call it on-force-password-change this template to include the random password
+        if (user.forcePasswordChange && autoGeneratedPwd) {
+            this.notifyUserOnForcePasswordChange(user, autoGeneratedPwd);
+        }
+    }
+
     generatePassword(length: number = 8): string {
         const upperCase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
         const lowerCase = "abcdefghijklmnopqrstuvwxyz";
@@ -975,7 +1009,14 @@ export class AuthenticationService {
         const tokens = await this.generateTokens(user);
 
         const response = {
-            ...user,
+            user: {
+                email: user.email,
+                mobile: user.mobile,
+                username: user.username,
+                // forcePasswordChange: user.forcePasswordChange,
+                id: user.id,
+                roles: user.roles.map((role, idx, roles) => role.name)
+            },
             ...tokens
         }
         return response;

package/src/services/field-metadata.service.ts

@@ -308,7 +308,7 @@ export class FieldMetadataService {
     //     return this.moduleMetadataRepo.save(country);
     // }
 
-    async remove(id: number) {
+    async delete(id: number) {
         const entity = await this.findOne(id);
         return this.fieldMetadataRepo.remove(entity);
     }
@@ -855,9 +855,7 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName",
-                    "isUserKey"
-
+                    "columnName"
                 ];
 
             case SolidFieldType.selectionDynamic:

package/src/services/media-storage-provider-metadata.service.ts

@@ -145,7 +145,7 @@ export class MediaStorageProviderMetadataService {
         return removedEntities
     }
 
-    async remove(id: number) {
+    async delete(id: number) {
         const lov = await this.findOne(id);
         return this.mediaStorageProviderRepo.remove(lov);
     }

package/src/services/model-metadata.service.ts

@@ -622,8 +622,8 @@ export class ModelMetadataService {
         dataSourceType: model.dataSourceType,
         tableName: model.tableName,
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
-        isChild: model.isChild,
-        parentModelUserKey: model.parentModel.singularName,
+        isChild: model?.isChild,
+        parentModelUserKey: model?.parentModel?.singularName,
         fields: []
       }
 
@@ -897,7 +897,7 @@ export class ModelMetadataService {
     // Remove the fields from the database as well. This also checks, if the field is marked for removal
     fieldsForRemoval.forEach((field: FieldMetadata) => {
       if (field.isMarkedForRemoval) {
-        this.fieldMetadataService.remove(field.id);
+        this.fieldMetadataService.delete(field.id);
       }
     });
     return removeOutput;
@@ -909,7 +909,7 @@ export class ModelMetadataService {
     }
 
     const query = {
-      populate: ["module", "fields", "parentModel"]
+      populate: ["module", "fields", "parentModel", "parentModel.module"]
     };
     const model = options.modelId ? await this.findOne(options.modelId, query) : await this.findOneByUserKey(options.modelUserKey, query.populate);
 
@@ -932,7 +932,9 @@ export class ModelMetadataService {
         table: model.tableName,
         fields: fieldsForRefresh,
         modelEnableSoftDelete: model.enableSoftDelete,
-        parentModel: model.parentModel?.singularName
+        parentModel: model.parentModel?.singularName,
+        parentModule: model.parentModel?.module?.name,
+
       },
       dryRun
     );