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

6868_createLogin #2598

Merged
sergiodt merged 20 commits from 6868_createLogin into dev 2024-09-13 09:43:32 +00:00
Conversation 0 Commits 20 Files Changed 5 +3 -3
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36cf6b1aee - Show all commits

1
modules/account/back/models/account.js
View File

@ -10,7 +10,6 @@ module.exports = Self => {
require('../methods/account/logout')(Self); require('../methods/account/logout')(Self);
require('../methods/account/change-password')(Self); require('../methods/account/change-password')(Self);
require('../methods/account/set-password')(Self); require('../methods/account/set-password')(Self);
require('../methods/account/handle-user')(Self);
Self.setUnverifiedPassword = async(id, pass, options) => { Self.setUnverifiedPassword = async(id, pass, options) => {
const {emailVerified} = await models.VnUser.findById(id, {fields: ['emailVerified']}, options); const {emailVerified} = await models.VnUser.findById(id, {fields: ['emailVerified']}, options);

0
modules/account/back/methods/account/handle-user.js → modules/worker/back/methods/device/handle-user.js
View File

4
modules/account/back/methods/account/specs/handle-user.spec.js → modules/worker/back/methods/device/specs/handle-user.spec.js
View File

@ -1,6 +1,6 @@
const {models} = require('vn-loopback/server/server'); const {models} = require('vn-loopback/server/server');
describe('Account handleUser()', () => { describe('Device handleUser()', () => {
const ctx = {req: {accessToken: {userId: 9}}}; const ctx = {req: {accessToken: {userId: 9}}};
it('should return data from user', async() => { it('should return data from user', async() => {
@ -9,7 +9,7 @@ describe('Account handleUser()', () => {
const nameApp = 'warehouse'; const nameApp = 'warehouse';
const versionApp = '10'; const versionApp = '10';
const data = await models.Account.handleUser(ctx, androidId, deviceId, versionApp, nameApp); const data = await models.Device.handleUser(ctx, androidId, deviceId, versionApp, nameApp);
expect(data.numberOfWagons).toBe(2); expect(data.numberOfWagons).toBe(2);
}); });

1
modules/worker/back/models/device.js
View File

@ -1,6 +1,7 @@
const UserError = require('vn-loopback/util/user-error'); const UserError = require('vn-loopback/util/user-error');
module.exports = Self => { module.exports = Self => {
require('../methods/device/handle-user')(Self);
Self.rewriteDbError(function(err) { Self.rewriteDbError(function(err) {
if (err.code === 'ER_DUP_ENTRY') if (err.code === 'ER_DUP_ENTRY')
return new UserError(``); return new UserError(``);