Updated all global and local client packages

* Tweaked sessions to be a little more reliable on mobile
This commit is contained in:
Max G
2020-06-21 02:07:36 +00:00
parent 0bbdda9a2a
commit 8b711ab508
8 changed files with 245 additions and 102 deletions

View File

@@ -8,6 +8,8 @@ const cs = require('@helpers/CryptoString')
let User = module.exports = {}
const version = '3.0.1'
//Login a user, if that user does not exist create them
//Issues login token
User.login = (username, password) => {
@@ -171,14 +173,6 @@ User.getCounts = (userId) => {
Object.assign(countTotals, rows[0][0]) //combine results
return db.promise().query(
`SELECT count(id) as activeSessions FROM user_active_session WHERE user_hash = ?`, [userHash]
)
})
.then( (rows, fields) => {
Object.assign(countTotals, rows[0][0]) //combine results
return db.promise().query(
`SELECT
SUM(attachment_type = 1) as linkFiles,
@@ -198,7 +192,7 @@ User.getCounts = (userId) => {
countTotals[key] = count ? count : 0
})
countTotals['currentVersion'] = '3.0.0'
countTotals['currentVersion'] = version
resolve(countTotals)
})