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

refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2023-06-15 15:16:51 +02:00
parent 3a5e591cf0
commit b96f0f22b5
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
back/models/vn-user.js
View File

@ -1,7 +1,6 @@
const vnModel = require('vn-loopback/common/models/vn-model');
const LoopBackContext = require('loopback-context');
const {Email} = require('vn-print');
const UserError = require('vn-loopback/util/user-error');
module.exports = function(Self) {
vnModel(Self);
@ -156,21 +155,21 @@ module.exports = function(Self) {
Self.sharedClass._methods.find(method => method.name == 'changePassword')
.accessScopes = ['change-password'];
Self.sharedClass._methods.find(method => method.name == 'changePassword').accepts.splice(3, 0, {
arg: 'verificationCode',
type: 'string'
});
const _changePassword = Self.changePassword;
Self.changePassword = async(userId, oldPassword, newPassword, verificationCode, options, cb) => {
if (oldPassword == newPassword)
throw new UserError(`You can't use the same password`);
// Self.sharedClass._methods.find(method => method.name == 'changePassword').accepts.splice(3, 0, {
// arg: 'verificationCode',
// type: 'string'
// });
// const _changePassword = Self.changePassword;
// Self.changePassword = async(userId, oldPassword, newPassword, verificationCode, options, cb) => {
// if (oldPassword == newPassword)
// throw new UserError(`You can't use the same password`);
const user = await this.findById(userId, {fields: ['name', 'twoFactor']});
if (user.twoFactor)
await Self.validateCode(user.name, verificationCode);
// const user = await this.findById(userId, {fields: ['name', 'twoFactor']});
// if (user.twoFactor)
// await Self.validateCode(user.name, verificationCode);
await _changePassword.call(this, userId, oldPassword, newPassword, options, cb);
};
// await _changePassword.call(this, userId, oldPassword, newPassword, options, cb);
// };
const _prototypeChangePassword = Self.prototype.ChangePassword;
Self.prototype.changePassword = async function(oldPassword, newPassword, options, cb) {

16
modules/account/back/methods/account/change-password.js
View File

@ -19,6 +19,10 @@ module.exports = Self => {
type: 'string',
description: 'The new password',
required: true
}, {
arg: 'verificationCode',
type: 'string',
description: 'The 2FA code'
}
],
http: {
@ -27,7 +31,15 @@ module.exports = Self => {
}
});
Self.changePassword = async function(id, oldPassword, newPassword) {
await Self.app.models.VnUser.changePassword(id, oldPassword, newPassword);
Self.changePassword = async function(id, oldPassword, newPassword, verificationCode) {
const {vnUser} = Self.app.models;
if (oldPassword == newPassword)
throw new UserError(`You can't use the same password`);
const user = await vnUser.findById(id, {fields: ['name', 'twoFactor']});
if (user.twoFactor)
await vnUser.validateCode(user.name, verificationCode);
await vnUser.changePassword(id, oldPassword, newPassword);
};
};