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

Fix: missing $ and use defaultStore

Browse source
This commit is contained in:
csrapr 2021-03-18 17:19:42 +00:00 • committed by Josh Harvey
parent cbf0165893
commit f3f2bb01b0
6 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/auth-tokens.js
View file

@ -7,7 +7,7 @@ function createAuthToken (userID, type) {
const token = crypto.randomBytes(32).toString('hex') const token = crypto.randomBytes(32).toString('hex')
const sql = `INSERT INTO auth_tokens (token, type, user_id) VALUES ($1, $2, $3) ON CONFLICT (user_id, type) DO UPDATE SET token=$1, expire=now() + interval '${constants.AUTH_TOKEN_EXPIRATION_TIME}' RETURNING *` const sql = `INSERT INTO auth_tokens (token, type, user_id) VALUES ($1, $2, $3) ON CONFLICT (user_id, type) DO UPDATE SET token=$1, expire=now() + interval '${constants.AUTH_TOKEN_EXPIRATION_TIME}' RETURNING *`
return db.one(sql, [token, type, userID]) return db.$one(sql, [token, type, userID])
} }
module.exports = { module.exports = {

6
lib/compute-schema.js
View file

@ -1,9 +1,7 @@
const { asyncLocalStorage } = require('./async-storage') const { asyncLocalStorage, defaultStore } = require('./async-storage')
const computeSchema = (req, res, next) => { const computeSchema = (req, res, next) => {
const store = new Map() const store = defaultStore()
store.set('schema', 'public')
store.set('defaultSchema', 'ERROR_SCHEMA')
asyncLocalStorage.run(store, () => { asyncLocalStorage.run(store, () => {
next() next()
}) })

2
lib/new-settings-loader.js
View file

@ -25,7 +25,7 @@ function saveAccounts (accounts) {
return loadAccounts() return loadAccounts()
.then(currentAccounts => { .then(currentAccounts => {
const newAccounts = _.merge(currentAccounts, accounts) const newAccounts = _.merge(currentAccounts, accounts)
return db.none(accountsSql, ['accounts', { accounts: newAccounts }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION]) return db.$none(accountsSql, ['accounts', { accounts: newAccounts }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
}) })
} }
function resetAccounts (schemaVersion) { function resetAccounts (schemaVersion) {

2
lib/notifier/queries.js
View file

@ -59,7 +59,7 @@ const getNotifications = () => {
} }
const setRead = (id, read) => { const setRead = (id, read) => {
const sql = `UPDATE notifications SET read = $1 WHERE id = $2` const sql = `UPDATE notifications SET read = $1 WHERE id = $2`
return db.none(sql, [read, id]).catch(console.error) return db.$none(sql, [read, id]).catch(console.error)
} }
const markAllAsRead = () => { const markAllAsRead = () => {

1
lib/routes.js
View file

@ -9,7 +9,6 @@ const authorize = require('./middlewares/authorize')
const errorHandler = require('./middlewares/errorHandler') const errorHandler = require('./middlewares/errorHandler')
const filterOldRequests = require('./middlewares/filterOldRequests') const filterOldRequests = require('./middlewares/filterOldRequests')
const computeSchema = require('./compute-schema') const computeSchema = require('./compute-schema')
const dbErrorCodes = require('./db-error-codes')
const logger = require('./logger') const logger = require('./logger')
const options = require('./options') const options = require('./options')
const findOperatorId = require('./middlewares/operatorId') const findOperatorId = require('./middlewares/operatorId')

12
lib/session-manager.js
View file

@ -2,7 +2,7 @@ const db = require('./db')
function getSessions () { function getSessions () {
const sql = `SELECT * FROM user_sessions ORDER BY sess -> 'user' ->> 'username'` const sql = `SELECT * FROM user_sessions ORDER BY sess -> 'user' ->> 'username'`
return db.any(sql) return db.$any(sql)
} }
function getLastSessionPerUser () { function getLastSessionPerUser () {
@ -16,27 +16,27 @@ function getLastSessionPerUser () {
SELECT DISTINCT ON (username) SELECT DISTINCT ON (username)
username, role username, role
FROM users) b ON a.username = b.username` FROM users) b ON a.username = b.username`
return db.any(sql) return db.$any(sql)
} }
function getSessionsByUsername (username) { function getSessionsByUsername (username) {
const sql = `SELECT * FROM user_sessions WHERE sess -> 'user' ->> 'username'=$1` const sql = `SELECT * FROM user_sessions WHERE sess -> 'user' ->> 'username'=$1`
return db.any(sql, [username]) return db.$any(sql, [username])
} }
function getSessionById (sessionID) { function getSessionById (sessionID) {
const sql = `SELECT * FROM user_sessions WHERE sid=$1` const sql = `SELECT * FROM user_sessions WHERE sid=$1`
return db.any(sql, [sessionID]) return db.$any(sql, [sessionID])
} }
function deleteSessionsByUsername (username) { function deleteSessionsByUsername (username) {
const sql = `DELETE FROM user_sessions WHERE sess -> 'user' ->> 'username'=$1` const sql = `DELETE FROM user_sessions WHERE sess -> 'user' ->> 'username'=$1`
return db.none(sql, [username]) return db.$none(sql, [username])
} }
function deleteSessionById (sessionID) { function deleteSessionById (sessionID) {
const sql = `DELETE FROM user_sessions WHERE sid=$1` const sql = `DELETE FROM user_sessions WHERE sid=$1`
return db.none(sql, [sessionID]) return db.$none(sql, [sessionID])
} }
module.exports = { getSessions, getLastSessionPerUser, getSessionsByUsername, getSessionById, deleteSessionsByUsername, deleteSessionById } module.exports = { getSessions, getLastSessionPerUser, getSessionsByUsername, getSessionById, deleteSessionsByUsername, deleteSessionById }