verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

WIP: #6427 - SMS Recover Password #2037

Draft
jsegarra wants to merge 77 commits from 6427_sms_resetPassword into dev
pull from: 6427_sms_resetPassword
merge into: verdnatura:dev
Conversation 3 Commits 77 Files Changed 33 +11 -9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 01f23abec9 - Show all commits

20
back/methods/vn-user/recover-password.js
View File

@ -1,4 +1,3 @@
module.exports = Self => { module.exports = Self => {
Self.remoteMethod('recoverPassword', { Self.remoteMethod('recoverPassword', {
description: 'Send email to the user', description: 'Send email to the user',
@ -22,17 +21,20 @@ module.exports = Self => {
}); });
Self.recoverPassword = async function(user, app) { Self.recoverPassword = async function(user, app) {
const usesPhone = new RegExp(/([+]\d{2})?\d{9}/, 'g').test(user); const models = Self.app.models;
const account = await Self.app.models.Application.rawSql(
`SELECT c.id, c.phone, u.email from account.user u, vn.client c
where c.id=u.id and( u.email = ? or u.name = ? or c.phone = ?)`,
[user, user, user]);
if (!account || account.length > 1) return; const usesEmail = user.indexOf('@') !== -1;
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-02-19 08:01:31 +00:00
Outdated
Review
Copy Link

Tabular segun la convencion de SQL y usar JOIN

Tabular segun la convencion de SQL y usar JOIN
const {email, phone} = account[0]; if (!usesEmail) {
const account = await models.VnUser.findOne({
fields: ['email'],
where: {name: user}
});
if (!account) return;
user = account.email;
}
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-02-19 08:15:32 +00:00
Outdated
Review
Copy Link

Yo igual usaria un único parametro que sea userContact o algo parecido. en vez de pasar email y phone

Yo igual usaria un único parametro que sea `userContact` o algo parecido. en vez de pasar email y phone
try { try {
await Self.resetPassword({email, phone, emailTemplate: 'recover-password', app, usesPhone}); await Self.resetPassword({email: user, emailTemplate: 'recover-password', app});
} catch (err) { } catch (err) {
if (err.code === 'EMAIL_NOT_FOUND') if (err.code === 'EMAIL_NOT_FOUND')
return; return;