@solidxai/core 0.1.10-beta.15 → 0.1.10-beta.21

package/dist/services/authentication.service.js

@@ -38,6 +38,7 @@ 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");
+const whatsapp_factory_1 = require("../factories/whatsapp.factory");
 const solid_registry_1 = require("../helpers/solid-registry");
 var LoginProvider;
 (function (LoginProvider) {
@@ -46,7 +47,7 @@ var LoginProvider;
     LoginProvider["OTP"] = "otp";
 })(LoginProvider || (LoginProvider = {}));
 let AuthenticationService = AuthenticationService_1 = class AuthenticationService {
-    constructor(userService, userRepository, hashingService, jwtService, refreshTokenIdsStorage, httpService, mailServiceFactory, smsFactory, eventEmitter, settingService, roleMetadataService, userActivityHistoryService, ssoCodeStorage, dataSource, solidRegistry) {
+    constructor(userService, userRepository, hashingService, jwtService, refreshTokenIdsStorage, httpService, mailServiceFactory, smsFactory, whatsAppFactory, eventEmitter, settingService, roleMetadataService, userActivityHistoryService, ssoCodeStorage, dataSource, solidRegistry) {
         this.userService = userService;
         this.userRepository = userRepository;
         this.hashingService = hashingService;
@@ -55,6 +56,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         this.httpService = httpService;
         this.mailServiceFactory = mailServiceFactory;
         this.smsFactory = smsFactory;
+        this.whatsAppFactory = whatsAppFactory;
         this.eventEmitter = eventEmitter;
         this.settingService = settingService;
         this.roleMetadataService = roleMetadataService;
@@ -135,10 +137,14 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             }
             const savedUser = await repo.save(user);
             const userRoles = signUpDto.roles ?? [];
-            if ((signUpDto.roles?.length ?? 0) === 0 && signUpDto.username !== "sa" && defaultRole) {
+            if ((signUpDto.roles?.length ?? 0) === 0 &&
+                signUpDto.username !== "sa" &&
+                defaultRole) {
                 userRoles.push(defaultRole);
             }
             await this.handlePostSignup(savedUser, userRoles, pwd, autoGeneratedPwd);
+            await this.handlePasswordlessSignupOtp(savedUser, signUpDto, autoGeneratedPwd, repo);
+            this.triggerRegistrationEvent(savedUser);
             return savedUser;
         }
         catch (err) {
@@ -149,6 +155,24 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             throw err;
         }
     }
+    async handlePasswordlessSignupOtp(user, signUpDto, autoGeneratedPwd, repo) {
+        const isPasswordProvided = !!signUpDto.password;
+        const isAutoGeneratedPassword = !!autoGeneratedPwd;
+        if (isPasswordProvided || isAutoGeneratedPassword) {
+            return;
+        }
+        if (!user.mobile) {
+            this.logger.warn(`Skipping passwordless signup OTP WhatsApp notification for user ${user.username}: mobile is missing.`);
+            return;
+        }
+        const isPasswordlessRegistrationEnabled = await this.isPasswordlessRegistrationEnabled();
+        if (!isPasswordlessRegistrationEnabled) {
+            return;
+        }
+        await this.assignRegistrationOtp(constants_1.PasswordlessRegistrationValidateWhatSources.MOBILE, user);
+        await repo.save(user);
+        await this.notifyUserOnOtpInitiateRegistration(user, constants_1.PasswordlessRegistrationValidateWhatSources.MOBILE);
+    }
     async signupForExtensionUser(signUpDto, extensionUserDto, extensionUserRepo) {
         const entity = extensionUserRepo.create(extensionUserDto);
         return this.performSignUp(signUpDto, entity, extensionUserRepo);
@@ -358,7 +382,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     async notifyUserOnOtpInitiateRegistration(user, registrationValidationSource) {
         const companyLogo = await this.getCompanyLogo();
         if (registrationValidationSource ===
-            constants_1.PasswordlessLoginValidateWhatSources.EMAIL) {
+            constants_1.PasswordlessRegistrationValidateWhatSources.EMAIL) {
             const mailService = this.mailServiceFactory.getMailService();
             mailService.sendEmailUsingTemplate(user.email, "otp-on-register", {
                 solidAppName: this.settingService.getConfigValue("appTitle"),
@@ -370,18 +394,85 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             }, this.settingService.getConfigValue("shouldQueueEmails"), null, null, "user", user.id);
         }
         if (registrationValidationSource ===
-            constants_1.PasswordlessLoginValidateWhatSources.MOBILE) {
-            const smsService = this.smsFactory.getSmsService();
-            smsService.sendSMSUsingTemplate(user.mobile, "otp-on-register", {
+            constants_1.PasswordlessRegistrationValidateWhatSources.MOBILE) {
+            const templateParams = {
                 solidAppName: this.settingService.getConfigValue("appTitle"),
                 otp: user.mobileVerificationTokenOnRegistration,
                 mobileVerificationTokenOnRegistration: user.mobileVerificationTokenOnRegistration,
                 firstName: user.username,
                 fullName: user.fullName ? user.fullName : user.username,
                 companyLogoUrl: companyLogo,
-            }, this.settingService.getConfigValue("shouldQueueSms"));
+            };
+            const whatsappDestination = this.normalizeWhatsAppDestination(user.mobile);
+            const gupshupTemplateAppName = process.env.COMMON_GUPSHUP_APP_NAME || "Gupshup";
+            const whatsappTemplateId = this.settingService.getConfigValue("otpWhatsappTemplateId") || "common_otp";
+            const whatsappIndependentEnabled = this.settingService.getConfigValue("otpWhatsappIndependentEnabled") !== false;
+            let smsSent = false;
+            let whatsappSent = false;
+            let smsErrorMessage;
+            let whatsappErrorMessage;
+            this.logger.debug(`OTP SMS send attempt: destination=${user.mobile}, whatsappDestination=${whatsappDestination}`);
+            try {
+                const smsService = this.smsFactory.getSmsService();
+                await smsService.sendSMSUsingTemplate(user.mobile, "otp-on-register", templateParams, false);
+                smsSent = true;
+            }
+            catch (smsError) {
+                smsErrorMessage = smsError?.message;
+                this.logger.warn(`OTP SMS failed: destination=${user.mobile}, message=${smsErrorMessage}`);
+            }
+            if (whatsappIndependentEnabled) {
+                if (!whatsappDestination) {
+                    whatsappErrorMessage = "Normalized WhatsApp destination is empty";
+                    this.logger.error(`Independent OTP WhatsApp skipped: destination=${user.mobile}, message=${whatsappErrorMessage}`);
+                }
+                else {
+                    this.logger.debug(`Independent OTP WhatsApp send attempt: destination=${user.mobile}, whatsappDestination=${whatsappDestination}, templateId=${whatsappTemplateId}`);
+                    try {
+                        await this.sendOtpToWhatsappProvider(whatsappDestination, String(whatsappTemplateId), String(gupshupTemplateAppName), String(templateParams.otp || ""));
+                        whatsappSent = true;
+                        this.logger.log(`Independent OTP WhatsApp success: destination=${user.mobile}, whatsappDestination=${whatsappDestination}, templateId=${whatsappTemplateId}`);
+                    }
+                    catch (waError) {
+                        whatsappErrorMessage = waError?.message;
+                        this.logger.error(`Independent OTP WhatsApp failed: destination=${user.mobile}, whatsappDestination=${whatsappDestination}, templateId=${whatsappTemplateId}, message=${whatsappErrorMessage}`);
+                    }
+                }
+            }
+            if (!smsSent && !whatsappSent) {
+                throw new Error(`OTP delivery failed on both channels. smsError=${smsErrorMessage || "unknown"}, whatsappError=${whatsappErrorMessage || "disabled/unknown"}`);
+            }
         }
     }
+    normalizeWhatsAppDestination(rawMobile) {
+        const raw = (rawMobile || "").trim();
+        let sanitized = raw.replace(/[^\d+]/g, "");
+        if (sanitized.startsWith("00")) {
+            sanitized = `+${sanitized.slice(2)}`;
+        }
+        const defaultDialCode = String(this.settingService.getConfigValue("otpDefaultCountryDialCode") || "").replace(/\D/g, "");
+        if (sanitized.startsWith("+")) {
+            const e164Digits = sanitized.slice(1).replace(/\D/g, "");
+            if (e164Digits.length >= 8 && e164Digits.length <= 15) {
+                return e164Digits;
+            }
+        }
+        const digits = sanitized.replace(/\D/g, "");
+        if (digits.length >= 11 && digits.length <= 15) {
+            return digits;
+        }
+        if (digits.length === 10 && defaultDialCode) {
+            return `${defaultDialCode}${digits}`;
+        }
+        return digits;
+    }
+    async sendOtpToWhatsappProvider(destination, templateId, appName, otp) {
+        const whatsappService = this.whatsAppFactory.getWhatsappService();
+        await whatsappService.sendWhatsAppMessage(destination, null, {
+            type: "text",
+            text: `${appName} OTP is ${otp}. It is valid for 10 mins.`,
+        });
+    }
     async otpConfirmRegistration(confirmSignUpDto) {
         const isPasswordlessRegistrationEnabled = await this.isPasswordlessRegistrationEnabled();
         if (!isPasswordlessRegistrationEnabled) {
@@ -449,13 +540,13 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     async areAllPasswordlessRegistrationValidationSourcesVerified(user) {
         const registrationValidationSource = this.resolvePasswordlessValidationSource();
         if (registrationValidationSource ===
-            constants_1.PasswordlessLoginValidateWhatSources.EMAIL) {
+            constants_1.PasswordlessRegistrationValidateWhatSources.EMAIL) {
             if (!user.emailVerifiedOnRegistrationAt) {
                 return false;
             }
         }
         if (registrationValidationSource ===
-            constants_1.PasswordlessLoginValidateWhatSources.MOBILE) {
+            constants_1.PasswordlessRegistrationValidateWhatSources.MOBILE) {
             if (!user.mobileVerifiedOnRegistrationAt) {
                 return false;
             }
@@ -548,7 +639,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         const dummyOtp = this.getDummyOtpForUser(user);
         if (!dummyOtp) {
             await this.assignLoginOtp(user, type);
-            this.notifyUserOnOtpInititateLogin(user, type);
+            await this.notifyUserOnOtpInititateLogin(user, type);
         }
         return this.buildLoginOtpResponse(user, type);
     }
@@ -628,15 +719,53 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             }, this.settingService.getConfigValue("shouldQueueEmails"), null, null, "user", user.id);
         }
         if (loginType === constants_1.PasswordlessLoginValidateWhatSources.MOBILE) {
-            const smsService = this.smsFactory.getSmsService();
-            smsService.sendSMSUsingTemplate(user.mobile, "otp-on-login", {
+            const templateParams = {
                 solidAppName: this.settingService.getConfigValue("appTitle"),
                 otp: user.mobileVerificationTokenOnLogin,
                 mobileVerificationTokenOnLogin: user.mobileVerificationTokenOnLogin,
                 firstName: user.username,
                 fullName: user.fullName ? user.fullName : user.username,
                 companyLogoUrl: companyLogo,
-            }, this.settingService.getConfigValue("shouldQueueSms"));
+            };
+            const whatsappDestination = this.normalizeWhatsAppDestination(user.mobile);
+            const gupshupTemplateAppName = process.env.COMMON_GUPSHUP_APP_NAME || "Gupshup";
+            const whatsappTemplateId = this.settingService.getConfigValue("otpWhatsappTemplateId") || "common_otp";
+            const whatsappIndependentEnabled = this.settingService.getConfigValue("otpWhatsappIndependentEnabled") !== false;
+            let smsSent = false;
+            let whatsappSent = false;
+            let smsErrorMessage;
+            let whatsappErrorMessage;
+            this.logger.debug(`OTP LOGIN SMS send attempt: destination=${user.mobile}, whatsappDestination=${whatsappDestination}`);
+            try {
+                const smsService = this.smsFactory.getSmsService();
+                await smsService.sendSMSUsingTemplate(user.mobile, "otp-on-login", templateParams, false);
+                smsSent = true;
+            }
+            catch (smsError) {
+                smsErrorMessage = smsError?.message;
+                this.logger.warn(`OTP LOGIN SMS failed: destination=${user.mobile}, message=${smsErrorMessage}`);
+            }
+            if (whatsappIndependentEnabled) {
+                if (!whatsappDestination) {
+                    whatsappErrorMessage = "Normalized WhatsApp destination is empty";
+                    this.logger.error(`OTP LOGIN WhatsApp skipped: destination=${user.mobile}, message=${whatsappErrorMessage}`);
+                }
+                else {
+                    this.logger.debug(`OTP LOGIN WhatsApp send attempt: destination=${user.mobile}, whatsappDestination=${whatsappDestination}, templateId=${whatsappTemplateId}`);
+                    try {
+                        await this.sendOtpToWhatsappProvider(whatsappDestination, String(whatsappTemplateId), String(gupshupTemplateAppName), String(templateParams.otp || ""));
+                        whatsappSent = true;
+                        this.logger.log(`OTP LOGIN WhatsApp success: destination=${user.mobile}, whatsappDestination=${whatsappDestination}, templateId=${whatsappTemplateId}`);
+                    }
+                    catch (waError) {
+                        whatsappErrorMessage = waError?.message;
+                        this.logger.error(`OTP LOGIN WhatsApp failed: destination=${user.mobile}, whatsappDestination=${whatsappDestination}, templateId=${whatsappTemplateId}, message=${whatsappErrorMessage}`);
+                    }
+                }
+            }
+            if (!smsSent && !whatsappSent) {
+                throw new Error(`OTP LOGIN delivery failed on both channels. smsError=${smsErrorMessage || "unknown"}, whatsappError=${whatsappErrorMessage || "disabled/unknown"}`);
+            }
         }
     }
     async otpConfirmLogin(confirmSignInDto) {
@@ -1267,7 +1396,7 @@ AuthenticationService.SIGNUP_DTO_KEYS = new Set([
 ]);
 exports.AuthenticationService = AuthenticationService = AuthenticationService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(13, (0, typeorm_1.InjectDataSource)()),
+    __param(14, (0, typeorm_1.InjectDataSource)()),
     __metadata("design:paramtypes", [user_service_1.UserService,
         user_repository_1.UserRepository,
         hashing_service_1.HashingService,
@@ -1276,6 +1405,7 @@ exports.AuthenticationService = AuthenticationService = AuthenticationService_1
         axios_1.HttpService,
         mail_factory_1.MailFactory,
         sms_factory_1.SmsFactory,
+        whatsapp_factory_1.WhatsAppFactory,
         event_emitter_1.EventEmitter2,
         setting_service_1.SettingService,
         role_metadata_service_1.RoleMetadataService,