@solidstarters/solid-core 1.2.204 → 1.2.207

package/dist/services/authentication.service.js

@@ -11,9 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var AuthenticationService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthenticationService = void 0;
@@ -24,15 +21,12 @@ const jwt_1 = require("@nestjs/jwt");
 const typeorm_1 = require("@nestjs/typeorm");
 const class_validator_1 = require("class-validator");
 const crypto_1 = require("crypto");
-const common_config_1 = __importDefault(require("../config/common.config"));
-const jwt_config_1 = require("../config/jwt.config");
 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 typeorm_2 = require("typeorm");
 const uuid_1 = require("uuid");
-const iam_config_1 = require("../config/iam.config");
 const constants_1 = require("../constants");
 const user_entity_1 = require("../entities/user.entity");
 const interfaces_1 = require("../interfaces");
@@ -50,13 +44,11 @@ var LoginProvider;
     LoginProvider["OTP"] = "otp";
 })(LoginProvider || (LoginProvider = {}));
 let AuthenticationService = AuthenticationService_1 = class AuthenticationService {
-    constructor(userService, userRepository, hashingService, jwtService, jwtConfiguration, iamConfiguration, refreshTokenIdsStorage, httpService, mailServiceFactory, smsFactory, eventEmitter, settingService, roleMetadataService, commonConfiguration, userActivityHistoryService, dataSource) {
+    constructor(userService, userRepository, hashingService, jwtService, refreshTokenIdsStorage, httpService, mailServiceFactory, smsFactory, eventEmitter, settingService, roleMetadataService, userActivityHistoryService, dataSource) {
         this.userService = userService;
         this.userRepository = userRepository;
         this.hashingService = hashingService;
         this.jwtService = jwtService;
-        this.jwtConfiguration = jwtConfiguration;
-        this.iamConfiguration = iamConfiguration;
         this.refreshTokenIdsStorage = refreshTokenIdsStorage;
         this.httpService = httpService;
         this.mailServiceFactory = mailServiceFactory;
@@ -64,16 +56,12 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         this.eventEmitter = eventEmitter;
         this.settingService = settingService;
         this.roleMetadataService = roleMetadataService;
-        this.commonConfiguration = commonConfiguration;
         this.userActivityHistoryService = userActivityHistoryService;
         this.dataSource = dataSource;
         this.logger = new common_1.Logger(AuthenticationService_1.name);
     }
-    async getConfig(key) {
-        return this.settingService.getConfigValue(key);
-    }
     async getCompanyLogo() {
-        return await this.settingService.getConfigValue('companylogo');
+        return this.settingService.getConfigValue('companylogo');
     }
     async resolveUser(username, email) {
         return await this.userRepository.findOne({
@@ -124,16 +112,15 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         return user;
     }
     async signUp(signUpDto, activeUser = null) {
-        if (!(await this.settingService.getConfigValue('allowPublicRegistration')) && !activeUser) {
-            throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.PUBLIC_REGISTRATION_DISABLED);
-        }
         try {
-            const onForcePasswordChange = await this.getConfig('forceChangePasswordOnFirstLogin');
-            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new user_entity_1.User(), signUpDto, this.iamConfiguration.activateUserOnRegistration, onForcePasswordChange);
+            const onForcePasswordChange = this.settingService.getConfigValue('forceChangePasswordOnFirstLogin');
+            const activateUserOnRegistration = this.settingService.getConfigValue('activateUserOnRegistration');
+            const defaultRole = this.settingService.getConfigValue('defaultRole');
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new user_entity_1.User(), signUpDto, activateUserOnRegistration, onForcePasswordChange);
             const savedUser = await this.userRepository.save(user);
             const userRoles = signUpDto.roles ?? [];
-            if (signUpDto.username !== 'sa' && this.iamConfiguration.defaultRole) {
-                userRoles.push(this.iamConfiguration.defaultRole);
+            if (signUpDto.username !== 'sa' && defaultRole) {
+                userRoles.push(defaultRole);
             }
             await this.handlePostSignup(savedUser, userRoles, pwd, autoGeneratedPwd);
             return savedUser;
@@ -148,7 +135,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     }
     async signupForExtensionUser(signUpDto, extensionUserDto, extensionUserRepo) {
         try {
-            const onForcePasswordChange = await this.getConfig('forceChangePasswordOnFirstLogin');
+            const onForcePasswordChange = this.settingService.getConfigValue('forceChangePasswordOnFirstLogin');
             const extensionUser = extensionUserRepo.merge(extensionUserRepo.create(), extensionUserDto);
             var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(extensionUser, signUpDto, extensionUserDto.active ?? true, onForcePasswordChange);
             const savedUser = await extensionUserRepo.save(user);
@@ -164,7 +151,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
     }
     async populateForSignup(user, signUpDto, isUserActive = true, onForcePasswordChange) {
-        let autoGeneratedPwdPermission = await this.settingService.getConfigValue('iamAutoGeneratedPassword');
+        let autoGeneratedPwdPermission = this.settingService.getConfigValue('iamAutoGeneratedPassword');
         if (signUpDto.roles && signUpDto.roles.length > 0) {
             for (let i = 0; i < signUpDto.roles.length; i++) {
                 const roleName = signUpDto.roles[i];
@@ -190,7 +177,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
                 user.forcePasswordChange = true;
             }
             else {
-                if (!this.isPasswordlessRegistrationEnabled()) {
+                if (!await this.isPasswordlessRegistrationEnabled()) {
                     this.logger.error('User being created without password, and password less login is also not enabled in the system. Is this intentional?');
                     throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.PASSWORDLESS_REGISTRATION_DISABLED);
                 }
@@ -206,7 +193,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     async handlePostSignup(user, roles = [], pwd, autoGeneratedPwd) {
         await this.userService.initializeRolesForNewUser(roles, user);
         if (user.forcePasswordChange && autoGeneratedPwd) {
-            this.notifyUserOnForcePasswordChange(user, autoGeneratedPwd);
+            await this.notifyUserOnForcePasswordChange(user, autoGeneratedPwd);
         }
         await this.notifyUserOnSignup(user);
     }
@@ -227,49 +214,53 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         const companyLogo = await this.getCompanyLogo();
         const mailService = this.mailServiceFactory.getMailService();
         mailService.sendEmailUsingTemplate(user.email, 'on-force-password-change', {
-            solidAppName: process.env.SOLID_APP_NAME,
-            solidAppWebsiteUrl: process.env.SOLID_APP_WEBSITE_URL,
-            frontendLoginPageUrl: process.env.IAM_FRONTEND_APP_LOGIN_PAGE_URL,
+            solidAppName: this.settingService.getConfigValue('appTitle'),
+            solidAppWebsiteUrl: this.settingService.getConfigValue('solidAppWebsiteUrl'),
+            frontendLoginPageUrl: this.settingService.getConfigValue('frontendLoginPageUrl'),
             email: user.email,
             fullName: user.fullName,
             userName: user.username,
             password: autoGeneratedPwd,
             companyLogoUrl: companyLogo
-        }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
+        }, this.settingService.getConfigValue('shouldQueueEmails'), null, null, 'user', user.id);
     }
-    isWelcomeEmailEnabled() {
-        return this.iamConfiguration.sendWelcomeEmailOnSignup;
+    async isWelcomeEmailEnabled() {
+        const sendWelcomeEmailOnSignup = this.settingService.getConfigValue('sendWelcomeEmailOnSignup');
+        return sendWelcomeEmailOnSignup;
     }
-    isWelcomeSmsEnabled() {
-        return this.iamConfiguration.sendWelcomeSmsOnSignup;
+    async isWelcomeSmsEnabled() {
+        const sendWelcomeSmsOnSignup = this.settingService.getConfigValue('sendWelcomeSmsOnSignup');
+        return sendWelcomeSmsOnSignup;
     }
     async notifyUserOnSignup(user) {
         const companyLogo = await this.getCompanyLogo();
-        if (this.isWelcomeEmailEnabled()) {
+        if (await 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,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
+                solidAppWebsiteUrl: this.settingService.getConfigValue('solidAppWebsiteUrl'),
+                frontendLoginPageUrl: this.settingService.getConfigValue('frontendLoginPageUrl'),
                 email: user.email,
                 fullName: user.fullName,
                 userName: user.username,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
+            }, this.settingService.getConfigValue('shouldQueueEmails'), null, null, 'user', user.id);
         }
-        if (this.isWelcomeSmsEnabled() && user.mobile) {
+        const isWelcomeSmsEnabled = await this.isWelcomeSmsEnabled();
+        if (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,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
+                frontendLoginPageUrl: this.settingService.getConfigValue('frontendLoginPageUrl'),
                 firstName: user.username,
                 fullName: user.fullName ? user.fullName : user.username
-            }, this.commonConfiguration.shouldQueueSms);
+            }, this.settingService.getConfigValue('shouldQueueSms'));
         }
     }
     async otpInitiateRegistration(signUpDto) {
         try {
-            if (!this.isPasswordlessRegistrationEnabled()) {
+            const isPasswordlessRegistrationEnabled = await this.isPasswordlessRegistrationEnabled();
+            if (!isPasswordlessRegistrationEnabled) {
                 throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.PASSWORDLESS_REGISTRATION_DISABLED);
             }
             if ((0, class_validator_1.isEmpty)(signUpDto.mobile) && (0, class_validator_1.isEmpty)(signUpDto.email)) {
@@ -291,19 +282,20 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             if ((0, class_validator_1.isNotEmpty)(existingUser) && existingUser.active) {
                 throw new common_1.ConflictException(error_messages_1.ERROR_MESSAGES.USER_ALREADY_EXISTS);
             }
-            const finalRegistrationVerificationSources = this.calculateVerificationSources(this.iamConfiguration.passwordlessRegistrationValidateWhat, signUpDto);
+            const passwordlessRegistrationValidateWhat = this.settingService.getConfigValue('passwordlessRegistrationValidateWhat');
+            const finalRegistrationVerificationSources = this.calculateVerificationSources(passwordlessRegistrationValidateWhat, signUpDto);
             let user = existingUser;
             if ((0, class_validator_1.isEmpty)(user)) {
                 user = this.createUser(signUpDto);
-                this.populateVerificationTokens(finalRegistrationVerificationSources, user);
+                await this.populateVerificationTokens(finalRegistrationVerificationSources, user);
                 await this.userRepository.save(user);
-                await this.userService.addRoleToUser(user.username, await this.settingService.getConfigValue('defaultRole'));
+                await this.userService.addRoleToUser(user.username, this.settingService.getConfigValue('defaultRole'));
             }
             else {
-                this.populateVerificationTokens(finalRegistrationVerificationSources, user);
+                await this.populateVerificationTokens(finalRegistrationVerificationSources, user);
                 await this.userRepository.save(user);
             }
-            this.notifyUserOnOtpInitiateRegistration(user, finalRegistrationVerificationSources);
+            await this.notifyUserOnOtpInitiateRegistration(user, finalRegistrationVerificationSources);
             return { message: success_messages_1.SUCCESS_MESSAGES.OTP_SENT_SUCCESS_REGISTRATION };
         }
         catch (err) {
@@ -330,24 +322,26 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
         return finalRegistrationValidationSources;
     }
-    populateVerificationTokens(finalRegistrationValidationSources, user) {
+    async populateVerificationTokens(finalRegistrationValidationSources, user) {
         if (finalRegistrationValidationSources.length === 0) {
             throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.VALIDATION_SOURCE_REQUIRED);
         }
         if (finalRegistrationValidationSources.includes(constants_1.TransactionalRegistrationValidationSource.EMAIL)) {
-            const { token, expiresAt } = this.otp();
+            const { token, expiresAt } = await this.otp();
             user.emailVerificationTokenOnRegistration = token;
             user.emailVerificationTokenOnRegistrationExpiresAt = expiresAt;
-            if (this.iamConfiguration.autoLoginUserOnRegistration) {
+            const autoLoginUserOnRegistration = this.settingService.getConfigValue('autoLoginUserOnRegistration');
+            if (autoLoginUserOnRegistration) {
                 user.emailVerificationTokenOnLogin = token;
                 user.emailVerificationTokenOnLoginExpiresAt = expiresAt;
             }
         }
         if (finalRegistrationValidationSources.includes(constants_1.TransactionalRegistrationValidationSource.MOBILE)) {
-            const { token, expiresAt } = this.otp();
+            const { token, expiresAt } = await this.otp();
             user.mobileVerificationTokenOnRegistration = token;
             user.mobileVerificationTokenOnRegistrationExpiresAt = expiresAt;
-            if (this.iamConfiguration.autoLoginUserOnRegistration) {
+            const autoLoginUserOnRegistration = this.settingService.getConfigValue('autoLoginUserOnRegistration');
+            if (autoLoginUserOnRegistration) {
                 user.mobileVerificationTokenOnLogin = token;
                 user.mobileVerificationTokenOnLoginExpiresAt = expiresAt;
             }
@@ -355,33 +349,35 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     }
     async notifyUserOnOtpInitiateRegistration(user, registrationValidationSources) {
         const companyLogo = await this.getCompanyLogo();
-        if (this.iamConfiguration.dummyOtp)
+        const dummyOtp = this.settingService.getConfigValue('dummyOtp');
+        if (dummyOtp)
             return;
         if (registrationValidationSources.includes(constants_1.RegistrationValidationSource.EMAIL)) {
             const mailService = this.mailServiceFactory.getMailService();
             mailService.sendEmailUsingTemplate(user.email, 'otp-on-register', {
-                solidAppName: process.env.SOLID_APP_NAME,
-                solidAppWebsiteUrl: process.env.SOLID_APP_WEBSITE_URL,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
+                solidAppWebsiteUrl: this.settingService.getConfigValue('solidAppWebsiteUrl'),
                 firstName: user.username,
                 fullName: user.fullName ? user.fullName : user.username,
                 emailVerificationTokenOnRegistration: user.emailVerificationTokenOnRegistration,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
+            }, this.settingService.getConfigValue('shouldQueueEmails'), null, null, 'user', user.id);
         }
         if (registrationValidationSources.includes(constants_1.RegistrationValidationSource.MOBILE)) {
             const smsService = this.smsFactory.getSmsService();
             smsService.sendSMSUsingTemplate(user.mobile, 'otp-on-register', {
-                solidAppName: process.env.SOLID_APP_NAME,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
                 otp: user.mobileVerificationTokenOnRegistration,
                 mobileVerificationTokenOnRegistration: user.mobileVerificationTokenOnRegistration,
                 firstName: user.username,
                 fullName: user.fullName ? user.fullName : user.username,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueSms);
+            }, this.settingService.getConfigValue('shouldQueueSms'));
         }
     }
     async otpConfirmRegistration(confirmSignUpDto) {
-        if (!this.isPasswordlessRegistrationEnabled()) {
+        const isPasswordlessRegistrationEnabled = await this.isPasswordlessRegistrationEnabled();
+        if (!isPasswordlessRegistrationEnabled) {
             throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.PASSWORDLESS_REGISTRATION_DISABLED);
         }
         if (confirmSignUpDto.type === constants_1.RegistrationValidationSource.EMAIL) {
@@ -402,7 +398,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             user.emailVerifiedOnRegistrationAt = new Date();
             user.emailVerificationTokenOnRegistration = null;
             user.emailVerificationTokenOnRegistrationExpiresAt = null;
-            user.active = await this.settingService.getConfigValue('activateUserOnRegistration') && this.areRegistrationValidationSourcesVerified(user);
+            user.active = this.settingService.getConfigValue('activateUserOnRegistration') && await this.areRegistrationValidationSourcesVerified(user);
             const savedUser = await this.userRepository.save(user);
             this.triggerRegistrationEvent(savedUser);
             return { active: savedUser.active, message: `User registration verified for ${confirmSignUpDto.type}` };
@@ -425,7 +421,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             user.mobileVerifiedOnRegistrationAt = new Date();
             user.mobileVerificationTokenOnRegistration = null;
             user.mobileVerificationTokenOnRegistrationExpiresAt = null;
-            user.active = await this.settingService.getConfigValue('activateUserOnRegistration') && this.areRegistrationValidationSourcesVerified(user);
+            user.active = this.settingService.getConfigValue('activateUserOnRegistration') && await this.areRegistrationValidationSourcesVerified(user);
             const savedUser = await this.userRepository.save(user);
             this.triggerRegistrationEvent(savedUser);
             return { active: savedUser.active, message: `User registration verified for ${confirmSignUpDto.type}` };
@@ -436,8 +432,9 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         const event = new interfaces_1.EventDetails(interfaces_1.EventType.USER_REGISTERED, savedUser);
         this.eventEmitter.emit(interfaces_1.EventType.USER_REGISTERED, event);
     }
-    areRegistrationValidationSourcesVerified(user) {
-        const registrationValidationSources = this.iamConfiguration.passwordlessRegistrationValidateWhat;
+    async areRegistrationValidationSourcesVerified(user) {
+        const passwordlessRegistrationValidateWhat = this.settingService.getConfigValue('passwordlessRegistrationValidateWhat');
+        const registrationValidationSources = passwordlessRegistrationValidateWhat;
         if (registrationValidationSources.includes(constants_1.RegistrationValidationSource.EMAIL)) {
             if (!user.emailVerifiedOnRegistrationAt) {
                 return false;
@@ -450,11 +447,13 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
         return true;
     }
-    otp() {
+    async otp() {
         const now = new Date();
-        now.setMinutes(now.getMinutes() + this.iamConfiguration.otpExpiry);
+        const otpExpiry = this.settingService.getConfigValue('otpExpiry');
+        const dummyOtp = this.settingService.getConfigValue('dummyOtp');
+        now.setMinutes(now.getMinutes() + otpExpiry);
         return {
-            token: this.iamConfiguration.dummyOtp ? this.iamConfiguration.dummyOtp : (0, crypto_1.randomInt)(100000, 999999).toString(),
+            token: dummyOtp ? dummyOtp : (0, crypto_1.randomInt)(100000, 999999).toString(),
             expiresAt: now,
         };
     }
@@ -474,8 +473,29 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             ...tokens
         };
     }
+    maskEmail(email) {
+        if (!email)
+            return null;
+        const [localPart, domain] = email.split('@');
+        if (localPart.length <= 2) {
+            return `${localPart[0]}***@${domain}`;
+        }
+        const visibleStart = localPart.slice(0, 2);
+        const visibleEnd = localPart.slice(-1);
+        return `${visibleStart}***${visibleEnd}@${domain}`;
+    }
+    maskMobile(mobile) {
+        if (!mobile)
+            return null;
+        if (mobile.length <= 4) {
+            return mobile;
+        }
+        const visibleEnd = mobile.slice(-4);
+        return `***${visibleEnd}`;
+    }
     async otpInitiateLogin(signInDto) {
-        if (!this.isPasswordlessRegistrationEnabled()) {
+        const isPasswordlessRegistrationEnabled = await this.isPasswordlessRegistrationEnabled();
+        if (!isPasswordlessRegistrationEnabled) {
             throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.PASSWORDLESS_REGISTRATION_DISABLED);
         }
         if (signInDto.type === constants_1.RegistrationValidationSource.EMAIL) {
@@ -491,11 +511,17 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             if (!user.active) {
                 throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.USER_INACTIVE);
             }
-            const { token, expiresAt } = this.otp();
+            const { token, expiresAt } = await this.otp();
             user.emailVerificationTokenOnLogin = token;
             user.emailVerificationTokenOnLoginExpiresAt = expiresAt;
             await this.userRepository.save(user);
             this.notifyUserOnOtpInititateLogin(user, constants_1.RegistrationValidationSource.EMAIL);
+            return {
+                message: success_messages_1.SUCCESS_MESSAGES.OTP_SENT_SUCCESS_LOGIN,
+                user: {
+                    email: this.maskEmail(user.email)
+                }
+            };
         }
         else if (signInDto.type === constants_1.RegistrationValidationSource.MOBILE) {
             const user = await this.userRepository.findOne({
@@ -507,46 +533,53 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             if (!user) {
                 throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.USER_NOT_FOUND);
             }
-            const { token, expiresAt } = this.otp();
+            const { token, expiresAt } = await this.otp();
             user.mobileVerificationTokenOnLogin = token;
             user.mobileVerificationTokenOnLoginExpiresAt = expiresAt;
             await this.userRepository.save(user);
             this.notifyUserOnOtpInititateLogin(user, constants_1.RegistrationValidationSource.MOBILE);
+            return {
+                message: success_messages_1.SUCCESS_MESSAGES.OTP_SENT_SUCCESS_LOGIN,
+                user: {
+                    mobile: this.maskMobile(user.mobile)
+                }
+            };
         }
         else {
             throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.INVALID_VERIFICATION_TYPE);
         }
-        return { message: success_messages_1.SUCCESS_MESSAGES.OTP_SENT_SUCCESS_LOGIN };
     }
     async notifyUserOnOtpInititateLogin(user, loginType) {
         const companyLogo = await this.getCompanyLogo();
-        if (this.iamConfiguration.dummyOtp)
+        const dummyOtp = this.settingService.getConfigValue('dummyOtp');
+        if (dummyOtp)
             return;
         if (loginType === constants_1.RegistrationValidationSource.EMAIL) {
             const mailService = this.mailServiceFactory.getMailService();
             mailService.sendEmailUsingTemplate(user.email, 'otp-on-login', {
-                solidAppName: process.env.SOLID_APP_NAME,
-                solidAppWebsiteUrl: process.env.SOLID_APP_WEBSITE_URL,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
+                solidAppWebsiteUrl: this.settingService.getConfigValue('solidAppWebsiteUrl'),
                 firstName: user.username,
                 emailVerificationTokenOnLogin: user.emailVerificationTokenOnLogin,
                 fullName: user.fullName ? user.fullName : user.username,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
+            }, this.settingService.getConfigValue('shouldQueueEmails'), null, null, 'user', user.id);
         }
         if (loginType === constants_1.RegistrationValidationSource.MOBILE) {
             const smsService = this.smsFactory.getSmsService();
             smsService.sendSMSUsingTemplate(user.mobile, 'otp-on-login', {
-                solidAppName: process.env.SOLID_APP_NAME,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
                 otp: user.mobileVerificationTokenOnLogin,
                 mobileVerificationTokenOnLogin: user.mobileVerificationTokenOnLogin,
                 firstName: user.username,
                 fullName: user.fullName ? user.fullName : user.username,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueSms);
+            }, this.settingService.getConfigValue('shouldQueueSms'));
         }
     }
     async otpConfirmLogin(confirmSignInDto) {
-        if (!this.isPasswordlessRegistrationEnabled()) {
+        const isPasswordlessRegistrationEnabled = await this.isPasswordlessRegistrationEnabled();
+        if (!isPasswordlessRegistrationEnabled) {
             throw new common_1.BadRequestException(error_messages_1.ERROR_MESSAGES.PASSWORDLESS_REGISTRATION_DISABLED);
         }
         if (confirmSignInDto.type === constants_1.RegistrationValidationSource.EMAIL) {
@@ -645,12 +678,14 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         await this.userRepository.save(user);
         return true;
     }
-    generateForgotPasswordToken() {
+    async generateForgotPasswordToken() {
         const expiryTime = new Date();
-        expiryTime.setMinutes(expiryTime.getMinutes() + this.iamConfiguration.forgotPasswordVerificationTokenExpiry);
+        const forgotPasswordVerificationTokenExpiry = this.settingService.getConfigValue('forgotPasswordVerificationTokenExpiry');
+        const dummyOtp = this.settingService.getConfigValue('dummyOtp');
+        expiryTime.setMinutes(expiryTime.getMinutes() + forgotPasswordVerificationTokenExpiry);
         return {
-            token: this.iamConfiguration.dummyOtp
-                ? this.iamConfiguration.dummyOtp
+            token: dummyOtp
+                ? dummyOtp
                 : (0, uuid_1.v4)(),
             expiresAt: expiryTime,
         };
@@ -668,11 +703,11 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             isValidUser = false;
         }
         if (isValidUser) {
-            const { token, expiresAt } = this.generateForgotPasswordToken();
+            const { token, expiresAt } = await this.generateForgotPasswordToken();
             user.verificationTokenOnForgotPassword = token;
             user.verificationTokenOnForgotPasswordExpiresAt = expiresAt;
             await this.userRepository.save(user);
-            this.notifyUserOnForgotPassword(user);
+            await this.notifyUserOnForgotPassword(user);
         }
         return {
             status: 'success',
@@ -688,27 +723,27 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     }
     async notifyUserOnForgotPassword(user) {
         const companyLogo = await this.getCompanyLogo();
-        const forgotPasswordSendVerificationTokenOn = this.iamConfiguration.forgotPasswordSendVerificationTokenOn;
+        const forgotPasswordSendVerificationTokenOn = this.settingService.getConfigValue('forgotPasswordSendVerificationTokenOn');
         if (forgotPasswordSendVerificationTokenOn == constants_1.ForgotPasswordSendVerificationTokenOn.EMAIL) {
             const mailService = this.mailServiceFactory.getMailService();
             mailService.sendEmailUsingTemplate(user.email, 'forgot-password', {
-                solidAppName: process.env.SOLID_APP_NAME,
-                solidAppWebsiteUrl: process.env.SOLID_APP_WEBSITE_URL,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
+                solidAppWebsiteUrl: this.settingService.getConfigValue('solidAppWebsiteUrl'),
                 firstName: user.username,
                 fullName: user.fullName,
-                passwordResetLink: `${process.env.IAM_FRONTEND_APP_FORGOT_PASSWORD_PAGE_URL}?token=${user.verificationTokenOnForgotPassword}`,
+                passwordResetLink: `${this.settingService.getConfigValue('frontendForgotPasswordPageUrl')}?token=${user.verificationTokenOnForgotPassword}`,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
+            }, this.settingService.getConfigValue('shouldQueueEmails'), null, null, 'user', user.id);
         }
         if (forgotPasswordSendVerificationTokenOn == constants_1.ForgotPasswordSendVerificationTokenOn.MOBILE && user.mobile) {
             const smsService = this.smsFactory.getSmsService();
             smsService.sendSMSUsingTemplate(user.mobile, 'forgot-password', {
-                solidAppName: process.env.SOLID_APP_NAME,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
                 otp: user.verificationTokenOnForgotPassword,
                 verificationTokenOnForgotPassword: user.verificationTokenOnForgotPassword,
                 firstName: user.username,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueSms);
+            }, this.settingService.getConfigValue('shouldQueueSms'));
         }
     }
     async confirmForgotPassword(confirmForgotPasswordDto) {
@@ -739,7 +774,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             const pwdScheme = this.hashingService.name();
             const pwdSchemeVersion = this.hashingService.currentVersion();
             await m.getRepository(user_entity_1.User).update({ id: user.id }, { password: pwdHash, passwordScheme: pwdScheme, passwordSchemeVersion: pwdSchemeVersion });
-            this.notifyUserOnPasswordChanged(user);
+            await this.notifyUserOnPasswordChanged(user);
             return {
                 status: 'success',
                 message: success_messages_1.SUCCESS_MESSAGES.FORGOT_PASSWORD_CONFIRMED,
@@ -751,34 +786,34 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     }
     async notifyUserOnPasswordChanged(user) {
         const companyLogo = await this.getCompanyLogo();
-        const forgotPasswordSendVerificationTokenOn = this.iamConfiguration.forgotPasswordSendVerificationTokenOn;
+        const forgotPasswordSendVerificationTokenOn = this.settingService.getConfigValue('forgotPasswordSendVerificationTokenOn');
         if (forgotPasswordSendVerificationTokenOn == constants_1.ForgotPasswordSendVerificationTokenOn.EMAIL) {
             const mailService = this.mailServiceFactory.getMailService();
             mailService.sendEmailUsingTemplate(user.email, 'password-changed', {
-                solidAppName: process.env.SOLID_APP_NAME,
-                solidAppWebsiteUrl: process.env.SOLID_APP_WEBSITE_URL,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
+                solidAppWebsiteUrl: this.settingService.getConfigValue('solidAppWebsiteUrl'),
                 email: user.email,
                 firstName: user.username,
                 fullName: user.fullName,
-                passwordResetLink: `${process.env.IAM_FRONTEND_APP_FORGOT_PASSWORD_PAGE_URL}?token=${user.verificationTokenOnForgotPassword}`,
+                passwordResetLink: `${this.settingService.getConfigValue('frontendForgotPasswordPageUrl')}?token=${user.verificationTokenOnForgotPassword}`,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueEmails, null, null, 'user', user.id);
+            }, this.settingService.getConfigValue('shouldQueueEmails'), null, null, 'user', user.id);
         }
         if (forgotPasswordSendVerificationTokenOn == constants_1.ForgotPasswordSendVerificationTokenOn.MOBILE && user.mobile) {
             const smsService = this.smsFactory.getSmsService();
             smsService.sendSMSUsingTemplate(user.mobile, 'forgot-password', {
-                solidAppName: process.env.SOLID_APP_NAME,
+                solidAppName: this.settingService.getConfigValue('appTitle'),
                 otp: user.verificationTokenOnForgotPassword,
                 verificationTokenOnForgotPassword: user.verificationTokenOnForgotPassword,
                 firstName: user.username,
                 companyLogoUrl: companyLogo
-            }, this.commonConfiguration.shouldQueueSms);
+            }, this.settingService.getConfigValue('shouldQueueSms'));
         }
     }
     async generateTokens(user) {
         const [accessToken, refreshToken] = await Promise.all([
-            this.generateAccessToken(user),
-            this.generateRefreshToken(user),
+            await this.generateAccessToken(user),
+            await this.generateRefreshToken(user),
         ]);
         return {
             accessToken,
@@ -787,12 +822,14 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     }
     async generateAccessToken(user) {
         const userRoleNames = user.roles.map((role) => role.name);
-        const accessToken = await this.signToken(user.id, this.jwtConfiguration.accessTokenTtl, { username: user.username, email: user.email, roles: userRoleNames });
+        const accessTokenTtl = this.settingService.getConfigValue("accessTokenTtl");
+        const accessToken = await this.signToken(user.id, accessTokenTtl, { username: user.username, email: user.email, roles: userRoleNames });
         return accessToken;
     }
     async generateRefreshToken(user, previousRefreshToken) {
         const refreshTokenId = (0, crypto_1.randomUUID)();
-        const refreshToken = await this.signToken(user.id, this.jwtConfiguration.refreshTokenTtl, {
+        const refreshTokenTtl = this.settingService.getConfigValue("refreshTokenTtl");
+        const refreshToken = await this.signToken(user.id, refreshTokenTtl, {
             refreshTokenId,
         });
         await this.refreshTokenIdsStorage.insert(user.id, refreshToken, previousRefreshToken);
@@ -800,10 +837,13 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     }
     async refreshTokens(refreshTokenDto) {
         try {
+            const secret = this.settingService.getConfigValue("secret");
+            const audience = this.settingService.getConfigValue("audience");
+            const issuer = this.settingService.getConfigValue("issuer");
             const { sub } = await this.jwtService.verifyAsync(refreshTokenDto.refreshToken, {
-                secret: this.jwtConfiguration.secret,
-                audience: this.jwtConfiguration.audience,
-                issuer: this.jwtConfiguration.issuer,
+                secret,
+                audience,
+                issuer,
             });
             const user = await this.userRepository.findOne({
                 where: {
@@ -831,13 +871,16 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
     }
     async signToken(userId, expiresIn, payload) {
+        const audience = this.settingService.getConfigValue("audience");
+        const issuer = this.settingService.getConfigValue("issuer");
+        const secret = this.settingService.getConfigValue("secret");
         return await this.jwtService.signAsync({
             sub: userId,
             ...payload,
         }, {
-            audience: this.jwtConfiguration.audience,
-            issuer: this.jwtConfiguration.issuer,
-            secret: this.jwtConfiguration.secret,
+            audience,
+            issuer,
+            secret,
             expiresIn,
         });
     }
@@ -879,7 +922,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         };
     }
     async isPasswordlessRegistrationEnabled() {
-        return this.settingService.getConfigValue('passwordlessRegistration');
+        return this.settingService.getConfigValue('passwordLessAuth');
     }
     async logout(refreshToken) {
         try {
@@ -937,20 +980,19 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
 exports.AuthenticationService = AuthenticationService;
 exports.AuthenticationService = AuthenticationService = AuthenticationService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(4, (0, common_1.Inject)(jwt_config_1.jwtConfig.KEY)),
-    __param(5, (0, common_1.Inject)(iam_config_1.iamConfig.KEY)),
-    __param(13, (0, common_1.Inject)(common_config_1.default.KEY)),
-    __param(15, (0, typeorm_1.InjectDataSource)()),
+    __param(12, (0, typeorm_1.InjectDataSource)()),
     __metadata("design:paramtypes", [user_service_1.UserService,
         user_repository_1.UserRepository,
         hashing_service_1.HashingService,
-        jwt_1.JwtService, void 0, void 0, refresh_token_ids_storage_service_1.RefreshTokenIdsStorageService,
+        jwt_1.JwtService,
+        refresh_token_ids_storage_service_1.RefreshTokenIdsStorageService,
         axios_1.HttpService,
         mail_factory_1.MailFactory,
         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,
+        role_metadata_service_1.RoleMetadataService,
+        user_activity_history_service_1.UserActivityHistoryService,
         typeorm_2.DataSource])
 ], AuthenticationService);
 function parseUniqueConstraintError(detail) {