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

fix: ensure query execution order

Browse source
This commit is contained in:
Sérgio Salgado 2021-06-30 13:47:23 +01:00 • committed by Josh Harvey
parent 7a516cedb9
commit e0f38745f0
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bin/lamassu-revoke
View file

@ -36,7 +36,6 @@ return db.result(userTokenSql, [name])
const sanctionsOverride = t.any(`UPDATE customers SET sanctions_override_by = null WHERE sanctions_override_by IN ($1^) RETURNING *`, tokenClause)
const authorizedOverride = t.any(`UPDATE customers SET authorized_override_by = null WHERE authorized_override_by IN ($1^) RETURNING *`, tokenClause)
const usSsnOverride = t.any(`UPDATE customers SET us_ssn_override_by = null WHERE us_ssn_override_by IN ($1^)`, tokenClause)
const tokenDeletion = t.result(`DELETE FROM user_tokens WHERE name = $1 RETURNING *`, [name], r => r.rowCount)
return t.batch([
smsOverride,
@ -45,18 +44,16 @@ return db.result(userTokenSql, [name])
cameraOverride,
sanctionsOverride,
authorizedOverride,
usSsnOverride,
tokenDeletion
usSsnOverride
])
})
})
.then(result => {
const occurrences = result.slice(0, result.length - 1)
const count = _.sumBy(_.size, occurrences)
const count = _.sumBy(_.size, result)
if (count > 0) {
console.log(`Removed ${count} ${count === 1 ? `entry` : `entries`} on the customer table, related with the user ${name}!`)
console.log(`Removed ${count} ${count === 1 ? `reference` : `references`} in the database, related with the user ${name}!`)
}
return result[result.length - 1]
return t.result(`DELETE FROM user_tokens WHERE name = $1 RETURNING *`, [name], r => r.rowCount)
})
})
})
.then(res => console.log(`User ${name} (with ${res === 1 ? `token` : `tokens`} associated) successfully removed from the system!`))
.catch(console.error)