diff --git a/back/methods/vn-user/signIn.js b/back/methods/vn-user/signIn.js index 36a2fb870..8b14bd12d 100644 --- a/back/methods/vn-user/signIn.js +++ b/back/methods/vn-user/signIn.js @@ -43,14 +43,14 @@ module.exports = Self => { ? {email: user} : {name: user}; const vnUser = await Self.findOne({ - fields: ['active', 'passExpired'], + fields: ['id', 'active', 'passExpired'], where }); const today = Date.vnNew(); today.setHours(0, 0, 0, 0); if (vnUser.passExpired && vnUser.passExpired.getTime() <= today.getTime()) - throw new UserError('Pass expired'); + throw new UserError('Pass expired', 'passExpired', {'id': vnUser.id}); const validCredentials = instance && await instance.hasPassword(password); diff --git a/back/models/vn-user.js b/back/models/vn-user.js index 710710e4e..47c7fd82d 100644 --- a/back/models/vn-user.js +++ b/back/models/vn-user.js @@ -110,13 +110,25 @@ module.exports = function(Self) { const _setPassword = Self.setPassword; Self.setPassword = async function(id, newPassword, options, cb) { - // await Self.rawSql(`CALL account.user_checkPassword(?)`, [newPassword]); + // await Self.rawSql(`CALL account.user_setPassword(?, ?)`, + // [id, newPassword]); + await Self.app.models.Account.syncById(id, newPassword); await _setPassword.call(this, id, newPassword, options, cb); + const user = await Self.findById(id); await user.updateAttribute('passExpired', null); return; }; + const _changePassword = Self.changePassword; + Self.changePassword = async function(id, oldPassword, newPassword, options, cb) { + // await Self.rawSql(`CALL account.user_changePassword(?, ?, ?)`, + // [id, oldPassword, newPassword]); + await Self.app.models.Account.syncById(id, newPassword); + await _changePassword.call(this, id, oldPassword, newPassword, options, cb); + return; + }; + // FIX THIS Self.afterRemote('prototype.patchAttributes', async(ctx, instance) => { if (!ctx.args || !ctx.args.data.email) return; diff --git a/front/salix/components/change-password/index.html b/front/salix/components/change-password/index.html index 8d2726d3d..5ea5ced97 100644 --- a/front/salix/components/change-password/index.html +++ b/front/salix/components/change-password/index.html @@ -3,7 +3,6 @@ label="Old password" ng-model="$ctrl.oldPassword" type="password" - info="{{'Password requirements' | translate:$ctrl.passRequirements}}" vn-focus> - - + autocomplete="false"> + type="password" + autocomplete="false">
- + diff --git a/front/salix/components/change-password/index.js b/front/salix/components/change-password/index.js index 9b1f748b7..1ab9a8a62 100644 --- a/front/salix/components/change-password/index.js +++ b/front/salix/components/change-password/index.js @@ -1,5 +1,4 @@ import ngModule from '../../module'; -import './style.scss'; const UserError = require('vn-loopback/util/user-error'); export default class Controller { @@ -23,18 +22,18 @@ export default class Controller { } submit() { - if (!this.newPassword) + const newPassword = this.newPassword; + + if (!newPassword) throw new UserError(`You must enter a new password`); - if (this.newPassword != this.repeatPassword) + if (newPassword != this.repeatPassword) throw new UserError(`Passwords don't match`); const headers = { Authorization: this.$location.$$search.access_token }; - const newPassword = this.newPassword; - - this.$http.post('VnUsers/reset-password', {newPassword}, {headers}) + this.$http.post('VnUsers/change-password', {newPassword}, {headers}) .then(() => { this.vnApp.showSuccess(this.$translate.instant('Password changed!')); this.$state.go('login'); diff --git a/front/salix/components/change-password/locale/es.yml b/front/salix/components/change-password/locale/es.yml index 30893a152..5a855e557 100644 --- a/front/salix/components/change-password/locale/es.yml +++ b/front/salix/components/change-password/locale/es.yml @@ -1,7 +1,8 @@ -Reset password: Restrablecer contraseña +Change password: Cambiar contraseña +Old password: Antigua contraseña New password: Nueva contraseña Repeat password: Repetir contraseña -Password changed!: ¡Contraseña cambiada! +Password changed!: ¡Contraseña actualizada! Password requirements: > La contraseña debe tener al menos {{ length }} caracteres de longitud, {{nAlpha}} caracteres alfabéticos, {{nUpper}} letras mayúsculas, {{nDigits}} diff --git a/front/salix/components/change-password/style.scss b/front/salix/components/change-password/style.scss deleted file mode 100644 index 87e4adc8c..000000000 --- a/front/salix/components/change-password/style.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import "variables"; - -vn-reset-password{ - .footer { - margin-top: 32px; - text-align: center; - position: relative; - & > .vn-submit { - display: block; - - & > input { - display: block; - width: 100%; - } - } - & > .spinner-wrapper { - position: absolute; - width: 0; - top: 3px; - right: -8px; - overflow: visible; - } - } -} diff --git a/front/salix/components/login/index.js b/front/salix/components/login/index.js index 74828dd9b..d944983b7 100644 --- a/front/salix/components/login/index.js +++ b/front/salix/components/login/index.js @@ -5,10 +5,11 @@ import './style.scss'; * A simple login form. */ export default class Controller { - constructor($, $element, vnAuth) { + constructor($, $element, $state, vnAuth) { Object.assign(this, { $, $element, + $state, vnAuth, user: localStorage.getItem('lastUser'), remember: true @@ -22,15 +23,15 @@ export default class Controller { localStorage.setItem('lastUser', this.user); this.loading = false; }) - .catch(err => { + .catch(req => { this.loading = false; this.password = ''; this.focusUser(); - console.log('hola'); - console.log(err); - console.log(err.message); - console.log(err.stack); - throw err; + console.log(req.data.error); + console.log(req.data.error.code); + throw req; + if (req.data.error.code = 'passExpired') + this.$state.go('change-password'); }); } @@ -39,7 +40,7 @@ export default class Controller { this.$.userField.focus(); } } -Controller.$inject = ['$scope', '$element', 'vnAuth']; +Controller.$inject = ['$scope', '$element', '$state', 'vnAuth']; ngModule.vnComponent('vnLogin', { template: require('./index.html'), diff --git a/front/salix/components/outLayout/style.scss b/front/salix/components/outLayout/style.scss index aa94fefb3..a95b75835 100644 --- a/front/salix/components/outLayout/style.scss +++ b/front/salix/components/outLayout/style.scss @@ -64,4 +64,25 @@ vn-out-layout{ a{ color: $color-primary; } + + .footer { + margin-top: 32px; + text-align: center; + position: relative; + & > .vn-submit { + display: block; + + & > input { + display: block; + width: 100%; + } + } + & > .spinner-wrapper { + position: absolute; + width: 0; + top: 3px; + right: -8px; + overflow: visible; + } + } } diff --git a/front/salix/components/recover-password/index.js b/front/salix/components/recover-password/index.js index e91169588..5ffc305f9 100644 --- a/front/salix/components/recover-password/index.js +++ b/front/salix/components/recover-password/index.js @@ -1,5 +1,4 @@ import ngModule from '../../module'; -import './style.scss'; export default class Controller { constructor($scope, $element, $http, vnApp, $translate, $state) { diff --git a/front/salix/components/recover-password/style.scss b/front/salix/components/recover-password/style.scss deleted file mode 100644 index d3c6f594e..000000000 --- a/front/salix/components/recover-password/style.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import "variables"; - -vn-recover-password{ - .footer { - margin-top: 32px; - text-align: center; - position: relative; - & > .vn-submit { - display: block; - - & > input { - display: block; - width: 100%; - } - } - & > .spinner-wrapper { - position: absolute; - width: 0; - top: 3px; - right: -8px; - overflow: visible; - } - } -} diff --git a/front/salix/components/reset-password/index.js b/front/salix/components/reset-password/index.js index 4462b9221..c0a10cc52 100644 --- a/front/salix/components/reset-password/index.js +++ b/front/salix/components/reset-password/index.js @@ -1,5 +1,4 @@ import ngModule from '../../module'; -import './style.scss'; const UserError = require('vn-loopback/util/user-error'); export default class Controller { diff --git a/front/salix/components/reset-password/style.scss b/front/salix/components/reset-password/style.scss deleted file mode 100644 index 87e4adc8c..000000000 --- a/front/salix/components/reset-password/style.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import "variables"; - -vn-reset-password{ - .footer { - margin-top: 32px; - text-align: center; - position: relative; - & > .vn-submit { - display: block; - - & > input { - display: block; - width: 100%; - } - } - & > .spinner-wrapper { - position: absolute; - width: 0; - top: 3px; - right: -8px; - overflow: visible; - } - } -} diff --git a/modules/account/back/methods/account/change-password.js b/modules/account/back/methods/account/change-password.js index 549508ffa..c6f08a232 100644 --- a/modules/account/back/methods/account/change-password.js +++ b/modules/account/back/methods/account/change-password.js @@ -28,8 +28,6 @@ module.exports = Self => { }); Self.changePassword = async function(id, oldPassword, newPassword) { - await Self.rawSql(`CALL account.user_changePassword(?, ?, ?)`, - [id, oldPassword, newPassword]); - await Self.app.models.Account.syncById(id, newPassword); + await Self.app.models.VnUser.changePassword(id, oldPassword, newPassword); }; }; diff --git a/modules/account/back/methods/account/set-password.js b/modules/account/back/methods/account/set-password.js index b4204d103..010197e0d 100644 --- a/modules/account/back/methods/account/set-password.js +++ b/modules/account/back/methods/account/set-password.js @@ -22,8 +22,6 @@ module.exports = Self => { }); Self.setPassword = async function(id, newPassword) { - await Self.rawSql(`CALL account.user_setPassword(?, ?)`, - [id, newPassword]); - await Self.app.models.Account.syncById(id, newPassword); + await Self.app.models.VnUser.setPassword(id, newPassword); }; }; diff --git a/modules/account/back/methods/account/sync.js b/modules/account/back/methods/account/sync.js index 8668be343..63eff38bf 100644 --- a/modules/account/back/methods/account/sync.js +++ b/modules/account/back/methods/account/sync.js @@ -33,7 +33,7 @@ module.exports = Self => { const isSync = !await models.UserSync.exists(userName); if (!force && isSync && user) return; - await models.AccountConfig.syncUser(userName, password); + // await models.AccountConfig.syncUser(userName, password); await models.UserSync.destroyById(userName); }; };