@solidstarters/solid-core 1.2.201 → 1.2.203

package/dist/services/authentication.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authentication.service.d.ts","sourceRoot":"","sources":["../../src/services/authentication.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authentication.service.d.ts","sourceRoot":"","sources":["../../src/services/authentication.service.ts"],"names":[],"mappings":"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"}

package/dist/services/authentication.service.js

@@ -30,7 +30,6 @@ const error_messages_1 = require("../constants/error-messages");
 const success_messages_1 = require("../constants/success-messages");
 const mail_factory_1 = require("../factories/mail.factory");
 const user_repository_1 = require("../repository/user.repository");
-const Msg91OTPService_1 = require("./sms/Msg91OTPService");
 const typeorm_2 = require("typeorm");
 const uuid_1 = require("uuid");
 const iam_config_1 = require("../config/iam.config");
@@ -43,6 +42,7 @@ const role_metadata_service_1 = require("./role-metadata.service");
 const setting_service_1 = require("./setting.service");
 const user_activity_history_service_1 = require("./user-activity-history.service");
 const user_service_1 = require("./user.service");
+const sms_factory_1 = require("../factories/sms.factory");
 var LoginProvider;
 (function (LoginProvider) {
     LoginProvider["LOCAL"] = "local";
@@ -50,7 +50,7 @@ var LoginProvider;
     LoginProvider["OTP"] = "otp";
 })(LoginProvider || (LoginProvider = {}));
 let AuthenticationService = AuthenticationService_1 = class AuthenticationService {
-    constructor(userService, userRepository, hashingService, jwtService, jwtConfiguration, iamConfiguration, refreshTokenIdsStorage, httpService, mailServiceFactory, smsService, eventEmitter, settingService, roleMetadataService, commonConfiguration, userActivityHistoryService, dataSource) {
+    constructor(userService, userRepository, hashingService, jwtService, jwtConfiguration, iamConfiguration, refreshTokenIdsStorage, httpService, mailServiceFactory, smsFactory, eventEmitter, settingService, roleMetadataService, commonConfiguration, userActivityHistoryService, dataSource) {
         this.userService = userService;
         this.userRepository = userRepository;
         this.hashingService = hashingService;
@@ -60,7 +60,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         this.refreshTokenIdsStorage = refreshTokenIdsStorage;
         this.httpService = httpService;
         this.mailServiceFactory = mailServiceFactory;
-        this.smsService = smsService;
+        this.smsFactory = smsFactory;
         this.eventEmitter = eventEmitter;
         this.settingService = settingService;
         this.roleMetadataService = roleMetadataService;
@@ -132,7 +132,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new user_entity_1.User(), signUpDto, this.iamConfiguration.activateUserOnRegistration, onForcePasswordChange);
             const savedUser = await this.userRepository.save(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);
@@ -150,7 +150,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         try {
             const onForcePasswordChange = await this.getConfig('forceChangePasswordOnFirstLogin');
             const extensionUser = extensionUserRepo.merge(extensionUserRepo.create(), extensionUserDto);
-            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(extensionUser, signUpDto, true, onForcePasswordChange);
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(extensionUser, signUpDto, extensionUserDto.active ?? true, onForcePasswordChange);
             const savedUser = await extensionUserRepo.save(user);
             await this.handlePostSignup(savedUser, signUpDto.roles, pwd, autoGeneratedPwd);
             return savedUser;
@@ -208,6 +208,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         if (user.forcePasswordChange && autoGeneratedPwd) {
             this.notifyUserOnForcePasswordChange(user, autoGeneratedPwd);
         }
+        await this.notifyUserOnSignup(user);
     }
     generatePassword(length = 8) {
         const upperCase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -236,6 +237,36 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             companyLogoUrl: companyLogo
         }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
     }
+    isWelcomeEmailEnabled() {
+        return this.iamConfiguration.sendWelcomeEmailOnSignup;
+    }
+    isWelcomeSmsEnabled() {
+        return this.iamConfiguration.sendWelcomeSmsOnSignup;
+    }
+    async notifyUserOnSignup(user) {
+        const companyLogo = await this.getCompanyLogo();
+        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);
+        }
+        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) {
         try {
             if (!this.isPasswordlessRegistrationEnabled()) {
@@ -338,14 +369,15 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
         }
         if (registrationValidationSources.includes(constants_1.RegistrationValidationSource.MOBILE)) {
-            this.smsService.sendSMSUsingTemplate(user.mobile, 'otp-on-register', {
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(user.mobile, 'otp-on-register', {
                 solidAppName: process.env.SOLID_APP_NAME,
                 otp: user.mobileVerificationTokenOnRegistration,
                 mobileVerificationTokenOnRegistration: user.mobileVerificationTokenOnRegistration,
                 firstName: user.username,
                 fullName: user.fullName ? user.fullName : user.username,
                 companyLogoUrl: companyLogo
-            });
+            }, this.commonConfiguration.shouldQueueSms);
         }
     }
     async otpConfirmRegistration(confirmSignUpDto) {
@@ -502,14 +534,15 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
         }
         if (loginType === constants_1.RegistrationValidationSource.MOBILE) {
-            this.smsService.sendSMSUsingTemplate(user.mobile, 'otp-on-login', {
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(user.mobile, 'otp-on-login', {
                 solidAppName: process.env.SOLID_APP_NAME,
                 otp: user.mobileVerificationTokenOnLogin,
                 mobileVerificationTokenOnLogin: user.mobileVerificationTokenOnLogin,
                 firstName: user.username,
                 fullName: user.fullName ? user.fullName : user.username,
                 companyLogoUrl: companyLogo
-            });
+            }, this.commonConfiguration.shouldQueueSms);
         }
     }
     async otpConfirmLogin(confirmSignInDto) {
@@ -603,12 +636,12 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         if (!isEqual) {
             throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.INCORRECT_CURRENT_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();
-        user.passwordSchemeVersion = this.hashingService.currentVersion();
+        user.password = pwdData.password;
+        user.passwordScheme = pwdData.passwordScheme;
+        user.passwordSchemeVersion = pwdData.passwordSchemeVersion;
         user.forcePasswordChange = false;
-        user.password = newPwd;
         await this.userRepository.save(user);
         return true;
     }
@@ -668,13 +701,14 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
         }
         if (forgotPasswordSendVerificationTokenOn == constants_1.ForgotPasswordSendVerificationTokenOn.MOBILE && user.mobile) {
-            this.smsService.sendSMSUsingTemplate(user.mobile, 'forgot-password', {
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(user.mobile, 'forgot-password', {
                 solidAppName: process.env.SOLID_APP_NAME,
                 otp: user.verificationTokenOnForgotPassword,
                 verificationTokenOnForgotPassword: user.verificationTokenOnForgotPassword,
                 firstName: user.username,
                 companyLogoUrl: companyLogo
-            });
+            }, this.commonConfiguration.shouldQueueSms);
         }
     }
     async confirmForgotPassword(confirmForgotPasswordDto) {
@@ -731,13 +765,14 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
         }
         if (forgotPasswordSendVerificationTokenOn == constants_1.ForgotPasswordSendVerificationTokenOn.MOBILE && user.mobile) {
-            this.smsService.sendSMSUsingTemplate(user.mobile, 'forgot-password', {
+            const smsService = this.smsFactory.getSmsService();
+            smsService.sendSMSUsingTemplate(user.mobile, 'forgot-password', {
                 solidAppName: process.env.SOLID_APP_NAME,
                 otp: user.verificationTokenOnForgotPassword,
                 verificationTokenOnForgotPassword: user.verificationTokenOnForgotPassword,
                 firstName: user.username,
                 companyLogoUrl: companyLogo
-            });
+            }, this.commonConfiguration.shouldQueueSms);
         }
     }
     async generateTokens(user) {
@@ -912,7 +947,7 @@ exports.AuthenticationService = AuthenticationService = AuthenticationService_1
         jwt_1.JwtService, void 0, void 0, refresh_token_ids_storage_service_1.RefreshTokenIdsStorageService,
         axios_1.HttpService,
         mail_factory_1.MailFactory,
-        Msg91OTPService_1.Msg91OTPService,
+        sms_factory_1.SmsFactory,
         event_emitter_1.EventEmitter2,
         setting_service_1.SettingService,
         role_metadata_service_1.RoleMetadataService, void 0, user_activity_history_service_1.UserActivityHistoryService,