From f70b663ac0be94e86c3d1fa6971962f60399e5f8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 26 Mar 2024 08:18:20 +0100
Subject: [PATCH] refs #6427 feat: use authCode and validateCode

---
 back/methods/vn-user/recover-passwordSMS.js | 24 +++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/back/methods/vn-user/recover-passwordSMS.js b/back/methods/vn-user/recover-passwordSMS.js
index 3305805c0d..4a70e3184f 100644
--- a/back/methods/vn-user/recover-passwordSMS.js
+++ b/back/methods/vn-user/recover-passwordSMS.js
@@ -1,4 +1,5 @@
 const UserError = require('vn-loopback/util/user-error');
+const authCode = require('../../models/authCode');
 const OTP_CHAR = ':';
 function original({id, phone}) {
     const total = parseInt(phone) + parseInt(id);
@@ -72,13 +73,18 @@ module.exports = Self => {
         }
     });
 
-    Self.recoverPasswordSMS = async function(ctx, id, phone, _otp) {
+    Self.recoverPasswordSMS = async function(ctx, id, phone, _otp, options) {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
         const usesPhone = new RegExp(/([+]\d{2})?\d{9}/, 'g').test(+phone);
 
         if (!usesPhone) throw new UserError('Phone not valid');
 
         let query = {
-            fields: ['id', 'phone', 'email'],
+            fields: ['id', 'phone', 'email', 'name'],
             where: {id, phone}
         };
 
@@ -87,18 +93,18 @@ module.exports = Self => {
 
         try {
             if (_otp) {
+                await Self.validateCode(user.name, _otp);
+
                 return {
-                    valid: checkOTP(query.where, _otp),
                     token: await user.accessTokens.create({})
                 };
             }
-            // ONLY FOR TESTS
-            // return {otp: generateOTP(query.where)};
 
-            // AFTER TESTS
-            // const otp = generateOTP(query.where, null, false);
-            // await Self.app.models.Sms.send({req: {accessToken: {userId: id}}}, +phone, formatOTP(otp));
-            // return {otp: otp.otpType};
+            const code = await authCode(user, myOptions);
+
+            if (process.env.NODE_ENV != 'production')
+                await Self.app.models.Sms.send({req: {accessToken: {userId: id}}}, +phone, code);
+            return {otp: true};
         } catch (err) {
             if (err.code === 'EMAIL_NOT_FOUND')
                 return;