@solidxai/core 0.1.6-beta.7 → 0.1.6

package/dist/services/authentication.service.js

@@ -347,6 +347,9 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     }
     async notifyUserOnOtpInitiateRegistration(user, registrationValidationSource) {
         const companyLogo = await this.getCompanyLogo();
+        const dummyOtp = this.getDummyOtpForUser(user);
+        if (dummyOtp)
+            return;
         if (registrationValidationSource === constants_1.PasswordlessLoginValidateWhatSources.EMAIL) {
             const mailService = this.mailServiceFactory.getMailService();
             mailService.sendEmailUsingTemplate(user.email, 'otp-on-register', {
@@ -440,12 +443,13 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
         return true;
     }
-    async otp() {
+    async otp(user) {
         const now = new Date();
         const otpExpiry = this.settingService.getConfigValue('otpExpiry');
+        const dummyOtp = this.getDummyOtpForUser(user);
         now.setMinutes(now.getMinutes() + otpExpiry);
         return {
-            token: (0, crypto_1.randomInt)(100000, 999999).toString(),
+            token: dummyOtp ? dummyOtp : (0, crypto_1.randomInt)(100000, 999999).toString(),
             expiresAt: now,
         };
     }
@@ -523,11 +527,8 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
         const type = this.resolveLoginType(signInDto);
         const user = await this.findUserForLogin(type, signInDto.identifier);
-        const dummyOtp = this.getDummyOtpForUser(user);
-        if (!dummyOtp) {
-            await this.assignLoginOtp(user, type);
-            this.notifyUserOnOtpInititateLogin(user, type);
-        }
+        await this.assignLoginOtp(user, type);
+        this.notifyUserOnOtpInititateLogin(user, type);
         return this.buildLoginOtpResponse(user, type);
     }
     resolveLoginType(signInDto) {
@@ -562,23 +563,16 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         return user;
     }
     async assignLoginOtp(user, type) {
-        const { token, expiresAt } = await this.otp();
+        const { token, expiresAt } = await this.otp(user);
         if (type === constants_1.PasswordlessLoginValidateWhatSources.EMAIL) {
             user.emailVerificationTokenOnLogin = token;
             user.emailVerificationTokenOnLoginExpiresAt = expiresAt;
-            await this.userRepository.update(user.id, {
-                emailVerificationTokenOnLogin: token,
-                emailVerificationTokenOnLoginExpiresAt: expiresAt,
-            });
         }
         else {
             user.mobileVerificationTokenOnLogin = token;
             user.mobileVerificationTokenOnLoginExpiresAt = expiresAt;
-            await this.userRepository.update(user.id, {
-                mobileVerificationTokenOnLogin: token,
-                mobileVerificationTokenOnLoginExpiresAt: expiresAt,
-            });
         }
+        await this.userRepository.save(user);
     }
     buildLoginOtpResponse(user, type) {
         const maskedIdentifier = type === constants_1.PasswordlessLoginValidateWhatSources.EMAIL
@@ -626,13 +620,6 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
         const user = await this.findUserForLogin(type, identifier, { withRoles: true });
         this.checkAccountBlocked(user);
-        const dummyOtp = this.getDummyOtpForUser(user);
-        if (dummyOtp) {
-            if (otp !== dummyOtp) {
-                throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.INVALID_OTP);
-            }
-            return this.buildLoginTokenResponse(user);
-        }
         try {
             this.validateLoginOtp(user, otp, type);
         }
@@ -640,9 +627,11 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             await this.incrementFailedAttempts(user);
             throw e;
         }
-        await this.clearLoginOtp(user, type);
-        await this.userActivityHistoryService.logEvent('login', user);
-        await this.resetFailedAttempts(user);
+        const dummyOtp = this.getDummyOtpForUser(user);
+        if (!dummyOtp)
+            this.clearLoginOtp(user, type);
+        user.failedLoginAttempts = 0;
+        await this.userRepository.save(user);
         return this.buildLoginTokenResponse(user);
     }
     validateLoginOtp(user, otp, type) {
@@ -656,28 +645,16 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.OTP_EXPIRED);
         }
     }
-    async clearLoginOtp(user, type) {
+    clearLoginOtp(user, type) {
         if (type === constants_1.PasswordlessLoginValidateWhatSources.EMAIL) {
-            const verifiedAt = new Date();
-            user.emailVerifiedOnLoginAt = verifiedAt;
+            user.emailVerifiedOnLoginAt = new Date();
             user.emailVerificationTokenOnLogin = null;
             user.emailVerificationTokenOnLoginExpiresAt = null;
-            await this.userRepository.update(user.id, {
-                emailVerifiedOnLoginAt: verifiedAt,
-                emailVerificationTokenOnLogin: null,
-                emailVerificationTokenOnLoginExpiresAt: null,
-            });
         }
         else {
-            const verifiedAt = new Date();
-            user.mobileVerifiedOnLoginAt = verifiedAt;
+            user.mobileVerifiedOnLoginAt = new Date();
             user.mobileVerificationTokenOnLogin = null;
             user.mobileVerificationTokenOnLoginExpiresAt = null;
-            await this.userRepository.update(user.id, {
-                mobileVerifiedOnLoginAt: verifiedAt,
-                mobileVerificationTokenOnLogin: null,
-                mobileVerificationTokenOnLoginExpiresAt: null,
-            });
         }
     }
     async buildLoginTokenResponse(user) {
@@ -980,15 +957,14 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
     }
     async incrementFailedAttempts(user) {
-        const nextFailedAttempts = (user.failedLoginAttempts ?? 0) + 1;
-        user.failedLoginAttempts = nextFailedAttempts;
-        await this.userRepository.update(user.id, { failedLoginAttempts: nextFailedAttempts });
+        user.failedLoginAttempts += 1;
+        await this.userRepository.save(user);
     }
     async resetFailedAttempts(user) {
         if (user.failedLoginAttempts === 0)
             return;
         user.failedLoginAttempts = 0;
-        await this.userRepository.update(user.id, { failedLoginAttempts: 0 });
+        await this.userRepository.save(user);
     }
     async logout(refreshToken) {
         try {