verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

#6427 - SMS Recover Password #2037

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

2
db/dump/fixtures.after.sql
View File

@ -316,7 +316,7 @@ INSERT INTO mysql.roles_mapping (`User`, `Host`, `Role`, `Admin_option`)
WHERE `User` LIKE @prefixedLike AND `Host` = @genRoleHost;
-- Actualiza los valores de la nueva columna con los valores correspondientes de la tabla userInfo
UPDATE `account`.`user` as `user`
UPDATE `account`.`user` as `user`
JOIN vn.client `client` ON `user`.id = `client`.id
SET `user`.recoveryPhone = `client`.phone;

2
db/versions/10958-orangeDendro/01-updateUserPhoneColumn.vn.sql
View File

@ -1,5 +1,5 @@
-- Actualiza los valores de la nueva columna con los valores correspondientes de la tabla userInfo
UPDATE `account`.`user` as `user`
UPDATE `account`.`user` as `user`
JOIN vn.client `client` ON `user`.id = `client`.id
SET `user`.recoveryPhone = `client`.phone;

1
e2e/helpers/selectors.js
View File

@ -37,7 +37,6 @@ export default {
sendEmailButton: 'vn-recover-password vn-submit',
smsOption: 'vn-recover-password vn-radio[val="sms"]',
emailOption: 'vn-recover-password vn-radio[val="email"]',
},
accountIndex: {
addAccount: 'vn-user-index button vn-icon[icon="add"]',

3
e2e/paths/01-salix/04_recoverPassword.spec.js
View File

@ -8,7 +8,6 @@ describe('RecoverPassword path', async() => {
beforeAll(async() => {
browser = await getBrowser();
page = browser.page;
await page.setRequestInterception(true);
});
beforeEach(async() => {
@ -65,6 +64,8 @@ describe('RecoverPassword path', async() => {
});
it('should send sms using username', async() => {
await page.setRequestInterception(true);
await page.write(selectors.recoverPassword.email, 'BruceWayne');
await page.waitToClick(selectors.recoverPassword.smsOption);
page.on('request', request => {

17
e2e/tests.js
View File

@ -23,8 +23,8 @@ async function test() {
const opts = getopts(process.argv.slice(2), {
boolean: ['show']
});
// if (opts.show)
process.env.E2E_SHOW = true;
if (opts.show)
process.env.E2E_SHOW = true;
console.log('Building and running DB container.');
const myt = new Myt();
@ -37,6 +37,19 @@ async function test() {
const specFiles = [
`./e2e/paths/01*/*[sS]pec.js`,
`./e2e/paths/02*/*[sS]pec.js`,
`./e2e/paths/03*/*[sS]pec.js`,
`./e2e/paths/04*/*[sS]pec.js`,
`./e2e/paths/05*/*[sS]pec.js`,
`./e2e/paths/06*/*[sS]pec.js`,
`./e2e/paths/07*/*[sS]pec.js`,
`./e2e/paths/08*/*[sS]pec.js`,
`./e2e/paths/09*/*[sS]pec.js`,
`./e2e/paths/10*/*[sS]pec.js`,
`./e2e/paths/11*/*[sS]pec.js`,
`./e2e/paths/12*/*[sS]pec.js`,
`./e2e/paths/13*/*[sS]pec.js`,
`./e2e/paths/**/*[sS]pec.js`
];
jasmine.loadConfig({

2
front/salix/components/recover-password/index.html
View File

@ -36,7 +36,7 @@
<span ng-if="$ctrl.method ==='sms'" translate>
We will sent you a sms to recover your password
</span>
<span ng-if="$ctrl.method ==='email' " translate>
<span ng-if="$ctrl.method ==='email'" translate>
We will sent you an email to recover your password
</span>
</div>

2
front/salix/components/recover-password/locale/en.yml
View File

@ -1,2 +0,0 @@
We will sent you a item to recover your password: We will sent you a {{mode}} to recover your password

1
front/salix/components/recover-password/locale/es.yml
View File

@ -1,7 +1,6 @@
Recover password: Recuperar contraseña
We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña
We will sent you a sms to recover your password: Te enviaremos un sms para restablecer tu contraseña
We will sent you a item to recover your password: Te enviaremos un {{mode}} para restablecer tu contraseña
Notification sent!: ¡Notificación enviada!
User or recovery email: Usuario
User's phone: Móvil del usuario

1
modules/account/front/basic-data/index.html
View File

@ -32,7 +32,6 @@
label="Recovery phone"
ng-model="$ctrl.user.recoveryPhone"
disabled="$root.user.id !== $ctrl.user.id"
>
</vn-textfield>
<vn-autocomplete