lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: remove user_tokens from _override_by customer fields

Browse source
This commit is contained in:
Sérgio Salgado 2021-02-02 17:23:30 +00:00 • committed by Josh Harvey
parent 1bc944386b
commit eb91d882c7
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/customers.js
View file

@ -399,7 +399,7 @@ function computeStatus (customer) {
function populateOverrideUsernames (customer) {
const fieldsToUpdate = _.map(field => {
return {
token: customer[field + '_override_by'],
token: customer[field + '_override_by'] || customer[field + '_override_by_old'],
field: field + '_override_by_name'
}
}, getComplianceTypes())

12
lib/users.js
View file

@ -22,19 +22,19 @@ function get (token) {
}
/**
* Get multiple users given an array of tokens
* Get multiple users given an array of ids
*
* @name getByIds
* @function
*
* @param {array} tokens Array with users' tokens
* @param {array} ids Array with users' ids
*
* @returns {array} Array of users found
*/
function getByIds (tokens) {
const sql = 'SELECT * FROM user_tokens WHERE token IN ($1^)'
const tokensClause = _.map(pgp.as.text, tokens).join(',')
return db.any(sql, [tokensClause])
function getByIds (ids) {
const sql = `SELECT * FROM users WHERE id IN ($1^)`
const idList = _.map(pgp.as.text, ids).join(',')
return db.any(sql, [idList])
}
function getUsers () {