@solidstarters/solid-core 1.2.53 → 1.2.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.53",
+  "version": "1.2.54",
   "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/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";